From 541836cdf89dc38053eaeab1373612a773b498fa Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Kempf <jb@videolan.org>
Date: Wed, 27 Jan 2010 01:17:39 +0100
Subject: [PATCH] Qt: EPG, include orders

---
 modules/gui/qt4/components/epg/EPGEvent.hpp  |  2 +-
 modules/gui/qt4/components/epg/EPGItem.cpp   |  1 +
 modules/gui/qt4/components/epg/EPGItem.hpp   |  7 ++++---
 modules/gui/qt4/components/epg/EPGRuler.cpp  |  1 +
 modules/gui/qt4/components/epg/EPGView.cpp   |  4 +++-
 modules/gui/qt4/components/epg/EPGView.hpp   |  6 +++---
 modules/gui/qt4/components/epg/EPGWidget.cpp |  5 +++--
 modules/gui/qt4/components/epg/EPGWidget.hpp | 16 ++++++++--------
 8 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/modules/gui/qt4/components/epg/EPGEvent.hpp b/modules/gui/qt4/components/epg/EPGEvent.hpp
index 87e5d0ba90..1296f7b68c 100644
--- a/modules/gui/qt4/components/epg/EPGEvent.hpp
+++ b/modules/gui/qt4/components/epg/EPGEvent.hpp
@@ -24,7 +24,7 @@
 #ifndef EPGEVENT_H
 #define EPGEVENT_H
 
-#include <QString>
+class QString;
 #include <QDateTime>
 
 class EPGEvent
diff --git a/modules/gui/qt4/components/epg/EPGItem.cpp b/modules/gui/qt4/components/epg/EPGItem.cpp
index ecacbe83ed..c18ae55d7e 100644
--- a/modules/gui/qt4/components/epg/EPGItem.cpp
+++ b/modules/gui/qt4/components/epg/EPGItem.cpp
@@ -25,6 +25,7 @@
 #include <QFont>
 #include <QFontMetrics>
 #include <QDebug>
+#include <QDateTime>
 
 #include "EPGItem.hpp"
 #include "EPGView.hpp"
diff --git a/modules/gui/qt4/components/epg/EPGItem.hpp b/modules/gui/qt4/components/epg/EPGItem.hpp
index 035e97bc7e..7a1c3b5113 100644
--- a/modules/gui/qt4/components/epg/EPGItem.hpp
+++ b/modules/gui/qt4/components/epg/EPGItem.hpp
@@ -26,9 +26,10 @@
 
 #include <QObject>
 #include <QGraphicsItem>
-#include <QPainter>
-#include <QString>
-#include <QDateTime>
+
+class QPainter;
+class QString;
+class QDateTime;
 
 class EPGView;
 
diff --git a/modules/gui/qt4/components/epg/EPGRuler.cpp b/modules/gui/qt4/components/epg/EPGRuler.cpp
index 7cadd6ef55..c37e2e5dfd 100644
--- a/modules/gui/qt4/components/epg/EPGRuler.cpp
+++ b/modules/gui/qt4/components/epg/EPGRuler.cpp
@@ -27,6 +27,7 @@
 #include <QFont>
 #include <QPaintEvent>
 #include <QtDebug>
+#include <QDateTime>
 
 EPGRuler::EPGRuler( QWidget* parent )
     : QWidget( parent )
diff --git a/modules/gui/qt4/components/epg/EPGView.cpp b/modules/gui/qt4/components/epg/EPGView.cpp
index 95d2c3ad96..a87201d8cd 100644
--- a/modules/gui/qt4/components/epg/EPGView.cpp
+++ b/modules/gui/qt4/components/epg/EPGView.cpp
@@ -21,9 +21,11 @@
  * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#include <QMatrix>
 #include "EPGView.hpp"
 #include "EPGItem.hpp"
+
+#include <QDateTime>
+#include <QMatrix>
 #include <QtDebug>
 
 EPGView::EPGView( QWidget *parent ) : QGraphicsView( parent )
diff --git a/modules/gui/qt4/components/epg/EPGView.hpp b/modules/gui/qt4/components/epg/EPGView.hpp
index d40536ee69..3e4bb19b54 100644
--- a/modules/gui/qt4/components/epg/EPGView.hpp
+++ b/modules/gui/qt4/components/epg/EPGView.hpp
@@ -24,14 +24,14 @@
 #ifndef EPGVIEW_H
 #define EPGVIEW_H
 
+#include "EPGEvent.hpp"
+
 #include <QGraphicsView>
-#include <QVBoxLayout>
 #include <QList>
 
-#include "EPGEvent.hpp"
-
 #define TRACKS_HEIGHT 75
 
+class QDateTime;
 class EPGView : public QGraphicsView
 {
 Q_OBJECT
diff --git a/modules/gui/qt4/components/epg/EPGWidget.cpp b/modules/gui/qt4/components/epg/EPGWidget.cpp
index 3c8b4eac2b..df062620da 100644
--- a/modules/gui/qt4/components/epg/EPGWidget.cpp
+++ b/modules/gui/qt4/components/epg/EPGWidget.cpp
@@ -21,11 +21,12 @@
  * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#include "EPGWidget.hpp"
+
 #include <QGridLayout>
 #include <QScrollBar>
 #include <QDebug>
-
-#include "EPGWidget.hpp"
+#include <QLabel>
 
 ChannelsWidget::ChannelsWidget( QWidget *parent ) : QWidget( parent )
 {
diff --git a/modules/gui/qt4/components/epg/EPGWidget.hpp b/modules/gui/qt4/components/epg/EPGWidget.hpp
index 82f857433b..358c856247 100644
--- a/modules/gui/qt4/components/epg/EPGWidget.hpp
+++ b/modules/gui/qt4/components/epg/EPGWidget.hpp
@@ -24,12 +24,6 @@
 #ifndef EPGWIDGET_H
 #define EPGWIDGET_H
 
-#include <QWidget>
-#include <QMap>
-#include <QMultiMap>
-#include <QDateTime>
-#include <QLabel>
-
 #include "EPGView.hpp"
 #include "EPGEvent.hpp"
 #include "EPGRuler.hpp"
@@ -37,16 +31,22 @@
 #include <vlc_common.h>
 #include <vlc_epg.h>
 
+#include <QWidget>
+#include <QMultiMap>
+
+class QDateTime;
+class QLabel;
+
 class ChannelsWidget : public QWidget
 {
-Q_OBJECT
+    Q_OBJECT
 public:
     explicit ChannelsWidget( QWidget* parent = 0 );
 };
 
 class EPGWidget : public QWidget
 {
-Q_OBJECT
+    Q_OBJECT
 public:
     explicit EPGWidget( QWidget* parent = 0 );
 
-- 
2.39.2