Qt: clean up includes and forward declare when possible

diff --git a/modules/gui/qt4/components/epg/EPGChannels.cpp b/modules/gui/qt4/components/epg/EPGChannels.cpp
index 28616a93ccabc4c5135225ca0ebbb17a24eaade6..902832d4d4d0ef7248eb28ed0190d7d37a9f5787 100644 (file)
--- a/modules/gui/qt4/components/epg/EPGChannels.cpp
+++ b/modules/gui/qt4/components/epg/EPGChannels.cpp
@@ -20,6 +20,10 @@
  * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#include "qt4.hpp"
+
+#include <vlc_epg.h>
+
 #include "EPGChannels.hpp"
 #include "EPGView.hpp"
 

diff --git a/modules/gui/qt4/components/epg/EPGItem.cpp b/modules/gui/qt4/components/epg/EPGItem.cpp
index f932c057f3d2ae8e14be8d71bb13093b28e9eb54..b526bb54a69e081d2ea11bc056b198edc47b19d4 100644 (file)
--- a/modules/gui/qt4/components/epg/EPGItem.cpp
+++ b/modules/gui/qt4/components/epg/EPGItem.cpp
@@ -24,10 +24,8 @@
 #include <QTransform>
 #include <QFont>
 #include <QFontMetrics>
-#include <QDebug>
 #include <QDateTime>
 #include <QFocusEvent>
-#include <QGraphicsScene>
 #include <QStyleOptionGraphicsItem>
 #include <QGraphicsSceneHoverEvent>
 #include <QStyle>

diff --git a/modules/gui/qt4/components/epg/EPGItem.hpp b/modules/gui/qt4/components/epg/EPGItem.hpp
index f5f9d9cb8bc8aaf0d510f39f956cf04f380cd60e..261e7a1a69e962b8a99aef5ad5319ec0be8e21af 100644 (file)
--- a/modules/gui/qt4/components/epg/EPGItem.hpp
+++ b/modules/gui/qt4/components/epg/EPGItem.hpp
@@ -32,7 +32,6 @@
 
 class QPainter;
 class QString;
-
 class EPGView;
 
 class EPGItem : public QGraphicsItem

diff --git a/modules/gui/qt4/components/epg/EPGView.cpp b/modules/gui/qt4/components/epg/EPGView.cpp
index 2f4e9fb2b89b20c0ddec4888b2293bb1df96409e..b5b3128db0ea6229f9f18f8c710ed16a930269fb 100644 (file)
--- a/modules/gui/qt4/components/epg/EPGView.cpp
+++ b/modules/gui/qt4/components/epg/EPGView.cpp
@@ -21,6 +21,10 @@
  * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#include "qt4.hpp"
+
+#include <vlc_epg.h>
+
 #include "EPGView.hpp"
 #include "EPGItem.hpp"
 

diff --git a/modules/gui/qt4/components/epg/EPGView.hpp b/modules/gui/qt4/components/epg/EPGView.hpp
index 222deb6e6a26e66c7de8cacfcee548fca782dc1f..7ca75759e8d222ca79754d5484e59702c60bb715 100644 (file)
--- a/modules/gui/qt4/components/epg/EPGView.hpp
+++ b/modules/gui/qt4/components/epg/EPGView.hpp
@@ -24,7 +24,9 @@
 #ifndef EPGVIEW_H
 #define EPGVIEW_H
 
-#include "EPGItem.hpp"
+#include "qt4.hpp"
+
+#include <vlc_epg.h>
 
 #include <QGraphicsView>
 #include <QGraphicsScene>
@@ -33,6 +35,8 @@
 #include <QMutex>
 #include <QDateTime>
 
+class EPGItem;
+
 #define TRACKS_HEIGHT 60
 
 typedef QMap<QDateTime, EPGItem *> EPGEventByTimeQMap;

diff --git a/modules/gui/qt4/components/epg/EPGWidget.cpp b/modules/gui/qt4/components/epg/EPGWidget.cpp
index 23730941a5381f2ed00fed19545098c03afecbac..c88e6df183e3a1ddad9a6ed829b3417cb5a04655 100644 (file)
--- a/modules/gui/qt4/components/epg/EPGWidget.cpp
+++ b/modules/gui/qt4/components/epg/EPGWidget.cpp
@@ -21,21 +21,21 @@
  * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include "qt4.hpp"
 
-#include "EPGWidget.hpp"
+#include <vlc_epg.h>
+#include "input_manager.hpp"
 
 #include <QStackedWidget>
 #include <QVBoxLayout>
 #include <QScrollBar>
 #include <QLabel>
 #include <QStringList>
-#include "qt4.hpp"
-#include "input_manager.hpp"
-#include <vlc_common.h>
-#include <vlc_epg.h>
+
+#include "EPGWidget.hpp"
+#include "EPGRuler.hpp"
+#include "EPGView.hpp"
+#include "EPGChannels.hpp"
 
 EPGWidget::EPGWidget( QWidget *parent ) : QWidget( parent )
 {

diff --git a/modules/gui/qt4/components/epg/EPGWidget.hpp b/modules/gui/qt4/components/epg/EPGWidget.hpp
index 5f648655d18630397190c979ad0c55d5bb6f44ac..fc3a86b0341eec738028bac45446bc1a976f56fa 100644 (file)
--- a/modules/gui/qt4/components/epg/EPGWidget.hpp
+++ b/modules/gui/qt4/components/epg/EPGWidget.hpp
@@ -24,17 +24,17 @@
 #ifndef EPGWIDGET_H
 #define EPGWIDGET_H
 
-#include "EPGView.hpp"
-#include "EPGItem.hpp"
-#include "EPGRuler.hpp"
-#include "EPGChannels.hpp"
-
 #include <vlc_common.h>
 #include <vlc_epg.h>
 
 #include <QWidget>
 #include <QStackedWidget>
 
+class EPGView;
+class EPGItem;
+class EPGRuler;
+class EPGChannels;
+
 class EPGWidget : public QWidget
 {
     Q_OBJECT

diff --git a/modules/gui/qt4/components/playlist/playlist_model.cpp b/modules/gui/qt4/components/playlist/playlist_model.cpp
index c318e0f0bcfd34b8a72409f40fa22b0c198bded9..2bf217a7182093ebd5b02b0d5e918256f13c9b6b 100644 (file)
--- a/modules/gui/qt4/components/playlist/playlist_model.cpp
+++ b/modules/gui/qt4/components/playlist/playlist_model.cpp
@@ -39,9 +39,7 @@
 
 #include <assert.h>
 #include <QFont>
-#include <QTimer>
 #include <QAction>
-#include <QBuffer>
 
 /*************************************************************************
  * Playlist model implementation

diff --git a/modules/gui/qt4/dialogs/epg.cpp b/modules/gui/qt4/dialogs/epg.cpp
index bf2c1fbc3e38e8c91a1cc241f55e50af8731ef65..de5b238eb7becca1935dc455b03bce4c19ffbc8c 100644 (file)
--- a/modules/gui/qt4/dialogs/epg.cpp
+++ b/modules/gui/qt4/dialogs/epg.cpp
@@ -27,6 +27,7 @@
 #include "dialogs/epg.hpp"
 
 #include "components/epg/EPGWidget.hpp"
+#include "components/epg/EPGItem.hpp"
 #include <vlc_playlist.h>
 
 #include <QVBoxLayout>
@@ -37,6 +38,7 @@
 #include <QTextEdit>
 #include <QDialogButtonBox>
 #include <QTimer>
+#include <QDateTime>
 
 #include "qt4.hpp"
 #include "input_manager.hpp"

diff --git a/modules/gui/qt4/util/input_slider.cpp b/modules/gui/qt4/util/input_slider.cpp
index d947d861f1d089d564e8481e2fd466bf1e8fcff0..b7ebda3221a4767975fe4c49ff885aa2a62d3f32 100644 (file)
--- a/modules/gui/qt4/util/input_slider.cpp
+++ b/modules/gui/qt4/util/input_slider.cpp
@@ -30,6 +30,7 @@
 #include "qt4.hpp"
 
 #include "util/input_slider.hpp"
+#include "util/timetooltip.hpp"
 #include "adapters/seekpoints.hpp"
 
 #include <QPaintEvent>

diff --git a/modules/gui/qt4/util/input_slider.hpp b/modules/gui/qt4/util/input_slider.hpp
index 9fdfd42eacf47ec3b178a1b39fec18464660a78f..47261091fc34fa6d24bcf347934b93481d60fcac 100644 (file)
--- 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 "timetooltip.hpp"
 #include "styles/seekstyle.hpp"
 
 #include <QSlider>
@@ -46,6 +45,7 @@ class QTimer;
 class SeekPoints;
 class QPropertyAnimation;
 class QCommonStyle;
+class TimeTooltip;
 
 /* Input Slider derived from QSlider */
 class SeekSlider : public QSlider