Qt: Simplify includes.

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

modules/gui/qt4/components/open_panels.hpp

 /*****************************************************************************
  * 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;

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"
 

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>

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>

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;
 

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;

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,

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>
 

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"

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"

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>

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>

modules/gui/qt4/dialogs_provider.hpp

 /*****************************************************************************
  * 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

modules/gui/qt4/input_manager.cpp

@@ -27,7 +27,6 @@
 # include "config.h"
 #endif
 
-#include "qt4.hpp"
 #include "input_manager.hpp"
 
 #include <QApplication>

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"

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 */

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>
 

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>

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

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