From 0dedc62bbc09514a50400182402df46a273a7c3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= <tomi.korpipaa@digia.com>
Date: Tue, 3 Jun 2014 12:55:12 +0300
Subject: Clean up declarative
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Task-number: QTRD-3149
Change-Id: Icaa8aba25a5041268709f625c3d1b0be91fab069
Change-Id: Icaa8aba25a5041268709f625c3d1b0be91fab069
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
---
 src/datavisualizationqml2/abstractdeclarative.cpp   |  1 -
 src/datavisualizationqml2/abstractdeclarative_p.h   |  3 ---
 src/datavisualizationqml2/declarativebars.cpp       |  3 ---
 src/datavisualizationqml2/declarativebars_p.h       |  5 -----
 src/datavisualizationqml2/declarativerendernode.cpp |  2 --
 src/datavisualizationqml2/declarativerendernode_p.h |  4 ----
 src/datavisualizationqml2/declarativescatter.cpp    |  2 --
 src/datavisualizationqml2/declarativescatter_p.h    |  3 ---
 src/datavisualizationqml2/declarativeseries.cpp     | 12 ++++++------
 src/datavisualizationqml2/declarativesurface.cpp    |  3 ---
 src/datavisualizationqml2/declarativesurface_p.h    |  3 ---
 src/datavisualizationqml2/enumtostringmap.cpp       |  5 +++--
 src/datavisualizationqml2/glstatestore.cpp          |  1 +
 src/datavisualizationqml2/glstatestore_p.h          |  2 --
 14 files changed, 10 insertions(+), 39 deletions(-)

diff --git a/src/datavisualizationqml2/abstractdeclarative.cpp b/src/datavisualizationqml2/abstractdeclarative.cpp
index 9805cfb4..04c41964 100644
--- a/src/datavisualizationqml2/abstractdeclarative.cpp
+++ b/src/datavisualizationqml2/abstractdeclarative.cpp
@@ -17,7 +17,6 @@
 ****************************************************************************/
 
 #include "abstractdeclarative_p.h"
-#include "qvalue3daxis.h"
 #include "declarativetheme_p.h"
 #include "declarativerendernode_p.h"
 
diff --git a/src/datavisualizationqml2/abstractdeclarative_p.h b/src/datavisualizationqml2/abstractdeclarative_p.h
index c2f9ee08..ce19edd2 100644
--- a/src/datavisualizationqml2/abstractdeclarative_p.h
+++ b/src/datavisualizationqml2/abstractdeclarative_p.h
@@ -31,12 +31,9 @@
 
 #include "datavisualizationglobal_p.h"
 #include "abstract3dcontroller_p.h"
-#include "qabstract3dinputhandler.h"
 #include "declarativescene_p.h"
 
-#include <QtCore/QAbstractItemModel>
 #include <QtQuick/QQuickItem>
-#include <QtQuick/QQuickWindow>
 #include <QtCore/QPointer>
 #include <QtCore/QThread>
 
diff --git a/src/datavisualizationqml2/declarativebars.cpp b/src/datavisualizationqml2/declarativebars.cpp
index 4f984c32..f2ad2435 100644
--- a/src/datavisualizationqml2/declarativebars.cpp
+++ b/src/datavisualizationqml2/declarativebars.cpp
@@ -17,9 +17,6 @@
 ****************************************************************************/
 
 #include "declarativebars_p.h"
-#include "qvalue3daxis.h"
-#include "qitemmodelbardataproxy.h"
-#include "declarativescene_p.h"
 
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
diff --git a/src/datavisualizationqml2/declarativebars_p.h b/src/datavisualizationqml2/declarativebars_p.h
index ae44e2ab..52690813 100644
--- a/src/datavisualizationqml2/declarativebars_p.h
+++ b/src/datavisualizationqml2/declarativebars_p.h
@@ -32,11 +32,6 @@
 #include "datavisualizationglobal_p.h"
 #include "abstractdeclarative_p.h"
 #include "bars3dcontroller_p.h"
-#include "declarativebars_p.h"
-#include "qvalue3daxis.h"
-#include "qcategory3daxis.h"
-#include "qbardataproxy.h"
-#include "qbar3dseries.h"
 
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
diff --git a/src/datavisualizationqml2/declarativerendernode.cpp b/src/datavisualizationqml2/declarativerendernode.cpp
index 1f6d4b56..d42ceb03 100644
--- a/src/datavisualizationqml2/declarativerendernode.cpp
+++ b/src/datavisualizationqml2/declarativerendernode.cpp
@@ -17,9 +17,7 @@
 ****************************************************************************/
 
 #include "declarativerendernode_p.h"
-#include "abstract3dcontroller_p.h"
 #include "abstractdeclarative_p.h"
-#include <QtGui/QOpenGLContext>
 #include <QtGui/QOpenGLFramebufferObject>
 
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualizationqml2/declarativerendernode_p.h b/src/datavisualizationqml2/declarativerendernode_p.h
index e35791d4..a7ede03a 100644
--- a/src/datavisualizationqml2/declarativerendernode_p.h
+++ b/src/datavisualizationqml2/declarativerendernode_p.h
@@ -33,12 +33,8 @@
 
 #include <QtQuick/QSGGeometryNode>
 #include <QtQuick/QSGTextureMaterial>
-#include <QtQuick/QSGOpaqueTextureMaterial>
 #include <QtQuick/QQuickWindow>
 
-class QOpenGLContext;
-class QOpenGLFramebufferObject;
-
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 class Abstract3DController;
diff --git a/src/datavisualizationqml2/declarativescatter.cpp b/src/datavisualizationqml2/declarativescatter.cpp
index dcc52a3d..50ec9384 100644
--- a/src/datavisualizationqml2/declarativescatter.cpp
+++ b/src/datavisualizationqml2/declarativescatter.cpp
@@ -17,8 +17,6 @@
 ****************************************************************************/
 
 #include "declarativescatter_p.h"
-#include "qitemmodelscatterdataproxy.h"
-#include "declarativescene_p.h"
 
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
diff --git a/src/datavisualizationqml2/declarativescatter_p.h b/src/datavisualizationqml2/declarativescatter_p.h
index 79b56e02..370750ea 100644
--- a/src/datavisualizationqml2/declarativescatter_p.h
+++ b/src/datavisualizationqml2/declarativescatter_p.h
@@ -32,9 +32,6 @@
 #include "datavisualizationglobal_p.h"
 #include "abstractdeclarative_p.h"
 #include "scatter3dcontroller_p.h"
-#include "declarativescatter_p.h"
-#include "qvalue3daxis.h"
-#include "qscatterdataproxy.h"
 #include "qscatter3dseries.h"
 
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualizationqml2/declarativeseries.cpp b/src/datavisualizationqml2/declarativeseries.cpp
index 21555f45..661f87ba 100644
--- a/src/datavisualizationqml2/declarativeseries.cpp
+++ b/src/datavisualizationqml2/declarativeseries.cpp
@@ -17,14 +17,12 @@
 ****************************************************************************/
 
 #include "declarativeseries_p.h"
-#include "qbardataproxy.h"
-#include "qscatterdataproxy.h"
-#include "qsurfacedataproxy.h"
 #include <QtCore/QMetaMethod>
 
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
-static void setSeriesGradient(QAbstract3DSeries *series, const ColorGradient &gradient, GradientType type)
+static void setSeriesGradient(QAbstract3DSeries *series, const ColorGradient &gradient,
+                              GradientType type)
 {
     QLinearGradient newGradient;
     QGradientStops stops;
@@ -198,7 +196,8 @@ QQmlListProperty<QObject> DeclarativeScatter3DSeries::seriesChildren()
                                      , 0, 0, 0);
 }
 
-void DeclarativeScatter3DSeries::appendSeriesChildren(QQmlListProperty<QObject> *list, QObject *element)
+void DeclarativeScatter3DSeries::appendSeriesChildren(QQmlListProperty<QObject> *list,
+                                                      QObject *element)
 {
     QScatterDataProxy *proxy = qobject_cast<QScatterDataProxy *>(element);
     if (proxy)
@@ -293,7 +292,8 @@ QQmlListProperty<QObject> DeclarativeSurface3DSeries::seriesChildren()
                                      , 0, 0, 0);
 }
 
-void DeclarativeSurface3DSeries::appendSeriesChildren(QQmlListProperty<QObject> *list, QObject *element)
+void DeclarativeSurface3DSeries::appendSeriesChildren(QQmlListProperty<QObject> *list,
+                                                      QObject *element)
 {
     QSurfaceDataProxy *proxy = qobject_cast<QSurfaceDataProxy *>(element);
     if (proxy)
diff --git a/src/datavisualizationqml2/declarativesurface.cpp b/src/datavisualizationqml2/declarativesurface.cpp
index 78519586..3075d207 100644
--- a/src/datavisualizationqml2/declarativesurface.cpp
+++ b/src/datavisualizationqml2/declarativesurface.cpp
@@ -17,9 +17,6 @@
 ****************************************************************************/
 
 #include "declarativesurface_p.h"
-#include "qvalue3daxis.h"
-#include "qitemmodelsurfacedataproxy.h"
-#include "declarativescene_p.h"
 
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
diff --git a/src/datavisualizationqml2/declarativesurface_p.h b/src/datavisualizationqml2/declarativesurface_p.h
index a4747167..6fe800ba 100644
--- a/src/datavisualizationqml2/declarativesurface_p.h
+++ b/src/datavisualizationqml2/declarativesurface_p.h
@@ -32,9 +32,6 @@
 #include "datavisualizationglobal_p.h"
 #include "abstractdeclarative_p.h"
 #include "surface3dcontroller_p.h"
-#include "declarativesurface_p.h"
-#include "qvalue3daxis.h"
-#include "qsurfacedataproxy.h"
 #include "qsurface3dseries.h"
 
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualizationqml2/enumtostringmap.cpp b/src/datavisualizationqml2/enumtostringmap.cpp
index ebd89981..99399482 100644
--- a/src/datavisualizationqml2/enumtostringmap.cpp
+++ b/src/datavisualizationqml2/enumtostringmap.cpp
@@ -15,12 +15,13 @@
 ** contact form at http://qt.digia.com
 **
 ****************************************************************************/
+
 #include "enumtostringmap_p.h"
-#include <QString>
-#include <QDebug>
 
 #ifdef VERBOSE_STATE_STORE
 
+#include <QDebug>
+
 static EnumToStringMap *theInstance = 0;
 static unsigned int theInstanceCount = 0;
 
diff --git a/src/datavisualizationqml2/glstatestore.cpp b/src/datavisualizationqml2/glstatestore.cpp
index c590a4c1..35897cf5 100644
--- a/src/datavisualizationqml2/glstatestore.cpp
+++ b/src/datavisualizationqml2/glstatestore.cpp
@@ -15,6 +15,7 @@
 ** contact form at http://qt.digia.com
 **
 ****************************************************************************/
+
 #include "glstatestore_p.h"
 #include <QDebug>
 #include <QColor>
diff --git a/src/datavisualizationqml2/glstatestore_p.h b/src/datavisualizationqml2/glstatestore_p.h
index c5023657..4add606b 100644
--- a/src/datavisualizationqml2/glstatestore_p.h
+++ b/src/datavisualizationqml2/glstatestore_p.h
@@ -29,9 +29,7 @@
 #ifndef GLSTATESTORE_P_H
 #define GLSTATESTORE_P_H
 
-#include <QObject>
 #include <QtGui/QOpenGLFunctions>
-#include <QtGui/QOpenGLContext>
 #include <QtCore/QScopedArrayPointer>
 #include "enumtostringmap_p.h"
 
-- 
cgit v1.2.3