Clean up data

Task-number: QTRD-3149
Change-Id: I2b2a791fb617e3363865da29ce4c1a6980dbca49
Change-Id: I2b2a791fb617e3363865da29ce4c1a6980dbca49
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>

24 files changed, 21 insertions, 54 deletions

diff --git a/src/datavisualization/axis/qabstract3daxis_p.h b/src/datavisualization/axis/qabstract3daxis_p.h
index 72e5b15d..7181362f 100644
--- a/src/datavisualization/axis/qabstract3daxis_p.h
+++ b/src/datavisualization/axis/qabstract3daxis_p.h
@@ -26,13 +26,12 @@
 //
 // We mean it.
 
-#include "datavisualizationglobal_p.h"
-#include "qabstract3daxis.h"
-#include "abstract3dcontroller_p.h"
-
 #ifndef QABSTRACT3DAXIS_P_H
 #define QABSTRACT3DAXIS_P_H
 
+#include "datavisualizationglobal_p.h"
+#include "qabstract3daxis.h"
+
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 class QAbstract3DAxisPrivate : public QObject
diff --git a/src/datavisualization/axis/qcategory3daxis_p.h b/src/datavisualization/axis/qcategory3daxis_p.h
index 0f590ece..27126620 100644
--- a/src/datavisualization/axis/qcategory3daxis_p.h
+++ b/src/datavisualization/axis/qcategory3daxis_p.h
@@ -26,13 +26,12 @@
 //
 // We mean it.
 
-#include "qcategory3daxis.h"
-#include "qabstract3daxis_p.h"
-#include "qbardataitem.h"
-
 #ifndef QCATEGORY3DAXIS_P_H
 #define QCATEGORY3DAXIS_P_H
 
+#include "qcategory3daxis.h"
+#include "qabstract3daxis_p.h"
+
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 class QCategory3DAxisPrivate : public QAbstract3DAxisPrivate
diff --git a/src/datavisualization/axis/qlogvalue3daxisformatter_p.h b/src/datavisualization/axis/qlogvalue3daxisformatter_p.h
index af056a06..df2d41d1 100644
--- a/src/datavisualization/axis/qlogvalue3daxisformatter_p.h
+++ b/src/datavisualization/axis/qlogvalue3daxisformatter_p.h
@@ -26,17 +26,15 @@
 //
 // We mean it.
 
+#ifndef QLOGVALUE3DAXISFORMATTER_P_H
+#define QLOGVALUE3DAXISFORMATTER_P_H
+
 #include "datavisualizationglobal_p.h"
 #include "qlogvalue3daxisformatter.h"
 #include "qvalue3daxisformatter_p.h"
 
-#ifndef QLOGVALUE3DAXISFORMATTER_P_H
-#define QLOGVALUE3DAXISFORMATTER_P_H
-
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
-class QLogValue3DAxis;
-
 class QLogValue3DAxisFormatterPrivate : public QValue3DAxisFormatterPrivate
 {
     Q_OBJECT
diff --git a/src/datavisualization/axis/qvalue3daxis_p.h b/src/datavisualization/axis/qvalue3daxis_p.h
index 47fd7e06..b7394c0a 100644
--- a/src/datavisualization/axis/qvalue3daxis_p.h
+++ b/src/datavisualization/axis/qvalue3daxis_p.h
@@ -26,12 +26,12 @@
 //
 // We mean it.
 
-#include "qvalue3daxis.h"
-#include "qabstract3daxis_p.h"
-
 #ifndef QVALUE3DAXIS_P_H
 #define QVALUE3DAXIS_P_H
 
+#include "qvalue3daxis.h"
+#include "qabstract3daxis_p.h"
+
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 class QValue3DAxisPrivate : public QAbstract3DAxisPrivate
diff --git a/src/datavisualization/axis/qvalue3daxisformatter_p.h b/src/datavisualization/axis/qvalue3daxisformatter_p.h
index f7fd001e..2d1dc920 100644
--- a/src/datavisualization/axis/qvalue3daxisformatter_p.h
+++ b/src/datavisualization/axis/qvalue3daxisformatter_p.h
@@ -26,13 +26,13 @@
 //
 // We mean it.
 
+#ifndef QVALUE3DAXISFORMATTER_P_H
+#define QVALUE3DAXISFORMATTER_P_H
+
 #include "datavisualizationglobal_p.h"
 #include "qvalue3daxisformatter.h"
 #include "utils_p.h"
 
-#ifndef QVALUE3DAXISFORMATTER_P_H
-#define QVALUE3DAXISFORMATTER_P_H
-
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 class QValue3DAxis;
diff --git a/src/datavisualization/data/abstractrenderitem_p.h b/src/datavisualization/data/abstractrenderitem_p.h
index 912a09f3..57977a3c 100644
--- a/src/datavisualization/data/abstractrenderitem_p.h
+++ b/src/datavisualization/data/abstractrenderitem_p.h
@@ -32,8 +32,6 @@
 #include "datavisualizationglobal_p.h"
 #include "labelitem_p.h"
 
-#include <QtCore/QString>
-#include <QtGui/QOpenGLFunctions>
 #include <QtGui/QVector3D>
 #include <QtGui/QQuaternion>
 
diff --git a/src/datavisualization/data/barrenderitem.cpp b/src/datavisualization/data/barrenderitem.cpp
index 9ceadbcd..eab5178b 100644
--- a/src/datavisualization/data/barrenderitem.cpp
+++ b/src/datavisualization/data/barrenderitem.cpp
@@ -17,7 +17,6 @@
 ****************************************************************************/
 
 #include "barrenderitem_p.h"
-#include "bars3drenderer_p.h"
 
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
diff --git a/src/datavisualization/data/barrenderitem_p.h b/src/datavisualization/data/barrenderitem_p.h
index 97c069e2..72c5abc1 100644
--- a/src/datavisualization/data/barrenderitem_p.h
+++ b/src/datavisualization/data/barrenderitem_p.h
@@ -33,8 +33,6 @@
 
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
-class Bars3DRenderer;
-
 class BarRenderItem : public AbstractRenderItem
 {
 public:
diff --git a/src/datavisualization/data/labelitem_p.h b/src/datavisualization/data/labelitem_p.h
index 3a2c1eb1..89b6cc56 100644
--- a/src/datavisualization/data/labelitem_p.h
+++ b/src/datavisualization/data/labelitem_p.h
@@ -30,7 +30,6 @@
 #define LABELITEM_P_H
 
 #include "datavisualizationglobal_p.h"
-#include <QtGui/QOpenGLFunctions>
 #include <QtCore/QSize>
 
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualization/data/qabstract3dseries.cpp b/src/datavisualization/data/qabstract3dseries.cpp
index 9119b61d..b4b49d1e 100644
--- a/src/datavisualization/data/qabstract3dseries.cpp
+++ b/src/datavisualization/data/qabstract3dseries.cpp
@@ -16,7 +16,6 @@
 **
 ****************************************************************************/
 
-#include "qabstract3dseries.h"
 #include "qabstract3dseries_p.h"
 #include "qabstractdataproxy_p.h"
 #include "abstract3dcontroller_p.h"
diff --git a/src/datavisualization/data/qabstract3dseries_p.h b/src/datavisualization/data/qabstract3dseries_p.h
index e62543af..dd574e03 100644
--- a/src/datavisualization/data/qabstract3dseries_p.h
+++ b/src/datavisualization/data/qabstract3dseries_p.h
@@ -26,12 +26,12 @@
 //
 // We mean it.
 
-#include "datavisualizationglobal_p.h"
-#include "qabstract3dseries.h"
-
 #ifndef QABSTRACT3DSERIES_P_H
 #define QABSTRACT3DSERIES_P_H
 
+#include "datavisualizationglobal_p.h"
+#include "qabstract3dseries.h"
+
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 class QAbstractDataProxy;
diff --git a/src/datavisualization/data/qabstractdataproxy.cpp b/src/datavisualization/data/qabstractdataproxy.cpp
index 5b05dd14..ef6b1a00 100644
--- a/src/datavisualization/data/qabstractdataproxy.cpp
+++ b/src/datavisualization/data/qabstractdataproxy.cpp
@@ -16,7 +16,6 @@
 **
 ****************************************************************************/
 
-#include "qabstractdataproxy.h"
 #include "qabstractdataproxy_p.h"
 #include "qabstract3dseries_p.h"
 
diff --git a/src/datavisualization/data/qabstractdataproxy_p.h b/src/datavisualization/data/qabstractdataproxy_p.h
index eb901f4c..c2f53369 100644
--- a/src/datavisualization/data/qabstractdataproxy_p.h
+++ b/src/datavisualization/data/qabstractdataproxy_p.h
@@ -26,12 +26,12 @@
 //
 // We mean it.
 
-#include "datavisualizationglobal_p.h"
-#include "qabstractdataproxy.h"
-
 #ifndef QABSTRACTDATAPROXY_P_H
 #define QABSTRACTDATAPROXY_P_H
 
+#include "datavisualizationglobal_p.h"
+#include "qabstractdataproxy.h"
+
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 class QAbstract3DSeries;
diff --git a/src/datavisualization/data/qbardataitem_p.h b/src/datavisualization/data/qbardataitem_p.h
index c06ddea9..623c4012 100644
--- a/src/datavisualization/data/qbardataitem_p.h
+++ b/src/datavisualization/data/qbardataitem_p.h
@@ -39,9 +39,6 @@ class QBarDataItemPrivate
 public:
     QBarDataItemPrivate();
     virtual ~QBarDataItemPrivate();
-
-protected:
-    friend class QBarDataItem;
 };
 
 QT_END_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualization/data/qbardataproxy.cpp b/src/datavisualization/data/qbardataproxy.cpp
index 1c1170ff..1723b2a4 100644
--- a/src/datavisualization/data/qbardataproxy.cpp
+++ b/src/datavisualization/data/qbardataproxy.cpp
@@ -16,7 +16,6 @@
 **
 ****************************************************************************/
 
-#include "qbardataproxy.h"
 #include "qbardataproxy_p.h"
 #include "qbar3dseries_p.h"
 
diff --git a/src/datavisualization/data/qbardataproxy_p.h b/src/datavisualization/data/qbardataproxy_p.h
index eb0a0873..4d1489d9 100644
--- a/src/datavisualization/data/qbardataproxy_p.h
+++ b/src/datavisualization/data/qbardataproxy_p.h
@@ -31,7 +31,6 @@
 
 #include "qbardataproxy.h"
 #include "qabstractdataproxy_p.h"
-#include "qbardataitem.h"
 
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
diff --git a/src/datavisualization/data/qscatterdataitem_p.h b/src/datavisualization/data/qscatterdataitem_p.h
index efb1cc5c..2884c2e3 100644
--- a/src/datavisualization/data/qscatterdataitem_p.h
+++ b/src/datavisualization/data/qscatterdataitem_p.h
@@ -39,9 +39,6 @@ class QScatterDataItemPrivate
 public:
     QScatterDataItemPrivate();
     virtual ~QScatterDataItemPrivate();
-
-protected:
-    friend class QScatterDataItem;
 };
 
 QT_END_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualization/data/qscatterdataproxy.cpp b/src/datavisualization/data/qscatterdataproxy.cpp
index 84bb57e7..4aa9c938 100644
--- a/src/datavisualization/data/qscatterdataproxy.cpp
+++ b/src/datavisualization/data/qscatterdataproxy.cpp
@@ -16,7 +16,6 @@
 **
 ****************************************************************************/
 
-#include "qscatterdataproxy.h"
 #include "qscatterdataproxy_p.h"
 #include "qscatter3dseries_p.h"
 
diff --git a/src/datavisualization/data/qsurfacedataitem_p.h b/src/datavisualization/data/qsurfacedataitem_p.h
index 0cec7eab..e00134e3 100644
--- a/src/datavisualization/data/qsurfacedataitem_p.h
+++ b/src/datavisualization/data/qsurfacedataitem_p.h
@@ -39,9 +39,6 @@ class QSurfaceDataItemPrivate
 public:
     QSurfaceDataItemPrivate();
     virtual ~QSurfaceDataItemPrivate();
-
-protected:
-    friend class QSurfaceDataItem;
 };
 
 QT_END_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualization/data/qsurfacedataproxy.cpp b/src/datavisualization/data/qsurfacedataproxy.cpp
index 058b0e21..04f4f89d 100644
--- a/src/datavisualization/data/qsurfacedataproxy.cpp
+++ b/src/datavisualization/data/qsurfacedataproxy.cpp
@@ -16,7 +16,6 @@
 **
 ****************************************************************************/
 
-#include "qsurfacedataproxy.h"
 #include "qsurfacedataproxy_p.h"
 #include "qsurface3dseries_p.h"
 
diff --git a/src/datavisualization/data/scatterrenderitem.cpp b/src/datavisualization/data/scatterrenderitem.cpp
index 33df4d28..0b5398f1 100644
--- a/src/datavisualization/data/scatterrenderitem.cpp
+++ b/src/datavisualization/data/scatterrenderitem.cpp
@@ -17,8 +17,6 @@
 ****************************************************************************/
 
 #include "scatterrenderitem_p.h"
-#include "scatter3drenderer_p.h"
-#include "qscatterdataproxy.h"
 
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
diff --git a/src/datavisualization/data/scatterrenderitem_p.h b/src/datavisualization/data/scatterrenderitem_p.h
index eb070682..d754a8ca 100644
--- a/src/datavisualization/data/scatterrenderitem_p.h
+++ b/src/datavisualization/data/scatterrenderitem_p.h
@@ -33,8 +33,6 @@
 
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
-class Scatter3DRenderer;
-
 class ScatterRenderItem : public AbstractRenderItem
 {
 public:
@@ -55,8 +53,6 @@ public:
 protected:
     QVector3D m_position;
     bool m_visible;
-
-    friend class QScatterDataItem;
 };
 typedef QVector<ScatterRenderItem> ScatterRenderItemArray;
 
diff --git a/src/datavisualization/engine/q3dscene_p.h b/src/datavisualization/engine/q3dscene_p.h
index bc6a7223..2c69e5e0 100644
--- a/src/datavisualization/engine/q3dscene_p.h
+++ b/src/datavisualization/engine/q3dscene_p.h
@@ -36,7 +36,6 @@ QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 class Q3DCamera;
 class Q3DLight;
-class Q3DScene;
 
 struct Q3DSceneChangeBitField {
     bool viewportChanged               : 1;
diff --git a/src/datavisualization/engine/qabstract3dgraph_p.h b/src/datavisualization/engine/qabstract3dgraph_p.h
index 8e571355..a8b0965a 100644
--- a/src/datavisualization/engine/qabstract3dgraph_p.h
+++ b/src/datavisualization/engine/qabstract3dgraph_p.h
@@ -32,7 +32,6 @@
 #include "datavisualizationglobal_p.h"
 
 class QOpenGLContext;
-class QOpenGLPaintDevice;
 class QOffscreenSurface;
 
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION