[vlc-commits] Qt: remove unnecessary includes

Jean-Baptiste Kempf git at videolan.org
Mon May 19 14:47:30 CEST 2014


vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Mon May 19 13:40:24 2014 +0200| [c407f5e0bb1ae12ee99b02bd26e15bd748807626] | committer: Jean-Baptiste Kempf

Qt: remove unnecessary includes

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c407f5e0bb1ae12ee99b02bd26e15bd748807626
---

 modules/gui/qt4/components/info_panels.cpp |    8 ++++++++
 modules/gui/qt4/components/info_panels.hpp |   11 -----------
 modules/gui/qt4/input_manager.cpp          |    9 +++++----
 modules/gui/qt4/util/input_slider.hpp      |    1 -
 4 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/modules/gui/qt4/components/info_panels.cpp b/modules/gui/qt4/components/info_panels.cpp
index fcc4f4e..989f138 100644
--- a/modules/gui/qt4/components/info_panels.cpp
+++ b/modules/gui/qt4/components/info_panels.cpp
@@ -51,6 +51,14 @@
 #include <QSpinBox>
 #include <QTextEdit>
 
+static inline void setSpinBounds( QSpinBox *spinbox ) {
+    spinbox->setRange( 0, INT_MAX );
+    spinbox->setAccelerated( true );
+    spinbox->setAlignment( Qt::AlignRight );
+    spinbox->setSpecialValueText("");
+}
+
+
 /************************************************************************
  * Single panels
  ************************************************************************/
diff --git a/modules/gui/qt4/components/info_panels.hpp b/modules/gui/qt4/components/info_panels.hpp
index e7d7617..90c7b4a 100644
--- a/modules/gui/qt4/components/info_panels.hpp
+++ b/modules/gui/qt4/components/info_panels.hpp
@@ -31,21 +31,10 @@
 #endif
 
 #include <vlc_common.h>
-#include <vlc_meta.h>
-
 #include <QWidget>
 
-#include <limits.h>
-
-#define setSpinBounds( spinbox ) {               \
-    spinbox->setRange( 0, INT_MAX );             \
-    spinbox->setAccelerated( true ) ;            \
-    spinbox->setAlignment( Qt::AlignRight );     \
-    spinbox->setSpecialValueText(""); }
-
 class QTreeWidget;
 class QTreeWidgetItem;
-class QTreeView;
 class QSpinBox;
 class QLineEdit;
 class CoverArtLabel;
diff --git a/modules/gui/qt4/input_manager.cpp b/modules/gui/qt4/input_manager.cpp
index c8067ef..affb694 100644
--- a/modules/gui/qt4/input_manager.cpp
+++ b/modules/gui/qt4/input_manager.cpp
@@ -32,10 +32,11 @@
 
 #include "input_manager.hpp"
 #include "recents.hpp"
-#include <vlc_keys.h>
-#include <vlc_url.h>
-#include <vlc_strings.h>
-#include <vlc_aout.h>
+
+#include <vlc_keys.h>           /* ACTION_ID */
+#include <vlc_url.h>            /* decode_URI */
+#include <vlc_strings.h>        /* str_format_meta */
+#include <vlc_aout.h>           /* audio_output_t */
 
 #include <QApplication>
 #include <QFile>
diff --git a/modules/gui/qt4/util/input_slider.hpp b/modules/gui/qt4/util/input_slider.hpp
index 4b76966..873b729 100644
--- a/modules/gui/qt4/util/input_slider.hpp
+++ b/modules/gui/qt4/util/input_slider.hpp
@@ -30,7 +30,6 @@
 # include "config.h"
 #endif
 
-#include <vlc_common.h>
 #include "timetooltip.hpp"
 #include "styles/seekstyle.hpp"
 



More information about the vlc-commits mailing list