Clean up input, theme, utils

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

10 files changed, 0 insertions, 22 deletions

diff --git a/src/datavisualization/utils/abstractobjecthelper_p.h b/src/datavisualization/utils/abstractobjecthelper_p.h
index 3220b37d..c1618909 100644
--- a/src/datavisualization/utils/abstractobjecthelper_p.h
+++ b/src/datavisualization/utils/abstractobjecthelper_p.h
@@ -30,7 +30,6 @@
 #define ABSTRACTOBJECTHELPER_H
 
 #include "datavisualizationglobal_p.h"
-#include <QtGui/QOpenGLFunctions>
 
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
diff --git a/src/datavisualization/utils/camerahelper_p.h b/src/datavisualization/utils/camerahelper_p.h
index f410ceb5..89dd48f4 100644
--- a/src/datavisualization/utils/camerahelper_p.h
+++ b/src/datavisualization/utils/camerahelper_p.h
@@ -33,9 +33,7 @@
 #include "q3dcamera.h"
 
 class QMatrix4x4;
-class QVector3D;
 class QPoint;
-class QPointF;
 
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
diff --git a/src/datavisualization/utils/objecthelper.cpp b/src/datavisualization/utils/objecthelper.cpp
index 8cbf2aa2..30f119f2 100644
--- a/src/datavisualization/utils/objecthelper.cpp
+++ b/src/datavisualization/utils/objecthelper.cpp
@@ -19,7 +19,6 @@
 #include "meshloader_p.h"
 #include "vertexindexer_p.h"
 #include "objecthelper_p.h"
-#include "abstractobjecthelper_p.h"
 
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
diff --git a/src/datavisualization/utils/objecthelper_p.h b/src/datavisualization/utils/objecthelper_p.h
index 93dc6c94..1c3217b7 100644
--- a/src/datavisualization/utils/objecthelper_p.h
+++ b/src/datavisualization/utils/objecthelper_p.h
@@ -31,7 +31,6 @@
 
 #include "datavisualizationglobal_p.h"
 #include "abstractobjecthelper_p.h"
-#include <QtGui/QOpenGLFunctions>
 
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
diff --git a/src/datavisualization/utils/shaderhelper_p.h b/src/datavisualization/utils/shaderhelper_p.h
index ced27572..fdef0dff 100644
--- a/src/datavisualization/utils/shaderhelper_p.h
+++ b/src/datavisualization/utils/shaderhelper_p.h
@@ -30,7 +30,6 @@
 #define SHADERHELPER_P_H
 
 #include "datavisualizationglobal_p.h"
-#include <QtGui/QOpenGLFunctions>
 
 class QOpenGLShaderProgram;
 
diff --git a/src/datavisualization/utils/surfaceobject.cpp b/src/datavisualization/utils/surfaceobject.cpp
index 96d04094..088bb150 100644
--- a/src/datavisualization/utils/surfaceobject.cpp
+++ b/src/datavisualization/utils/surfaceobject.cpp
@@ -17,7 +17,6 @@
 ****************************************************************************/
 
 #include "surfaceobject_p.h"
-#include "abstractobjecthelper_p.h"
 #include "surface3drenderer_p.h"
 
 #include <QtGui/QVector2D>
diff --git a/src/datavisualization/utils/texturehelper.cpp b/src/datavisualization/utils/texturehelper.cpp
index 185d99e4..4ea808a5 100644
--- a/src/datavisualization/utils/texturehelper.cpp
+++ b/src/datavisualization/utils/texturehelper.cpp
@@ -17,7 +17,6 @@
 ****************************************************************************/
 
 #include "texturehelper_p.h"
-#include "utils_p.h"
 
 #include <QtGui/QImage>
 #include <QtGui/QPainter>
diff --git a/src/datavisualization/utils/texturehelper_p.h b/src/datavisualization/utils/texturehelper_p.h
index 206cd291..aec137a4 100644
--- a/src/datavisualization/utils/texturehelper_p.h
+++ b/src/datavisualization/utils/texturehelper_p.h
@@ -30,7 +30,6 @@
 #define TEXTUREHELPER_P_H
 
 #include "datavisualizationglobal_p.h"
-#include <QtGui/QOpenGLFunctions>
 #include <QtGui/QRgb>
 #include <QtGui/QLinearGradient>
 
diff --git a/src/datavisualization/utils/utils.cpp b/src/datavisualization/utils/utils.cpp
index 7343148d..5852bf11 100644
--- a/src/datavisualization/utils/utils.cpp
+++ b/src/datavisualization/utils/utils.cpp
@@ -18,12 +18,7 @@
 
 #include "utils_p.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/utils_p.h b/src/datavisualization/utils/utils_p.h
index a7c73731..d7187c16 100644
--- a/src/datavisualization/utils/utils_p.h
+++ b/src/datavisualization/utils/utils_p.h
@@ -31,12 +31,6 @@
 
 #include "datavisualizationglobal_p.h"
 
-class QVector3D;
-class QColor;
-class QPainter;
-class QString;
-class QPoint;
-class QImage;
 class QLinearGradient;
 
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
@@ -55,8 +49,6 @@ public:
     static QVector4D vectorFromColor(const QColor &color);
     static QColor colorFromVector(const QVector3D &colorVector);
     static QColor colorFromVector(const QVector4D &colorVector);
-    static void printText(QPainter *painter, const QString &text, const QSize &position,
-                          bool absoluteCoords = true, float rotation = 0.0f, float scale = 1.0f);
     static QImage printTextToImage(const QFont &font,
                                    const QString &text,
                                    const QColor &bgrColor,