Clean up public API and includes usage

Change-Id: I20ba0ffafa6bbe22d624a15fe3046ef2e33ab6d7
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>

16 files changed, 33 insertions, 44 deletions

diff --git a/src/datavisualization/utils/abstractobjecthelper.cpp b/src/datavisualization/utils/abstractobjecthelper.cpp
index 9ced43a1..c350d096 100644
--- a/src/datavisualization/utils/abstractobjecthelper.cpp
+++ b/src/datavisualization/utils/abstractobjecthelper.cpp
@@ -18,8 +18,6 @@
 
 #include "abstractobjecthelper_p.h"
 
-#include <QDebug>
-
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 AbstractObjectHelper::AbstractObjectHelper()
diff --git a/src/datavisualization/utils/abstractobjecthelper_p.h b/src/datavisualization/utils/abstractobjecthelper_p.h
index 5ec34318..3220b37d 100644
--- a/src/datavisualization/utils/abstractobjecthelper_p.h
+++ b/src/datavisualization/utils/abstractobjecthelper_p.h
@@ -30,7 +30,7 @@
 #define ABSTRACTOBJECTHELPER_H
 
 #include "datavisualizationglobal_p.h"
-#include <QOpenGLFunctions>
+#include <QtGui/QOpenGLFunctions>
 
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
diff --git a/src/datavisualization/utils/camerahelper.cpp b/src/datavisualization/utils/camerahelper.cpp
index 220c49db..ee4c27e0 100644
--- a/src/datavisualization/utils/camerahelper.cpp
+++ b/src/datavisualization/utils/camerahelper.cpp
@@ -18,9 +18,8 @@
 
 #include "camerahelper_p.h"
 
-#include <qmath.h>
-#include <QMatrix4x4>
-#include <QVector3D>
+#include <QtCore/qmath.h>
+#include <QtGui/QMatrix4x4>
 
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
diff --git a/src/datavisualization/utils/camerahelper_p.h b/src/datavisualization/utils/camerahelper_p.h
index e78bc24c..f410ceb5 100644
--- a/src/datavisualization/utils/camerahelper_p.h
+++ b/src/datavisualization/utils/camerahelper_p.h
@@ -31,8 +31,6 @@
 
 #include "datavisualizationglobal_p.h"
 #include "q3dcamera.h"
-#include "q3dbars.h"
-#include <QObject>
 
 class QMatrix4x4;
 class QVector3D;
@@ -71,17 +69,17 @@ public:
     QPointF getCameraRotations();
     // Set default camera orientation. Position's x and y should be 0.
     void setDefaultCameraOrientation(const QVector3D &defaultPosition,
-                                            const QVector3D &defaultTarget,
-                                            const QVector3D &defaultUp);
+                                     const QVector3D &defaultTarget,
+                                     const QVector3D &defaultUp);
     // Calculate view matrix based on rotation and zoom
     QMatrix4x4 calculateViewMatrix(const QPoint &mousePos, int zoom,
-                                          int screenWidth, int screenHeight,
-                                          bool showUnder = false);
+                                   int screenWidth, int screenHeight,
+                                   bool showUnder = false);
     // Calcluate light position based on rotation. Call after calling calculateViewMatrix to get
     // up-to-date position
     QVector3D calculateLightPosition(const QVector3D &lightPosition,
-                                            GLfloat fixedRotation = 0.0f,
-                                            GLfloat distanceModifier = 0.0f);
+                                     GLfloat fixedRotation = 0.0f,
+                                     GLfloat distanceModifier = 0.0f);
     void updateMousePos(const QPoint &mousePos);
     void setCameraPreset(Q3DCamera::CameraPreset preset);
 };
diff --git a/src/datavisualization/utils/meshloader.cpp b/src/datavisualization/utils/meshloader.cpp
index 49bdf710..615a7909 100644
--- a/src/datavisualization/utils/meshloader.cpp
+++ b/src/datavisualization/utils/meshloader.cpp
@@ -18,11 +18,10 @@
 
 #include "meshloader_p.h"
 
-#include <QFile>
-#include <QStringList>
-#include <QVector>
-#include <QVector2D>
-#include <QVector3D>
+#include <QtCore/QFile>
+#include <QtCore/QStringList>
+#include <QtCore/QVector>
+#include <QtGui/QVector2D>
 
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
diff --git a/src/datavisualization/utils/meshloader_p.h b/src/datavisualization/utils/meshloader_p.h
index e7425ae6..16ddaf6d 100644
--- a/src/datavisualization/utils/meshloader_p.h
+++ b/src/datavisualization/utils/meshloader_p.h
@@ -30,9 +30,7 @@
 #define MESHLOADER_P_H
 
 #include "datavisualizationglobal_p.h"
-
-class QVector2D;
-class QVector3D;
+#include <QtGui/QVector2D>
 
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
diff --git a/src/datavisualization/utils/objecthelper_p.h b/src/datavisualization/utils/objecthelper_p.h
index f96fc87d..0260dd05 100644
--- a/src/datavisualization/utils/objecthelper_p.h
+++ b/src/datavisualization/utils/objecthelper_p.h
@@ -31,7 +31,7 @@
 
 #include "datavisualizationglobal_p.h"
 #include "abstractobjecthelper_p.h"
-#include <QOpenGLFunctions>
+#include <QtGui/QOpenGLFunctions>
 
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
diff --git a/src/datavisualization/utils/shaderhelper.cpp b/src/datavisualization/utils/shaderhelper.cpp
index d4df11b4..7fb237c6 100644
--- a/src/datavisualization/utils/shaderhelper.cpp
+++ b/src/datavisualization/utils/shaderhelper.cpp
@@ -18,7 +18,7 @@
 
 #include "shaderhelper_p.h"
 
-#include <QOpenGLShader>
+#include <QtGui/QOpenGLShader>
 
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
diff --git a/src/datavisualization/utils/shaderhelper_p.h b/src/datavisualization/utils/shaderhelper_p.h
index 34bbf39e..ced27572 100644
--- a/src/datavisualization/utils/shaderhelper_p.h
+++ b/src/datavisualization/utils/shaderhelper_p.h
@@ -30,7 +30,7 @@
 #define SHADERHELPER_P_H
 
 #include "datavisualizationglobal_p.h"
-#include <QOpenGLFunctions>
+#include <QtGui/QOpenGLFunctions>
 
 class QOpenGLShaderProgram;
 
diff --git a/src/datavisualization/utils/surfaceobject.cpp b/src/datavisualization/utils/surfaceobject.cpp
index 1cb576c4..9bcdfee2 100644
--- a/src/datavisualization/utils/surfaceobject.cpp
+++ b/src/datavisualization/utils/surfaceobject.cpp
@@ -19,8 +19,7 @@
 #include "surfaceobject_p.h"
 #include "abstractobjecthelper_p.h"
 
-#include <QVector3D>
-#include <QVector2D>
+#include <QtGui/QVector2D>
 
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
diff --git a/src/datavisualization/utils/surfaceobject_p.h b/src/datavisualization/utils/surfaceobject_p.h
index ebae1149..69cb7e5d 100644
--- a/src/datavisualization/utils/surfaceobject_p.h
+++ b/src/datavisualization/utils/surfaceobject_p.h
@@ -33,7 +33,7 @@
 #include "abstractobjecthelper_p.h"
 #include "qsurfacedataproxy.h"
 
-#include <QRect>
+#include <QtCore/QRect>
 
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
diff --git a/src/datavisualization/utils/texturehelper.cpp b/src/datavisualization/utils/texturehelper.cpp
index 0f5c8313..52c673dc 100644
--- a/src/datavisualization/utils/texturehelper.cpp
+++ b/src/datavisualization/utils/texturehelper.cpp
@@ -19,8 +19,8 @@
 #include "texturehelper_p.h"
 #include "utils_p.h"
 
-#include <QImage>
-#include <QPainter>
+#include <QtGui/QImage>
+#include <QtGui/QPainter>
 
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
diff --git a/src/datavisualization/utils/texturehelper_p.h b/src/datavisualization/utils/texturehelper_p.h
index f9a23a08..ebfaa042 100644
--- a/src/datavisualization/utils/texturehelper_p.h
+++ b/src/datavisualization/utils/texturehelper_p.h
@@ -30,9 +30,9 @@
 #define TEXTUREHELPER_P_H
 
 #include "datavisualizationglobal_p.h"
-#include <QOpenGLFunctions>
-#include <QRgb>
-#include <QLinearGradient>
+#include <QtGui/QOpenGLFunctions>
+#include <QtGui/QRgb>
+#include <QtGui/QLinearGradient>
 
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
diff --git a/src/datavisualization/utils/utils.cpp b/src/datavisualization/utils/utils.cpp
index 482fc831..e0b1370e 100644
--- a/src/datavisualization/utils/utils.cpp
+++ b/src/datavisualization/utils/utils.cpp
@@ -18,13 +18,12 @@
 
 #include "utils_p.h"
 
-#include <QVector3D>
-#include <QColor>
-#include <QPainter>
-#include <QPoint>
-#include <QImage>
-#include <QRegExp>
-#include <qmath.h>
+#include <QtGui/QColor>
+#include <QtGui/QPainter>
+#include <QtCore/QPoint>
+#include <QtGui/QImage>
+#include <QtCore/QRegExp>
+#include <QtCore/qmath.h>
 
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
diff --git a/src/datavisualization/utils/vertexindexer.cpp b/src/datavisualization/utils/vertexindexer.cpp
index f089ce6e..2a496ebc 100644
--- a/src/datavisualization/utils/vertexindexer.cpp
+++ b/src/datavisualization/utils/vertexindexer.cpp
@@ -18,7 +18,7 @@
 
 #include "vertexindexer_p.h"
 
-#include <qmath.h>
+#include <QtCore/qmath.h>
 
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
diff --git a/src/datavisualization/utils/vertexindexer_p.h b/src/datavisualization/utils/vertexindexer_p.h
index fe100e21..260afad4 100644
--- a/src/datavisualization/utils/vertexindexer_p.h
+++ b/src/datavisualization/utils/vertexindexer_p.h
@@ -31,9 +31,8 @@
 
 #include "datavisualizationglobal_p.h"
 
-#include <QVector>
-#include <QVector2D>
-#include <QVector3D>
+#include <QtCore/QVector>
+#include <QtGui/QVector2D>
 
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION