Qt4 - #include cleaning

diff --git a/modules/gui/qt4/components/complete_preferences.cpp b/modules/gui/qt4/components/complete_preferences.cpp
index 6ffa19b05df9b4c316b2fe3c409059c27332888e..ed4b4f16c96572e88a8f76bd732a6fcb104e0d10 100644 (file)
--- a/modules/gui/qt4/components/complete_preferences.cpp
+++ b/modules/gui/qt4/components/complete_preferences.cpp
@@ -39,7 +39,6 @@
 
 #include "components/complete_preferences.hpp"
 #include "components/preferences_widgets.hpp"
-#include "qt4.hpp"
 
 #include <vlc_config_cat.h>
 #include <vlc_intf_strings.h>

diff --git a/modules/gui/qt4/components/interface_widgets.cpp b/modules/gui/qt4/components/interface_widgets.cpp
index 4663c15c53123b321c163fe45204bdc99cad64ca..2652fed8557b7e158341df29e67adf91774a4dbc 100644 (file)
--- a/modules/gui/qt4/components/interface_widgets.cpp
+++ b/modules/gui/qt4/components/interface_widgets.cpp
@@ -24,7 +24,6 @@
  *****************************************************************************/
 
 #include "dialogs_provider.hpp"
-#include "qt4.hpp"
 #include "components/interface_widgets.hpp"
 #include "main_interface.hpp"
 #include "input_manager.hpp"

diff --git a/modules/gui/qt4/components/open.cpp b/modules/gui/qt4/components/open.cpp
index 76a959b14d671c824745473926392b62f24d6add..380c5fe6fd8105640b75abdb0d805b5075fe6dbe 100644 (file)
--- a/modules/gui/qt4/components/open.cpp
+++ b/modules/gui/qt4/components/open.cpp
@@ -91,7 +91,7 @@ FileOpenPanel::FileOpenPanel( QWidget *_parent, intf_thread_t *_p_intf ) :
 
     /* Ugly hacks to get the good Widget */
     //This lineEdit is the normal line in the fileDialog.
-#if QT43
+#if HAS_QT43
     lineFileEdit = findChildren<QLineEdit*>()[2];
 #else
     lineFileEdit = findChildren<QLineEdit*>()[3];

diff --git a/modules/gui/qt4/components/preferences_widgets.cpp b/modules/gui/qt4/components/preferences_widgets.cpp
index bf289406f99a5af1965be9fa488e2144699a12d9..ad7a2e2e94a9cc79803cdd5334d7151a75aa2011 100644 (file)
--- a/modules/gui/qt4/components/preferences_widgets.cpp
+++ b/modules/gui/qt4/components/preferences_widgets.cpp
@@ -34,7 +34,6 @@
 
 #include "components/preferences_widgets.hpp"
 #include "util/customwidgets.hpp"
-#include "qt4.hpp"
 
 #include <vlc_keys.h>
 

diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp
index ee850821868b2531c1cecbf936b5c42682a72049..db0b7127dd9a679597fd689d0fe4e1d5cc04a88e 100644 (file)
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -25,7 +25,6 @@
 
 #include "components/simple_preferences.hpp"
 #include "components/preferences_widgets.hpp"
-#include "qt4.hpp"
 
 #include "ui/sprefs_audio.h"
 #include "ui/sprefs_input.h"

diff --git a/modules/gui/qt4/qt4.hpp b/modules/gui/qt4/qt4.hpp
index 3c2de020e581f6bbacd17fa3f6fc959a7635e3ff..ff3079cafe5fe5fe7d3118e9dd663fef59170b32 100644 (file)
--- a/modules/gui/qt4/qt4.hpp
+++ b/modules/gui/qt4/qt4.hpp
@@ -30,13 +30,12 @@
 
 #include <QEvent>
 
-#define QT43 ( QT_VERSION >= 0x040300 )
+#define HAS_QT43 ( QT_VERSION >= 0x040300 )
 
 /* Add define for duration, VLC_META_ENGINE doesn't include it */
 #define VLC_META_ENGINE_DURATION   0x00000002
 #define VLC_META_DURATION          N_("Duration")
 
-
 class QApplication;
 class QMenu;
 class MainInterface;
@@ -114,16 +113,4 @@ public:
     intf_dialog_args_t *p_arg;
 };
 
-/* Ugly to put it here, but don't want more files ... */
-#if 0
-#include <QFrame>
-class BasePlaylistWidget : public QFrame
-{
-public:
-    BasePlaylistWidget( intf_thread_t *_p_i ) : p_intf( _p_i)  {};
-    virtual ~BasePlaylistWidget() {};
-protected:
-    intf_thread_t *p_intf;
-};
-#endif
 #endif

diff --git a/modules/gui/qt4/util/qvlcframe.hpp b/modules/gui/qt4/util/qvlcframe.hpp
index 262bb4507feec06ea633d0e7af0e1cf5a5a5d1c4..03a5db73f16600d84cecf03bce2d390195f0451f 100644 (file)
--- a/modules/gui/qt4/util/qvlcframe.hpp
+++ b/modules/gui/qt4/util/qvlcframe.hpp
@@ -34,6 +34,7 @@
 #include <QPlastiqueStyle>
 #include <QPushButton>
 #include <QKeyEvent>
+
 #include "qt4.hpp"
 #include <vlc/vlc.h>
 #include <vlc_charset.h>