From 69926b074405f5117e6a1f124804f21416ef3fb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= Date: Tue, 3 Jun 2014 10:50:53 +0300 Subject: Clean up input, theme, utils MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTRD-3149 Change-Id: I47e1a1590043c14ccd5d1ad11f0fa643b883cded Change-Id: I47e1a1590043c14ccd5d1ad11f0fa643b883cded Reviewed-by: Tomi Korpipää --- src/datavisualization/input/q3dinputhandler.cpp | 1 - src/datavisualization/input/qabstract3dinputhandler.cpp | 1 - src/datavisualization/input/qabstract3dinputhandler_p.h | 3 --- src/datavisualization/input/qtouch3dinputhandler.cpp | 1 - src/datavisualization/utils/abstractobjecthelper_p.h | 1 - src/datavisualization/utils/camerahelper_p.h | 2 -- src/datavisualization/utils/objecthelper.cpp | 1 - src/datavisualization/utils/objecthelper_p.h | 1 - src/datavisualization/utils/shaderhelper_p.h | 1 - src/datavisualization/utils/surfaceobject.cpp | 1 - src/datavisualization/utils/texturehelper.cpp | 1 - src/datavisualization/utils/texturehelper_p.h | 1 - src/datavisualization/utils/utils.cpp | 5 ----- src/datavisualization/utils/utils_p.h | 8 -------- 14 files changed, 28 deletions(-) diff --git a/src/datavisualization/input/q3dinputhandler.cpp b/src/datavisualization/input/q3dinputhandler.cpp index bcbf1014..fdb78983 100644 --- a/src/datavisualization/input/q3dinputhandler.cpp +++ b/src/datavisualization/input/q3dinputhandler.cpp @@ -18,7 +18,6 @@ #include "datavisualizationglobal_p.h" #include "q3dinputhandler_p.h" -#include "q3dcamera_p.h" QT_BEGIN_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/input/qabstract3dinputhandler.cpp b/src/datavisualization/input/qabstract3dinputhandler.cpp index 55a7d3ea..cb7d576b 100644 --- a/src/datavisualization/input/qabstract3dinputhandler.cpp +++ b/src/datavisualization/input/qabstract3dinputhandler.cpp @@ -17,7 +17,6 @@ ****************************************************************************/ #include "qabstract3dinputhandler_p.h" -#include "q3dscene.h" QT_BEGIN_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/input/qabstract3dinputhandler_p.h b/src/datavisualization/input/qabstract3dinputhandler_p.h index fa5a2315..b4b2eda2 100644 --- a/src/datavisualization/input/qabstract3dinputhandler_p.h +++ b/src/datavisualization/input/qabstract3dinputhandler_p.h @@ -55,9 +55,6 @@ public: int m_prevDistance; QPoint m_previousInputPos; - GLfloat m_defaultXRotation; - GLfloat m_defaultYRotation; - private: QAbstract3DInputHandler::InputView m_inputView; QPoint m_inputPosition; diff --git a/src/datavisualization/input/qtouch3dinputhandler.cpp b/src/datavisualization/input/qtouch3dinputhandler.cpp index d40fbf5a..90201115 100644 --- a/src/datavisualization/input/qtouch3dinputhandler.cpp +++ b/src/datavisualization/input/qtouch3dinputhandler.cpp @@ -17,7 +17,6 @@ ****************************************************************************/ #include "qtouch3dinputhandler_p.h" -#include "q3dcamera_p.h" #include #include 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 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 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 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 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 #include 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 #include #include 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 #include -#include -#include -#include -#include 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, -- cgit v1.2.3