From c1e1d8755203254cb72a51625e0202b8cdc07727 2012-07-05 13:53:26
From: Marek Rosa <marek.rosa@digia.com>
Date: 2012-07-05 13:53:26
Subject: [PATCH] removed many unnecessary includes from declarative files

---

diff --git a/plugins/declarative/declarativeareaseries.cpp b/plugins/declarative/declarativeareaseries.cpp
index a1c75e8..a621d5f 100644
--- a/plugins/declarative/declarativeareaseries.cpp
+++ b/plugins/declarative/declarativeareaseries.cpp
@@ -19,9 +19,6 @@
 ****************************************************************************/
 
 #include "declarativeareaseries.h"
-#include "declarativechart.h"
-#include "qchart.h"
-#include "qxymodelmapper.h"
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
diff --git a/plugins/declarative/declarativeareaseries.h b/plugins/declarative/declarativeareaseries.h
index 55f4468..659a8ff 100644
--- a/plugins/declarative/declarativeareaseries.h
+++ b/plugins/declarative/declarativeareaseries.h
@@ -21,10 +21,8 @@
 #ifndef DECLARATIVEAREASERIES_H
 #define DECLARATIVEAREASERIES_H
 
-#include "qchartglobal.h"
 #include "qareaseries.h"
 #include "declarativelineseries.h"
-#include "qabstractaxis.h"
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
diff --git a/plugins/declarative/declarativebarseries.cpp b/plugins/declarative/declarativebarseries.cpp
index a3a65c6..dd22a30 100644
--- a/plugins/declarative/declarativebarseries.cpp
+++ b/plugins/declarative/declarativebarseries.cpp
@@ -19,11 +19,9 @@
 ****************************************************************************/
 
 #include "declarativebarseries.h"
-#include "declarativechart.h"
 #include <QBarSet>
 #include <QVBarModelMapper>
 #include <QHBarModelMapper>
-#include <QAbstractAxis>
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
diff --git a/plugins/declarative/declarativebarseries.h b/plugins/declarative/declarativebarseries.h
index ae4f3f3..f0875cd 100644
--- a/plugins/declarative/declarativebarseries.h
+++ b/plugins/declarative/declarativebarseries.h
@@ -21,13 +21,10 @@
 #ifndef DECLARATIVEBARSERIES_H
 #define DECLARATIVEBARSERIES_H
 
-#include "qchartglobal.h"
-#include "qabstractbarseries.h"
 #include "qbarseries.h"
 #include "qstackedbarseries.h"
 #include "qpercentbarseries.h"
 #include "qbarset.h"
-#include "qabstractaxis.h"
 #include <QDeclarativeItem>
 #include <QDeclarativeParserStatus>
 
diff --git a/plugins/declarative/declarativelineseries.cpp b/plugins/declarative/declarativelineseries.cpp
index dda1f5f..6a9a8e2 100644
--- a/plugins/declarative/declarativelineseries.cpp
+++ b/plugins/declarative/declarativelineseries.cpp
@@ -19,9 +19,6 @@
 ****************************************************************************/
 
 #include "declarativelineseries.h"
-#include "declarativechart.h"
-#include "qchart.h"
-#include "qlineseries.h"
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
diff --git a/plugins/declarative/declarativelineseries.h b/plugins/declarative/declarativelineseries.h
index 725855d..a46fc0c 100644
--- a/plugins/declarative/declarativelineseries.h
+++ b/plugins/declarative/declarativelineseries.h
@@ -21,11 +21,8 @@
 #ifndef DECLARATIVELINESERIES_H
 #define DECLARATIVELINESERIES_H
 
-#include "qchartglobal.h"
 #include "qlineseries.h"
 #include "declarativexyseries.h"
-#include "qabstractaxis.h"
-#include <QDeclarativeParserStatus>
 #include <QDeclarativeListProperty>
 #include <QDeclarativeParserStatus>
 
diff --git a/plugins/declarative/declarativepieseries.cpp b/plugins/declarative/declarativepieseries.cpp
index 7d9c79f..6063cee 100644
--- a/plugins/declarative/declarativepieseries.cpp
+++ b/plugins/declarative/declarativepieseries.cpp
@@ -19,15 +19,12 @@
 ****************************************************************************/
 
 #include "declarativepieseries.h"
-#include "declarativechart.h"
-#include "qchart.h"
-#include <qdeclarativelist.h>
 #include <QVPieModelMapper>
 #include <QHPieModelMapper>
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
-DeclarativePieSeries::DeclarativePieSeries(QObject *parent) :
+DeclarativePieSeries::DeclarativePieSeries(QDeclarativeItem *parent) :
     QPieSeries(parent)
 {
     connect(this, SIGNAL(added(QList<QPieSlice*>)), this, SLOT(handleAdded(QList<QPieSlice*>)));
diff --git a/plugins/declarative/declarativepieseries.h b/plugins/declarative/declarativepieseries.h
index fb9fdf5..3f57c8e 100644
--- a/plugins/declarative/declarativepieseries.h
+++ b/plugins/declarative/declarativepieseries.h
@@ -21,17 +21,13 @@
 #ifndef DECLARATIVEPIESERIES_H
 #define DECLARATIVEPIESERIES_H
 
-#include "qchartglobal.h"
-#include <QPieSlice>
-#include <QPieSeries>
+#include "qpieslice.h"
+#include "qpieseries.h"
+#include <QDeclarativeItem>
 #include <QDeclarativeParserStatus>
-#include <QDeclarativeListProperty>
-#include <QAbstractItemModel>
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
-class QChart;
-
 class DeclarativePieSeries : public QPieSeries, public QDeclarativeParserStatus
 {
     Q_OBJECT
@@ -40,7 +36,7 @@ class DeclarativePieSeries : public QPieSeries, public QDeclarativeParserStatus
     Q_CLASSINFO("DefaultProperty", "seriesChildren")
 
 public:
-    explicit DeclarativePieSeries(QObject *parent = 0);
+    explicit DeclarativePieSeries(QDeclarativeItem *parent = 0);
     QDeclarativeListProperty<QObject> seriesChildren();
     Q_INVOKABLE QPieSlice *at(int index);
     Q_INVOKABLE QPieSlice *find(QString label);
diff --git a/plugins/declarative/declarativescatterseries.cpp b/plugins/declarative/declarativescatterseries.cpp
index 53deebb..c362777 100644
--- a/plugins/declarative/declarativescatterseries.cpp
+++ b/plugins/declarative/declarativescatterseries.cpp
@@ -19,9 +19,6 @@
 ****************************************************************************/
 
 #include "declarativescatterseries.h"
-#include "declarativechart.h"
-#include "qchart.h"
-#include "qscatterseries.h"
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
diff --git a/plugins/declarative/declarativescatterseries.h b/plugins/declarative/declarativescatterseries.h
index c352f74..2d3a0c2 100644
--- a/plugins/declarative/declarativescatterseries.h
+++ b/plugins/declarative/declarativescatterseries.h
@@ -21,10 +21,8 @@
 #ifndef DECLARATIVESCATTERSERIES_H
 #define DECLARATIVESCATTERSERIES_H
 
-#include "qchartglobal.h"
 #include "qscatterseries.h"
 #include "declarativexyseries.h"
-#include "qabstractaxis.h"
 #include <QDeclarativeListProperty>
 #include <QDeclarativeParserStatus>
 
diff --git a/plugins/declarative/declarativesplineseries.cpp b/plugins/declarative/declarativesplineseries.cpp
index e924f4a..53f4a03 100644
--- a/plugins/declarative/declarativesplineseries.cpp
+++ b/plugins/declarative/declarativesplineseries.cpp
@@ -19,9 +19,6 @@
 ****************************************************************************/
 
 #include "declarativesplineseries.h"
-#include "declarativechart.h"
-#include <QChart>
-#include "declarativexypoint.h"
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
diff --git a/plugins/declarative/declarativesplineseries.h b/plugins/declarative/declarativesplineseries.h
index ce4539f..1c278d7 100644
--- a/plugins/declarative/declarativesplineseries.h
+++ b/plugins/declarative/declarativesplineseries.h
@@ -21,13 +21,10 @@
 #ifndef DECLARATIVESPLINESERIES_H
 #define DECLARATIVESPLINESERIES_H
 
-#include "qchartglobal.h"
 #include "qsplineseries.h"
 #include "declarativexyseries.h"
-#include "qabstractaxis.h"
 #include <QDeclarativeParserStatus>
 #include <QDeclarativeListProperty>
-#include <QDeclarativeParserStatus>
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
diff --git a/plugins/declarative/declarativexyseries.cpp b/plugins/declarative/declarativexyseries.cpp
index 42de00a..b9830e5 100644
--- a/plugins/declarative/declarativexyseries.cpp
+++ b/plugins/declarative/declarativexyseries.cpp
@@ -18,13 +18,10 @@
 **
 ****************************************************************************/
 
-//#include "DeclarativeXySeries.h"
+
 #include "declarativexyseries.h"
-#include "declarativechart.h"
-#include <QXYSeries>
 #include <QVXYModelMapper>
 #include <QHXYModelMapper>
-#include <QDeclarativeListProperty>
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
diff --git a/plugins/declarative/declarativexyseries.h b/plugins/declarative/declarativexyseries.h
index 84a1e68..b0866e9 100644
--- a/plugins/declarative/declarativexyseries.h
+++ b/plugins/declarative/declarativexyseries.h
@@ -21,9 +21,7 @@
 #ifndef DECLARATIVE_XY_SERIES_H
 #define DECLARATIVE_XY_SERIES_H
 
-#include "qchartglobal.h"
 #include "declarativexypoint.h"
-#include <QColor>
 #include <QXYSeries>
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
diff --git a/plugins/declarative/plugin.cpp b/plugins/declarative/plugin.cpp
index db8a182..03084a5 100644
--- a/plugins/declarative/plugin.cpp
+++ b/plugins/declarative/plugin.cpp
@@ -32,12 +32,13 @@
 #include "declarativescatterseries.h"
 #include "declarativebarseries.h"
 #include "declarativepieseries.h"
-#include <QVXYModelMapper>
-#include <QHXYModelMapper>
-#include <QHPieModelMapper>
-#include <QVPieModelMapper>
-#include <QHBarModelMapper>
-#include <QVBarModelMapper>
+#include "qvxymodelmapper.h"
+#include "qhxymodelmapper.h"
+#include "qhpiemodelmapper.h"
+#include "qvpiemodelmapper.h"
+#include "qhbarmodelmapper.h"
+#include "qvbarmodelmapper.h"
+#include <QAbstractItemModel>
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
@@ -88,10 +89,6 @@ public:
                                              QLatin1String("Trying to create uncreatable: AbstractBarSeries."));
         qmlRegisterUncreatableType<QAbstractAxis>(uri, 1, 0, "AbstractAxis",
                                           QLatin1String("Trying to create uncreatable: AbstractAxis."));
-        qmlRegisterUncreatableType<QPieModelMapper>(uri, 1, 0, "PieModelMapper",
-                                                    QLatin1String("Trying to create uncreatable: PieModelMapper."));
-        qmlRegisterUncreatableType<QXYModelMapper>(uri, 1, 0, "XYModelMapper",
-                                                    QLatin1String("Trying to create uncreatable: XYModelMapper."));
     }
 };