Qt: Simplify includes.

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

diff --git a/modules/gui/qt4/components/open_panels.hpp b/modules/gui/qt4/components/open_panels.hpp
index 3a97af85d3e4294cd2e9d26ff8343d08c0c3ed9e..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,16 +32,14 @@
 # include "config.h"
 #endif
 
-#include <vlc_common.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>
 
 #include <limits.h>
 
@@ -61,7 +59,6 @@ enum
     RTMP_PROTO
 };
 
-
 enum
 {
     V4L_DEVICE,
@@ -77,7 +74,6 @@ enum
 static const char *psz_devModule[] = { "v4l", "v4l2", "pvr", "dvb", "bda",
                                        "dshow", "screen", "jack" };
 
-
 class QWidget;
 class QLineEdit;
 class QString;

diff --git a/modules/gui/qt4/components/playlist/panels.hpp b/modules/gui/qt4/components/playlist/panels.hpp
index f19e34424d4d476a215c39aac10eab1ac98479ba..78eaa5db4378b58be4a027923f19799b363bfef3 100644 (file)
--- a/modules/gui/qt4/components/playlist/panels.hpp
+++ b/modules/gui/qt4/components/playlist/panels.hpp
@@ -28,8 +28,6 @@
 # include "config.h"
 #endif
 
-#include <vlc_common.h>
-
 #include "qt4.hpp"
 #include "components/playlist/playlist.hpp"
 

diff --git a/modules/gui/qt4/components/playlist/playlist_item.hpp b/modules/gui/qt4/components/playlist/playlist_item.hpp
index 885de1a0ff6f161518f810d0b3f0b7ad7ec5201e..26ce13c5896f43ed103757b7caf31b1befe809df 100644 (file)
--- a/modules/gui/qt4/components/playlist/playlist_item.hpp
+++ b/modules/gui/qt4/components/playlist/playlist_item.hpp
@@ -28,9 +28,6 @@
 # include "config.h"
 #endif
 
-#include <vlc_common.h>
-#include <vlc_input.h>
-#include <vlc_playlist.h>
 #include "components/playlist/playlist_model.hpp"
 
 #include <QString>

diff --git a/modules/gui/qt4/components/playlist/playlist_model.hpp b/modules/gui/qt4/components/playlist/playlist_model.hpp
index b3c6d8040d0dd75016099d45e3adbdca27811ae2..2dcaccbce5485f87367c20d02784dd52219f3668 100644 (file)
--- a/modules/gui/qt4/components/playlist/playlist_model.hpp
+++ b/modules/gui/qt4/components/playlist/playlist_model.hpp
@@ -28,12 +28,12 @@
 # include "config.h"
 #endif
 
-#include <vlc_common.h>
+#include "qt4.hpp"
+
 #include <vlc_input.h>
 #include <vlc_playlist.h>
-#include "playlist_item.hpp"
 
-#include "qt4.hpp"
+#include "playlist_item.hpp"
 
 #include <QModelIndex>
 #include <QObject>

diff --git a/modules/gui/qt4/components/playlist/selector.hpp b/modules/gui/qt4/components/playlist/selector.hpp
index b6ff6e635f0de9b34829a2f5594adc88c7031814..7f87233d98fbb9ad1e115d85305fb4e43f359ffb 100644 (file)
--- a/modules/gui/qt4/components/playlist/selector.hpp
+++ b/modules/gui/qt4/components/playlist/selector.hpp
@@ -28,11 +28,10 @@
 # include "config.h"
 #endif
 
-#include <vlc_common.h>
-#include <QWidget>
-#include <QString>
 #include "components/playlist/playlist_model.hpp"
 
+#include <QWidget>
+
 class QTreeView;
 class PlaylistWidget;
 

diff --git a/modules/gui/qt4/components/preferences_widgets.hpp b/modules/gui/qt4/components/preferences_widgets.hpp
index d9fa03c3bd3ce0635aaa1c1258bb82b4850370c0..eed6aab79ddef4b382b54ddf18874306dd70ea07 100644 (file)
--- a/modules/gui/qt4/components/preferences_widgets.hpp
+++ b/modules/gui/qt4/components/preferences_widgets.hpp
@@ -30,8 +30,6 @@
 # include "config.h"
 #endif
 
-#include <vlc_common.h>
-
 #include "qt4.hpp"
 #include <assert.h>
 
@@ -48,7 +46,6 @@
 #include <QVector>
 #include <QDialog>
 
-
 class QTreeWidget;
 class QTreeWidgetItem;
 class QGroupBox;
@@ -386,7 +383,7 @@ public:
     virtual QString getValue();
     virtual void hide() { combo->hide(); if( label ) label->hide(); }
     virtual void show() { combo->show(); if( label ) label->show(); }
-       QComboBox *combo;
+    QComboBox *combo;
 private:
     void finish(module_config_t *, bool );
     QLabel *label;

diff --git a/modules/gui/qt4/components/simple_preferences.hpp b/modules/gui/qt4/components/simple_preferences.hpp
index 773202e70080c6729b5ebc34f9c69270436050ed..1959e9c13028b948d50e1f9c8dfa868b674e46c1 100644 (file)
--- a/modules/gui/qt4/components/simple_preferences.hpp
+++ b/modules/gui/qt4/components/simple_preferences.hpp
@@ -30,17 +30,19 @@
 
 #include <vlc_common.h>
 #include <vlc_interface.h>
-#include <QWidget>
 
 #include "ui/sprefs_input.h"
 #include "ui/sprefs_audio.h"
 #include "ui/sprefs_video.h"
 #include "ui/sprefs_subtitles.h"
 #include "ui/sprefs_interface.h"
+
 #ifdef WIN32
-#include "util/registry.hpp"
+# include "util/registry.hpp"
 #endif
 
+#include <QWidget>
+
 enum {
     SPrefsInterface = 0,
     SPrefsAudio,

diff --git a/modules/gui/qt4/dialogs/help.cpp b/modules/gui/qt4/dialogs/help.cpp
index 41422a6fd924dcc50febae7a6481fc810fcc672e..caae1d21b3984f29f9635e4d78339081150a0c73 100644 (file)
--- a/modules/gui/qt4/dialogs/help.cpp
+++ b/modules/gui/qt4/dialogs/help.cpp
@@ -28,7 +28,6 @@
 
 #include "dialogs/help.hpp"
 
-#include <vlc_common.h>
 #include <vlc_about.h>
 #include <vlc_intf_strings.h>
 

diff --git a/modules/gui/qt4/dialogs/open.cpp b/modules/gui/qt4/dialogs/open.cpp
index b30f08eeef0647281f0fe592c021fa867910d233..a7d8b967cc17b951dfbb51c4270cadd483b2d8be 100644 (file)
--- a/modules/gui/qt4/dialogs/open.cpp
+++ b/modules/gui/qt4/dialogs/open.cpp
@@ -20,13 +20,13 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
+
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 
 #include "dialogs/open.hpp"
 
-#include "input_manager.hpp"
 #include "dialogs_provider.hpp"
 
 #include "recents.hpp"

diff --git a/modules/gui/qt4/dialogs/sout.hpp b/modules/gui/qt4/dialogs/sout.hpp
index 6b0872441f4daa0aca49ba0676da3ac3c93aae93..202b6f36ff4ef4cd49c1d442bcae3d02e6f304a2 100644 (file)
--- a/modules/gui/qt4/dialogs/sout.hpp
+++ b/modules/gui/qt4/dialogs/sout.hpp
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc_common.h>
+#include <vlc_common.h> /* Gettext functions */
 
 #include "ui/sout.h"
 #include "util/qvlcframe.hpp"

diff --git a/modules/gui/qt4/dialogs/vlm.hpp b/modules/gui/qt4/dialogs/vlm.hpp
index cf0cb148fcae14d2d331789c665fa2b8eade81ff..5187ac68fab78f97a9a6ecd1e1b381412945a7b5 100644 (file)
--- a/modules/gui/qt4/dialogs/vlm.hpp
+++ b/modules/gui/qt4/dialogs/vlm.hpp
@@ -29,8 +29,6 @@
 # include "config.h"
 #endif
 
-#include <vlc_common.h>
-
 #ifdef ENABLE_VLM
 
 #include <vlc_vlm.h>

diff --git a/modules/gui/qt4/dialogs_provider.cpp b/modules/gui/qt4/dialogs_provider.cpp
index f9c6aec1d9602c145ef54d08c862dc6f8b0ecce2..e3bd5d7365d304819109bdd4cdef1b7568599e5f 100644 (file)
--- a/modules/gui/qt4/dialogs_provider.cpp
+++ b/modules/gui/qt4/dialogs_provider.cpp
@@ -26,15 +26,14 @@
 # include "config.h"
 #endif
 
-#include <vlc_common.h>
 #include <vlc_intf_strings.h>
 
 #include "qt4.hpp"
 #include "dialogs_provider.hpp"
+#include "input_manager.hpp" /* Load Subtitles */
 #include "menus.hpp"
-#include "input_manager.hpp"
 #include "recents.hpp"
-#include "util/qvlcapp.hpp"
+#include "util/qvlcapp.hpp" /* DialogEvent */
 
 /* The dialogs */
 #include "dialogs/playlist.hpp"
@@ -51,6 +50,7 @@
 #include "dialogs/podcast_configuration.hpp"
 #include "dialogs/toolbar.hpp"
 #include "dialogs/plugins.hpp"
+#include "dialogs/interaction.hpp"
 
 #include <QEvent>
 #include <QApplication>

diff --git a/modules/gui/qt4/dialogs_provider.hpp b/modules/gui/qt4/dialogs_provider.hpp
index 1eccaf97d31082569bf664db8055466e84ed5123..4d4371fbaad56c7bb5be65b034f566776d9114fd 100644 (file)
--- a/modules/gui/qt4/dialogs_provider.hpp
+++ b/modules/gui/qt4/dialogs_provider.hpp
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * dialogs_provider.hpp : Dialogs provider
  ****************************************************************************
- * Copyright (C) 2006-2007 the VideoLAN team
+ * Copyright (C) 2006-2008 the VideoLAN team
  * $Id$
  *
  * Authors: Clément Stenac <zorglub@videolan.org>
@@ -30,12 +30,10 @@
 #endif
 
 #include <assert.h>
-#include <vlc_common.h>
-#include <vlc_interface.h>
 
 #include "qt4.hpp"
-#include "dialogs/interaction.hpp"
-#include "dialogs/open.hpp"
+
+#include <QObject>
 
 #define ADD_FILTER_MEDIA( string )     \
     string += qtr( "Media Files" );    \
@@ -74,6 +72,13 @@ enum {
     EXT_FILTER_SUBTITLE  =  0x10,
 };
 
+enum {
+    DialogEvent_Type = QEvent::User + DialogEventType + 1,
+    //PLUndockEvent_Type = QEvent::User + DialogEventType + 2;
+    //PLDockEvent_Type = QEvent::User + DialogEventType + 3;
+    SetVideoOnTopEvent_Type = QEvent::User + DialogEventType + 4,
+};
+
 class QEvent;
 class QSignalMapper;
 class QVLCMenu;
@@ -187,4 +192,21 @@ private slots:
     void SDMenuAction( QString );
 };
 
+class DialogEvent : public QEvent
+{
+public:
+    DialogEvent( int _i_dialog, int _i_arg, intf_dialog_args_t *_p_arg ) :
+                 QEvent( (QEvent::Type)(DialogEvent_Type) )
+    {
+        i_dialog = _i_dialog;
+        i_arg = _i_arg;
+        p_arg = _p_arg;
+    };
+    virtual ~DialogEvent() { delete p_arg; };
+
+    int i_arg, i_dialog;
+    intf_dialog_args_t *p_arg;
+};
+
+
 #endif

diff --git a/modules/gui/qt4/input_manager.cpp b/modules/gui/qt4/input_manager.cpp
index 70ffcf3afe426970c46d3bd1109f1884b65e75a4..3f9739dc8e9b7fb26a6391755997a5f8e48790f3 100644 (file)
--- a/modules/gui/qt4/input_manager.cpp
+++ b/modules/gui/qt4/input_manager.cpp
@@ -27,7 +27,6 @@
 # include "config.h"
 #endif
 
-#include "qt4.hpp"
 #include "input_manager.hpp"
 
 #include <QApplication>

diff --git a/modules/gui/qt4/input_manager.hpp b/modules/gui/qt4/input_manager.hpp
index 0c8e9f8a27bf045f790c09a59bce707ecc257f07..f1fc33d170761a1823356cb8899dd9145c59e8a3 100644 (file)
--- a/modules/gui/qt4/input_manager.hpp
+++ b/modules/gui/qt4/input_manager.hpp
@@ -5,6 +5,7 @@
  * $Id$
  *
  * Authors: Clément Stenac <zorglub@videolan.org>
+ *          Jean-Baptiste <jb@videolan.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -28,7 +29,6 @@
 # include "config.h"
 #endif
 
-#include <vlc_common.h>
 #include <vlc_input.h>
 
 #include "qt4.hpp"

diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index b6001e7de2724dc9c14a973ecf2ae35a8c6dbf9c..12e6bb058ea304a4f0a868273dd70a56640b0eea 100644 (file)
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -28,37 +28,37 @@
 #endif
 
 #include "qt4.hpp"
+
 #include "main_interface.hpp"
 #include "input_manager.hpp"
-#include "util/qvlcframe.hpp"
-#include "util/qvlcapp.hpp"
+
 #include "util/customwidgets.hpp"
+#include "util/qvlcapp.hpp" /* DialogEvent defintion */
+
 #include "components/interface_widgets.hpp"
 #include "components/controller.hpp"
 #include "components/playlist/playlist.hpp"
-#include "dialogs/extended.hpp"
-#include "dialogs/playlist.hpp"
+
 #include "menus.hpp"
 #include "recents.hpp"
 
-#include <QMenuBar>
 #include <QCloseEvent>
-#include <QPushButton>
-#include <QStatusBar>
 #include <QKeyEvent>
+
 #include <QUrl>
-#include <QSystemTrayIcon>
 #include <QSize>
-#include <QMenu>
+#include <QDate>
+
+#include <QMenuBar>
+#include <QStatusBar>
 #include <QLabel>
-#include <QSlider>
-#include <QWidgetAction>
-#include <QToolBar>
 #include <QGroupBox>
-#include <QDate>
+#include <QPushButton>
+#include <QWidgetAction>
 
 #include <assert.h>
-#include <vlc_keys.h>
+
+#include <vlc_keys.h> /* Wheel event */
 #include <vlc_vout.h>
 
 /* Callback prototypes */

diff --git a/modules/gui/qt4/main_interface.hpp b/modules/gui/qt4/main_interface.hpp
index cd58719eebc2147caaa62dacbf2f22f1ec383188..290e187eb3db1a66d990b45eb4a9661bc4ab7b8c 100644 (file)
--- a/modules/gui/qt4/main_interface.hpp
+++ b/modules/gui/qt4/main_interface.hpp
@@ -26,10 +26,9 @@
 #define _MAIN_INTERFACE_H_
 
 #include "qt4.hpp"
-#include "util/qvlcframe.hpp"
-#include "components/preferences_widgets.hpp"
 
-#include <vlc_aout.h>
+#include "util/qvlcframe.hpp"
+#include "components/preferences_widgets.hpp" /* First Start */
 
 #include <QSystemTrayIcon>
 

diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
index 6079ddf90b174541d381d3f709fda2668b043a9d..4419df426166528e5f272b90c858c56f2add0ad1 100644 (file)
--- a/modules/gui/qt4/menus.cpp
+++ b/modules/gui/qt4/menus.cpp
@@ -31,16 +31,14 @@
 # include "config.h"
 #endif
 
-#include <vlc_common.h>
-
 #include <vlc_intf_strings.h>
 
 #include "menus.hpp"
 
 #include "main_interface.hpp"    /* View modifications */
-#include "dialogs_provider.hpp"
-#include "input_manager.hpp"
-#include "recents.hpp"
+#include "dialogs_provider.hpp"  /* Dialogs display */
+#include "input_manager.hpp"     /* Input Management */
+#include "recents.hpp"           /* Recent Items */
 
 #include <QMenu>
 #include <QMenuBar>

diff --git a/modules/gui/qt4/qt4.hpp b/modules/gui/qt4/qt4.hpp
index 560c30586077427a4606bf5a61015dcb49100305..3ba526baa21dc9b9ad39acef5b534fcf45d2a636 100644 (file)
--- a/modules/gui/qt4/qt4.hpp
+++ b/modules/gui/qt4/qt4.hpp
@@ -51,18 +51,9 @@ enum {
     PLEventType     = 200
 };
 
-enum {
-    DialogEvent_Type = QEvent::User + DialogEventType + 1,
-    //PLUndockEvent_Type = QEvent::User + DialogEventType + 2;
-    //PLDockEvent_Type = QEvent::User + DialogEventType + 3;
-    SetVideoOnTopEvent_Type = QEvent::User + DialogEventType + 4,
-};
-
 class QApplication;
 class QMenu;
 class MainInterface;
-class DialogsProvider;
-class VideoWidget;
 class QSettings;
 
 struct intf_sys_t

diff --git a/modules/gui/qt4/util/qvlcapp.hpp b/modules/gui/qt4/util/qvlcapp.hpp
index 64155ce342a1293dda8d763be390da0de5604c03..6cb9fab990c12f7ef82f8f4b398b1191a1c3c994 100644 (file)
--- a/modules/gui/qt4/util/qvlcapp.hpp
+++ b/modules/gui/qt4/util/qvlcapp.hpp
@@ -50,21 +50,5 @@ protected:
 #endif
 };
 
-class DialogEvent : public QEvent
-{
-public:
-    DialogEvent( int _i_dialog, int _i_arg, intf_dialog_args_t *_p_arg ) :
-                 QEvent( (QEvent::Type)(DialogEvent_Type) )
-    {
-        i_dialog = _i_dialog;
-        i_arg = _i_arg;
-        p_arg = _p_arg;
-    };
-    virtual ~DialogEvent() { delete p_arg; };
-
-    int i_arg, i_dialog;
-    intf_dialog_args_t *p_arg;
-};
-
 
 #endif