From: Jean-Baptiste Kempf <jb@videolan.org>
Date: Sat, 6 Oct 2007 13:53:53 +0000 (+0000)
Subject: Qt4 - #include cleaning
X-Git-Tag: 0.9.0-test0~5185
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=0ba0df157bca20f1f3d960e1f04600028f39c3ec;p=vlc

Qt4 - #include cleaning
---

diff --git a/modules/gui/qt4/components/complete_preferences.cpp b/modules/gui/qt4/components/complete_preferences.cpp
index 6ffa19b05d..ed4b4f16c9 100644
--- 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 4663c15c53..2652fed855 100644
--- 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 76a959b14d..380c5fe6fd 100644
--- 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 bf289406f9..ad7a2e2e94 100644
--- 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 ee85082186..db0b7127dd 100644
--- 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 3c2de020e5..ff3079cafe 100644
--- 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 262bb4507f..03a5db73f1 100644
--- 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>