Qt: clean up includes and forward declare when possible

Author: etix

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"
 

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>

modules/gui/qt4/components/epg/EPGItem.hpp

@@ -32,7 +32,6 @@
 
 class QPainter;
 class QString;
-
 class EPGView;
 
 class EPGItem : public QGraphicsItem

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"
 

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;

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 )
 {

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

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

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"

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>