summaryrefslogtreecommitdiffstats
path: root/src/datavisualization/engine
diff options
context:
space:
mode:
authorTomi Korpipää <tomi.korpipaa@digia.com>2014-06-02 13:20:34 +0300
committerTomi Korpipää <tomi.korpipaa@digia.com>2014-06-02 13:29:56 +0300
commitc1717ad4f2ffc1bc8141c96005b7dadfd74d583d (patch)
treee4c0eab300aeba1f32f2a52d6ad4a97102736d80 /src/datavisualization/engine
parente001973214143698f57fbacd9442ac4d9f1b32c9 (diff)
Clean up
Task-number: QTRD-3149 Change-Id: I386501dcb489e36a0163109dbd40f29941bd5868 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'src/datavisualization/engine')
-rw-r--r--src/datavisualization/engine/abstract3dcontroller.cpp8
-rw-r--r--src/datavisualization/engine/abstract3dcontroller_p.h4
-rw-r--r--src/datavisualization/engine/bars3dcontroller.cpp4
-rw-r--r--src/datavisualization/engine/bars3dcontroller_p.h2
-rw-r--r--src/datavisualization/engine/scatter3dcontroller.cpp5
-rw-r--r--src/datavisualization/engine/surface3dcontroller.cpp6
-rw-r--r--src/datavisualization/engine/surface3dcontroller_p.h4
7 files changed, 0 insertions, 33 deletions
diff --git a/src/datavisualization/engine/abstract3dcontroller.cpp b/src/datavisualization/engine/abstract3dcontroller.cpp
index 13708896..e7f5f5f8 100644
--- a/src/datavisualization/engine/abstract3dcontroller.cpp
+++ b/src/datavisualization/engine/abstract3dcontroller.cpp
@@ -17,21 +17,13 @@
****************************************************************************/
#include "abstract3dcontroller_p.h"
-#include "camerahelper_p.h"
#include "qabstract3daxis_p.h"
#include "qvalue3daxis_p.h"
-#include "qcategory3daxis.h"
#include "abstract3drenderer_p.h"
-#include "q3dcamera.h"
-#include "q3dlight.h"
-#include "qabstractdataproxy_p.h"
#include "qabstract3dinputhandler_p.h"
#include "qtouch3dinputhandler.h"
-#include "qabstract3dseries_p.h"
#include "thememanager_p.h"
#include "q3dtheme_p.h"
-#include "q3dscene_p.h"
-#include "q3dscene.h"
#include "qcustom3ditem_p.h"
#include <QtCore/QThread>
#include <QtGui/QOpenGLFramebufferObject>
diff --git a/src/datavisualization/engine/abstract3dcontroller_p.h b/src/datavisualization/engine/abstract3dcontroller_p.h
index efaf691f..f7e8967d 100644
--- a/src/datavisualization/engine/abstract3dcontroller_p.h
+++ b/src/datavisualization/engine/abstract3dcontroller_p.h
@@ -43,7 +43,6 @@ class QOpenGLFramebufferObject;
QT_BEGIN_NAMESPACE_DATAVISUALIZATION
-class CameraHelper;
class Abstract3DRenderer;
class QAbstract3DSeries;
class ThemeManager;
@@ -151,8 +150,6 @@ public:
private:
Abstract3DChangeBitField m_changeTracker;
- GLfloat m_horizontalRotation;
- GLfloat m_verticalRotation;
ThemeManager *m_themeManager;
QAbstract3DGraph::SelectionFlags m_selectionMode;
QAbstract3DGraph::ShadowQuality m_shadowQuality;
@@ -163,7 +160,6 @@ protected:
Q3DScene *m_scene;
QList<QAbstract3DInputHandler *> m_inputHandlers; // List of all added input handlers
QAbstract3DInputHandler *m_activeInputHandler;
- CameraHelper *m_cameraHelper;
// Active axes
QAbstract3DAxis *m_axisX;
QAbstract3DAxis *m_axisY;
diff --git a/src/datavisualization/engine/bars3dcontroller.cpp b/src/datavisualization/engine/bars3dcontroller.cpp
index f045a874..76e6793e 100644
--- a/src/datavisualization/engine/bars3dcontroller.cpp
+++ b/src/datavisualization/engine/bars3dcontroller.cpp
@@ -18,8 +18,6 @@
#include "bars3dcontroller_p.h"
#include "bars3drenderer_p.h"
-#include "camerahelper_p.h"
-#include "qabstract3daxis_p.h"
#include "qvalue3daxis_p.h"
#include "qcategory3daxis_p.h"
#include "qbardataproxy_p.h"
@@ -27,8 +25,6 @@
#include "thememanager_p.h"
#include "q3dtheme_p.h"
-#include <QtGui/QMatrix4x4>
-
QT_BEGIN_NAMESPACE_DATAVISUALIZATION
Bars3DController::Bars3DController(QRect boundRect, Q3DScene *scene)
diff --git a/src/datavisualization/engine/bars3dcontroller_p.h b/src/datavisualization/engine/bars3dcontroller_p.h
index 00eda402..4f0e1f20 100644
--- a/src/datavisualization/engine/bars3dcontroller_p.h
+++ b/src/datavisualization/engine/bars3dcontroller_p.h
@@ -38,7 +38,6 @@ class Bars3DRenderer;
class QBar3DSeries;
struct Bars3DChangeBitField {
- bool slicingActiveChanged : 1;
bool multiSeriesScalingChanged : 1;
bool barSpecsChanged : 1;
bool selectedBarChanged : 1;
@@ -46,7 +45,6 @@ struct Bars3DChangeBitField {
bool itemChanged : 1;
Bars3DChangeBitField() :
- slicingActiveChanged(true),
multiSeriesScalingChanged(true),
barSpecsChanged(true),
selectedBarChanged(true),
diff --git a/src/datavisualization/engine/scatter3dcontroller.cpp b/src/datavisualization/engine/scatter3dcontroller.cpp
index f580244a..da40fc85 100644
--- a/src/datavisualization/engine/scatter3dcontroller.cpp
+++ b/src/datavisualization/engine/scatter3dcontroller.cpp
@@ -18,15 +18,10 @@
#include "scatter3dcontroller_p.h"
#include "scatter3drenderer_p.h"
-#include "camerahelper_p.h"
-#include "qabstract3daxis_p.h"
#include "qvalue3daxis_p.h"
#include "qscatterdataproxy_p.h"
#include "qscatter3dseries_p.h"
-#include <QtGui/QMatrix4x4>
-#include <QtCore/qmath.h>
-
QT_BEGIN_NAMESPACE_DATAVISUALIZATION
static const int insertRemoveRecordReserveSize = 31;
diff --git a/src/datavisualization/engine/surface3dcontroller.cpp b/src/datavisualization/engine/surface3dcontroller.cpp
index 812efa3a..e6c25260 100644
--- a/src/datavisualization/engine/surface3dcontroller.cpp
+++ b/src/datavisualization/engine/surface3dcontroller.cpp
@@ -18,15 +18,9 @@
#include "surface3dcontroller_p.h"
#include "surface3drenderer_p.h"
-#include "camerahelper_p.h"
-#include "qabstract3daxis_p.h"
#include "qvalue3daxis_p.h"
-#include "qcategory3daxis.h"
#include "qsurfacedataproxy_p.h"
#include "qsurface3dseries_p.h"
-#include "shaderhelper_p.h"
-
-#include <QtGui/QMatrix4x4>
QT_BEGIN_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualization/engine/surface3dcontroller_p.h b/src/datavisualization/engine/surface3dcontroller_p.h
index b742b6bb..2be74f35 100644
--- a/src/datavisualization/engine/surface3dcontroller_p.h
+++ b/src/datavisualization/engine/surface3dcontroller_p.h
@@ -38,15 +38,11 @@ class Surface3DRenderer;
class QSurface3DSeries;
struct Surface3DChangeBitField {
- bool smoothStatusChanged : 1;
- bool surfaceGridChanged : 1;
bool selectedPointChanged : 1;
bool rowsChanged : 1;
bool itemChanged : 1;
Surface3DChangeBitField() :
- smoothStatusChanged(true),
- surfaceGridChanged(true),
selectedPointChanged(true),
rowsChanged(false),
itemChanged(false)