Qt: Simplify includes.

[vlc] / modules / gui / qt4 / components / open_panels.hpp

diff --git a/modules/gui/qt4/components/open_panels.hpp b/modules/gui/qt4/components/open_panels.hpp
index 393ca7433085f9e323a66048efcba4e955ad63c1..6b34a1419fbce7f2c5ab265966bfe717a80c04e0 100644 (file)
--- a/modules/gui/qt4/components/open_panels.hpp
+++ b/modules/gui/qt4/components/open_panels.hpp
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * open.hpp : Panels for the open dialogs
  ****************************************************************************
- * Copyright (C) 2006-2007 the VideoLAN team
+ * Copyright (C) 2006-2008 the VideoLAN team
  * Copyright (C) 2007 Société des arts technologiques
  * Copyright (C) 2007 Savoir-faire Linux
  * $Id$
@@ -32,24 +32,33 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
-
-#include <QFileDialog>
+#include "components/preferences_widgets.hpp"
 
 #include "ui/open_file.h"
 #include "ui/open_disk.h"
 #include "ui/open_net.h"
 #include "ui/open_capture.h"
 
-#include "components/preferences_widgets.hpp"
+#include <QFileDialog>
 
-#ifdef HAVE_LIMITS_H
-#   include <limits.h>
-#endif
+#include <limits.h>
 
 #define setSpinBoxFreq( spinbox ){ spinbox->setRange ( 0, INT_MAX ); \
     spinbox->setAccelerated( true ); }
 
+enum
+{
+    NO_PROTO,
+    HTTP_PROTO,
+    HTTPS_PROTO,
+    MMS_PROTO,
+    FTP_PROTO,
+    RTSP_PROTO,
+    RTP_PROTO,
+    UDP_PROTO,
+    RTMP_PROTO
+};
+
 enum
 {
     V4L_DEVICE,
@@ -65,10 +74,10 @@ enum
 static const char *psz_devModule[] = { "v4l", "v4l2", "pvr", "dvb", "bda",
                                        "dshow", "screen", "jack" };
 
-
 class QWidget;
 class QLineEdit;
 class QString;
+class QStringListModel;
 
 class OpenPanel: public QWidget
 {
@@ -98,6 +107,7 @@ public:
         QFileDialog( parent, caption, directory, filter ) {}
 public slots:
     void accept();
+    void reject();
 };
 
 class FileOpenPanel: public OpenPanel
@@ -130,10 +140,12 @@ public:
     virtual void clear() ;
 private:
     Ui::OpenNetwork ui;
+    QStringListModel *mrlList;
 public slots:
     virtual void updateMRL();
 private slots:
     void updateProtocol( int );
+    void updateCompleter();
 };
 
 class DiscOpenPanel: public OpenPanel
@@ -153,6 +165,7 @@ public slots:
 private slots:
     void browseDevice();
     void updateButtons() ;
+    void eject();
 };
 
 
@@ -165,10 +178,12 @@ public:
     virtual void clear() ;
 private:
     Ui::OpenCapture ui;
+    bool isInitialized;
+
     QString advMRL;
     QDialog *adv;
 #ifdef WIN32
-    QRadioButton *bdas, *bdat, *bdac;
+    QRadioButton *bdas, *bdat, *bdac, *bdaa;
     QSpinBox *bdaCard, *bdaFreq, *bdaSrate;
     QLabel *bdaSrateLabel, *bdaBandLabel;
     QComboBox *bdaBandBox;
@@ -186,9 +201,11 @@ private:
     QCheckBox *jackPace, *jackConnect;
     QLineEdit *jackPortsSelected;
 #endif
+    QSpinBox *screenFPS;
 
 public slots:
     virtual void updateMRL();
+    void initialize();
 private slots:
     void updateButtons();
     void advancedDialog();