qt4 - Include cleanup.

diff --git a/modules/gui/qt4/components/complete_preferences.hpp b/modules/gui/qt4/components/complete_preferences.hpp
index bcf653a60ee90bba01f05feb60a741ca20ef99b4..4a7ea71e48227d91729103e66ed66347fac7f742 100644 (file)
--- a/modules/gui/qt4/components/complete_preferences.hpp
+++ b/modules/gui/qt4/components/complete_preferences.hpp
@@ -24,10 +24,11 @@
 #ifndef _PREFSTREE_H_
 #define _PREFSTREE_H_
 
-#include <QTreeWidget>
 #include <vlc/vlc.h>
 #include <vlc_interface.h>
 
+#include <QTreeWidget>
+
 enum
 {
     TYPE_CATEGORY,

diff --git a/modules/gui/qt4/components/extended_panels.hpp b/modules/gui/qt4/components/extended_panels.hpp
index 4943ec71032465ed5dae4909ea263a2f5930ba59..ee0b93a17bdb16153bf829d1ec3430a305718e60 100644 (file)
--- a/modules/gui/qt4/components/extended_panels.hpp
+++ b/modules/gui/qt4/components/extended_panels.hpp
@@ -26,6 +26,7 @@
 
 #include <vlc/vlc.h>
 #include <vlc_aout.h>
+
 #include "ui/equalizer.h"
 #include "ui/video_effects.h"
 

diff --git a/modules/gui/qt4/components/interface_widgets.cpp b/modules/gui/qt4/components/interface_widgets.cpp
index 1ae3206daad5bdbb1c9fb8219794b1d344ea1116..395ca9ced9f1c3bd062c4227157101af6325bed6 100644 (file)
--- a/modules/gui/qt4/components/interface_widgets.cpp
+++ b/modules/gui/qt4/components/interface_widgets.cpp
@@ -35,6 +35,8 @@
 #include <QPushButton>
 #include <QHBoxLayout>
 #include <QMenu>
+#include <QPalette>
+#include <QResizeEvent>
 
 #define ICON_SIZE 128
 

diff --git a/modules/gui/qt4/components/interface_widgets.hpp b/modules/gui/qt4/components/interface_widgets.hpp
index 3f0946c4eb62a77efe3411050d386b42f6e1c998..16a1dd4866051347ef3c6ad8b21481bff8bfaa15 100644 (file)
--- a/modules/gui/qt4/components/interface_widgets.hpp
+++ b/modules/gui/qt4/components/interface_widgets.hpp
@@ -31,10 +31,10 @@
 
 #include <QWidget>
 #include <QFrame>
-#include <QPalette>
-#include <QResizeEvent>
-#include <QPixmap>
 
+class ResizeEvent;
+class QPalette;
+class QPixmap;
 class QLabel;
 class QHBoxLayout;
 

diff --git a/modules/gui/qt4/components/open.hpp b/modules/gui/qt4/components/open.hpp
index efabcb4e1e3ac89bbe98262702a7d3edafedf564..443686159e507ad7c17b019d7049c510a4ecf629 100644 (file)
--- a/modules/gui/qt4/components/open.hpp
+++ b/modules/gui/qt4/components/open.hpp
@@ -26,6 +26,7 @@
 #define _OPENPANELS_H_
 
 #include <vlc/vlc.h>
+
 #include <QFileDialog>
 
 #include "ui/open_file.h"

diff --git a/modules/gui/qt4/components/preferences_widgets.cpp b/modules/gui/qt4/components/preferences_widgets.cpp
index 2174813c486d6f4df2851ec171e5b10af4138172..0834f3c95c6d901724a0e14940961bd3521267e2 100644 (file)
--- a/modules/gui/qt4/components/preferences_widgets.cpp
+++ b/modules/gui/qt4/components/preferences_widgets.cpp
@@ -36,21 +36,16 @@
 #include "util/customwidgets.hpp"
 #include "qt4.hpp"
 
-#include <QLineEdit>
+#include <vlc_keys.h>
+
 #include <QString>
-#include <QSpinBox>
-#include <QDoubleSpinBox>
 #include <QVariant>
-#include <QComboBox>
 #include <QGridLayout>
-#include <QPushButton>
 #include <QSlider>
 #include <QFileDialog>
 #include <QFontDialog>
 #include <QGroupBox>
-
-#include <vlc_keys.h>
-
+#include <QTreeWidgetItem>
 
 QString formatTooltip(const QString & tooltip)
 {

diff --git a/modules/gui/qt4/components/preferences_widgets.hpp b/modules/gui/qt4/components/preferences_widgets.hpp
index 3666f22e71a6d6fb829ae236b2129bda1e1816ff..4bb91ec6f60e3866ccab44130d1a38c89247b66d 100644 (file)
--- a/modules/gui/qt4/components/preferences_widgets.hpp
+++ b/modules/gui/qt4/components/preferences_widgets.hpp
@@ -25,24 +25,30 @@
 
 #ifndef _INFOPANELS_H_
 #define _INFOPANELS_H_
+
 #include <vlc/vlc.h>
+
+#include "qt4.hpp"
+#include <assert.h>
+
 #include <QWidget>
-#include <QTreeWidget>
+
+#include <QCheckBox>
+#include <QComboBox>
 #include <QLineEdit>
+#include <QTreeWidget>
 #include <QSpinBox>
+#include <QLabel>
 #include <QDoubleSpinBox>
-#include <QComboBox>
-#include <QCheckBox>
+#include <QPushButton>
 #include <QVector>
 #include <QDialog>
-#include <QLabel>
-#include <QFile>
-#include <QPushButton>
-#include <QGroupBox>
 
-#include "qt4.hpp"
-#include <assert.h>
 
+class QFile;
+class QTreeWidget;
+class QTreeWidgetItem;
+class QGroupBox;
 class QGridLayout;
 
 class ConfigControl : public QObject

diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp
index 5833c072b01632d6f8819d3885c1c3db30fcb536..52cf0569a0e896f7ff2b936c92cfa41da99dd136 100644 (file)
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -23,18 +23,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#include <QString>
-#include <QFont>
-#include <QToolButton>
-#include <QButtonGroup>
-#include <QUrl>
-
 #include "components/simple_preferences.hpp"
 #include "components/preferences_widgets.hpp"
 #include "qt4.hpp"
 
-#include <vlc_config_cat.h>
-
 #include "ui/sprefs_audio.h"
 #include "ui/sprefs_input.h"
 #include "ui/sprefs_video.h"
@@ -42,6 +34,15 @@
 #include "ui/sprefs_hotkeys.h"
 #include "ui/sprefs_interface.h"
 
+#include <vlc_config_cat.h>
+
+#include <QString>
+#include <QFont>
+#include <QToolButton>
+#include <QButtonGroup>
+#include <QUrl>
+#include <QVBoxLayout>
+
 #define ICON_HEIGHT 64
 #define BUTTON_HEIGHT 74
 

diff --git a/modules/gui/qt4/components/simple_preferences.hpp b/modules/gui/qt4/components/simple_preferences.hpp
index 39d5756c9b8710fe9a5e51de839165ab4337e5ed..f495fc0a10caa03d5f11bff804884582e6bfb317 100644 (file)
--- a/modules/gui/qt4/components/simple_preferences.hpp
+++ b/modules/gui/qt4/components/simple_preferences.hpp
@@ -24,11 +24,11 @@
 #ifndef _SIMPLEPREFS_H_
 #define _SIMPLEPREFS_H_
 
-#include <QListWidget>
-#include <QVBoxLayout>
 #include <vlc/vlc.h>
 #include <vlc_interface.h>
 
+#include <QWidget>
+
 enum {
     SPrefsInterface = 0,
     SPrefsAudio,

diff --git a/modules/gui/qt4/dialogs/extended.cpp b/modules/gui/qt4/dialogs/extended.cpp
index fc9c85dffaf8448a6704f087b203966dd4b251d6..f82f49a145c644940ff5335a0e5a255a05c767c6 100644 (file)
--- a/modules/gui/qt4/dialogs/extended.cpp
+++ b/modules/gui/qt4/dialogs/extended.cpp
@@ -21,14 +21,15 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#include <QTabWidget>
-#include <QBoxLayout>
-
+#include "qt4.hpp"
 #include "dialogs/extended.hpp"
 #include "dialogs_provider.hpp"
 #include "util/qvlcframe.hpp"
 #include "components/extended_panels.hpp"
-#include "qt4.hpp"
+
+#include <QTabWidget>
+#include <QBoxLayout>
+#include <QHBoxLayout>
 
 ExtendedDialog *ExtendedDialog::instance = NULL;
 

diff --git a/modules/gui/qt4/dialogs/extended.hpp b/modules/gui/qt4/dialogs/extended.hpp
index 23af755cfcb7d28aee3e82080cc1d23dda02ac63..d237e62b0afdbc84e0b9c0a9f845527d7cb71be4 100644 (file)
--- a/modules/gui/qt4/dialogs/extended.hpp
+++ b/modules/gui/qt4/dialogs/extended.hpp
@@ -18,14 +18,13 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. 
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef _EXTENDED_DIALOG_H_
 #define _EXTENDED_DIALOG_H_
 
 #include "util/qvlcframe.hpp"
-#include <QHBoxLayout>
 
 class ExtendedDialog : public QVLCFrame
 {

diff --git a/modules/gui/qt4/dialogs/interaction.hpp b/modules/gui/qt4/dialogs/interaction.hpp
index 10090d70944c639cd9b8428391b9f6c961228897..ddf247f0b1de4b96003cddb63ab91726fc134af9 100644 (file)
--- a/modules/gui/qt4/dialogs/interaction.hpp
+++ b/modules/gui/qt4/dialogs/interaction.hpp
@@ -18,7 +18,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. 
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef _INTERACTION_H_
@@ -26,6 +26,7 @@
 
 #include <vlc/vlc.h>
 #include <vlc_interface.h>
+
 #include <QWidget>
 
 class QPushButton;

diff --git a/modules/gui/qt4/dialogs/mediainfo.hpp b/modules/gui/qt4/dialogs/mediainfo.hpp
index 5007e41e9fa26c159fc7ee732a482e884df78043..31254903669a546b45ce77a9dd009b696e145279 100644 (file)
--- a/modules/gui/qt4/dialogs/mediainfo.hpp
+++ b/modules/gui/qt4/dialogs/mediainfo.hpp
@@ -26,9 +26,8 @@
 #define _MEDIAINFO_DIALOG_H_
 
 #include "util/qvlcframe.hpp"
-#include <QTabWidget>
-#include <QBoxLayout>
 
+class QTabWidget;
 class InfoTab;
 
 class MediaInfoDialog : public QVLCFrame

diff --git a/modules/gui/qt4/dialogs/open.hpp b/modules/gui/qt4/dialogs/open.hpp
index 9df5d638f443312a7cca7950b6f0ee5b9d6f57c8..434958e7214243339493642ea4a04bd2deb928c4 100644 (file)
--- a/modules/gui/qt4/dialogs/open.hpp
+++ b/modules/gui/qt4/dialogs/open.hpp
@@ -28,7 +28,6 @@
 
 #include "util/qvlcframe.hpp"
 #include "dialogs_provider.hpp"
-
 #include "ui/open.h"
 #include "components/open.hpp"
 

diff --git a/modules/gui/qt4/dialogs/playlist.hpp b/modules/gui/qt4/dialogs/playlist.hpp
index 432b631a3985dd356c6dc6ab66ba675967fd7059..2f0724ef7b11336c4e47c273e07c6bbff2fb1da6 100644 (file)
--- a/modules/gui/qt4/dialogs/playlist.hpp
+++ b/modules/gui/qt4/dialogs/playlist.hpp
@@ -18,15 +18,16 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. 
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef _PLAYLIST_DIALOG_H_
 #define _PLAYLIST_DIALOG_H_
 
-#include <QModelIndex>
 #include "util/qvlcframe.hpp"
 
+#include <QModelIndex>
+
 class QSignalMapper;
 class PLSelector;
 class PLPanel;

diff --git a/modules/gui/qt4/dialogs/sout.hpp b/modules/gui/qt4/dialogs/sout.hpp
index fd51860e0fc83f3399c7bd5ac8b3fc1f5c1b1503..6540eeff8e34b9013b225e7e9dca4c24a29294c4 100644 (file)
--- a/modules/gui/qt4/dialogs/sout.hpp
+++ b/modules/gui/qt4/dialogs/sout.hpp
@@ -23,7 +23,9 @@
 
 #ifndef _SOUT_DIALOG_H_
 #define _SOUT_DIALOG_H_
+
 #include <vlc/vlc.h>
+
 #include "ui/sout.h"
 #include "util/qvlcframe.hpp"
 

diff --git a/modules/gui/qt4/dialogs_provider.hpp b/modules/gui/qt4/dialogs_provider.hpp
index dc135ef434ed64a67fe0b9439dbea5982faa0eb4..3d66c4de32f4bb1a80b0fded3fc09a5844ad7750 100644 (file)
--- a/modules/gui/qt4/dialogs_provider.hpp
+++ b/modules/gui/qt4/dialogs_provider.hpp
@@ -25,16 +25,16 @@
 #ifndef _DIALOGS_PROVIDER_H_
 #define _DIALOGS_PROVIDER_H_
 
-#include <QObject>
-#include <QTimer>
-#include <QApplication>
-
-#include "dialogs/interaction.hpp"
-
 #include <assert.h>
 #include <vlc/vlc.h>
 #include <vlc_interface.h>
 
+#include "dialogs/interaction.hpp"
+
+#include <QObject>
+#include <QTimer>
+#include <QApplication>
+
 #define EXT_FILTER_MEDIA        0x01
 #define EXT_FILTER_VIDEO        0x02
 #define EXT_FILTER_AUDIO        0x04

diff --git a/modules/gui/qt4/input_manager.hpp b/modules/gui/qt4/input_manager.hpp
index 93ef5357397ba5129018decdd2bef76971f3225c..da6a8fdc83bcf2e2290b4b33478fb85f820abb61 100644 (file)
--- a/modules/gui/qt4/input_manager.hpp
+++ b/modules/gui/qt4/input_manager.hpp
@@ -24,10 +24,11 @@
 #ifndef _INPUT_MANAGER_H_
 #define _INPUT_MANAGER_H_
 
-#include <QObject>
 #include <vlc/vlc.h>
 #include <vlc_input.h>
 
+#include <QObject>
+
 class InputManager : public QObject
 {
     Q_OBJECT;

diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index 76d954e28c51a32722829aef0d304d407f5d35a4..35311a444fdba46cd2d4a4b31d2e0cf787d28ca2 100644 (file)
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -18,7 +18,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. 
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #include "qt4.hpp"
@@ -39,6 +39,8 @@
 #include <QKeyEvent>
 #include <QUrl>
 #include <QSystemTrayIcon>
+#include <QSize>
+#include <QMenu>
 
 #include <assert.h>
 #include <vlc_keys.h>

diff --git a/modules/gui/qt4/main_interface.hpp b/modules/gui/qt4/main_interface.hpp
index 5c7a6c2d8b36192e1f194fa87e2f383b997a1499..1505cf682ecc460c0f2cf209a556df0c337e474d 100644 (file)
--- a/modules/gui/qt4/main_interface.hpp
+++ b/modules/gui/qt4/main_interface.hpp
@@ -18,20 +18,20 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. 
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef _MAIN_INTERFACE_H_
 #define _MAIN_INTERFACE_H_
 
+
 #include "qt4.hpp"
-#include <vlc_aout.h>
 #include "ui/main_interface.h"
 #include "util/qvlcframe.hpp"
 
-#include <QSize>
+#include <vlc_aout.h>
+
 #include <QSystemTrayIcon>
-#include <QMenu>
 
 class QSettings;
 class QCloseEvent;
@@ -47,6 +47,7 @@ class VolumeClickHandler;
 class VisualSelector;
 class ControlsWidget;
 class QMenu;
+class QSize;
 
 class MainInterface : public QVLCMW
 {

diff --git a/modules/gui/qt4/menus.hpp b/modules/gui/qt4/menus.hpp
index 015c26d62482c77a7079d06407efbdb0f3eb47bc..7ba94449c74515cf35ad5d8ff02c5d1da7776bbd 100644 (file)
--- a/modules/gui/qt4/menus.hpp
+++ b/modules/gui/qt4/menus.hpp
@@ -24,6 +24,7 @@
 #define _MENUS_H_
 
 #include "qt4.hpp"
+
 #include <QObject>
 #include <vector>
 

diff --git a/modules/gui/qt4/playlist_model.hpp b/modules/gui/qt4/playlist_model.hpp
index 5909fbc0e11bc94997e2f63bfd6d97d460ba96b7..d98da4794deea781dc2ab390c7cbc7c83388d056 100644 (file)
--- a/modules/gui/qt4/playlist_model.hpp
+++ b/modules/gui/qt4/playlist_model.hpp
@@ -24,15 +24,15 @@
 #ifndef _PLAYLIST_MODEL_H_
 #define _PLAYLIST_MODEL_H_
 
+#include <vlc/vlc.h>
+#include <vlc_input.h>
+#include <vlc_playlist.h>
+
 #include <QModelIndex>
 #include <QObject>
 #include <QEvent>
 #include <QMimeData>
 
-#include <vlc/vlc.h>
-#include <vlc_input.h>
-#include <vlc_playlist.h>
-
 class PLModel;
 
 class PLItem

diff --git a/modules/gui/qt4/qt4.hpp b/modules/gui/qt4/qt4.hpp
index 266d4f4a31bb1dcd6ee34e916bdda5deb6d36d01..1a84edee2481c72a90bdd53390d34e5f889a1c0f 100644 (file)
--- a/modules/gui/qt4/qt4.hpp
+++ b/modules/gui/qt4/qt4.hpp
@@ -27,6 +27,7 @@
 #include <vlc/vlc.h>
 #include <vlc_interface.h>
 #include <vlc_playlist.h>
+
 #include <QEvent>
 
 class QApplication;