Qt: EPG, include orders

diff --git a/modules/gui/qt4/components/epg/EPGEvent.hpp b/modules/gui/qt4/components/epg/EPGEvent.hpp
index 87e5d0ba909a650c8dd30529e4fd099eddf48951..1296f7b68cb8111b5d2ae39bdf68e157b9974bb9 100644 (file)
--- 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 ecacbe83ed580f8431ad20d4baa88051497b4968..c18ae55d7e89fbad3225a1affbd702a27576e743 100644 (file)
--- 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 035e97bc7ea59403edc1939da77795db0542fa0c..7a1c3b511360b63335ac2d6e58d6065f44858eee 100644 (file)
--- 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 7cadd6ef5579862366a18de7268fbfc5abdccd85..c37e2e5dfd7585df2abd1d87aad0ab2004065952 100644 (file)
--- 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 95d2c3ad96efec639631f27ef827d0775ed0f355..a87201d8cd88bdcd5e30133489b888474915f1e4 100644 (file)
--- 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 d40536ee69e449fc5403688288927355132d16cf..3e4bb19b545d8a687a93175935229f06e8cb17e0 100644 (file)
--- 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 3c8b4eac2b1de0a74ee0289c6e7e52b8234ad720..df062620dada8461c9a1ec51f349897325630a0d 100644 (file)
--- 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 82f857433b1fad439189c13cf3594df98e8efe4c..358c8562478921761e185f6f1785863be3627e34 100644 (file)
--- 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 );