From a665bdb2010c3833f47d364945007cccc00aed2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= <tomi.korpipaa@digia.com>
Date: Thu, 5 Dec 2013 11:26:25 +0200
Subject: QML docs + enum moving

Task-number: QTRD-2670
Task-number: QTRD-2505

Change-Id: I51a870f9a57b093e8216759a5577e161ff3afd60
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
---
 src/datavisualization/utils/camerahelper.cpp | 50 ++++++++++++++--------------
 src/datavisualization/utils/camerahelper_p.h |  3 +-
 2 files changed, 27 insertions(+), 26 deletions(-)

(limited to 'src/datavisualization/utils')

diff --git a/src/datavisualization/utils/camerahelper.cpp b/src/datavisualization/utils/camerahelper.cpp
index 29ed4d57..9e7e58aa 100644
--- a/src/datavisualization/utils/camerahelper.cpp
+++ b/src/datavisualization/utils/camerahelper.cpp
@@ -155,125 +155,125 @@ QPointF CameraHelper::getCameraRotations()
     return rotations;
 }
 
-void CameraHelper::setCameraPreset(QDataVis::CameraPreset preset)
+void CameraHelper::setCameraPreset(Q3DCamera::CameraPreset preset)
 {
     switch (preset) {
-    case QDataVis::CameraPresetFrontLow: {
+    case Q3DCamera::CameraPresetFrontLow: {
         qDebug("CameraPresetFrontLow");
         CameraHelper::setCameraRotation(QPointF(0.0f, 0.0f));
         break;
     }
-    case QDataVis::CameraPresetFront: {
+    case Q3DCamera::CameraPresetFront: {
         qDebug("CameraPresetFront");
         CameraHelper::setCameraRotation(QPointF(0.0f, 22.5f));
         break;
     }
-    case QDataVis::CameraPresetFrontHigh: {
+    case Q3DCamera::CameraPresetFrontHigh: {
         qDebug("CameraPresetFrontHigh");
         CameraHelper::setCameraRotation(QPointF(0.0f, 45.0f));
         break;
     }
-    case QDataVis::CameraPresetLeftLow: {
+    case Q3DCamera::CameraPresetLeftLow: {
         qDebug("CameraPresetLeftLow");
         CameraHelper::setCameraRotation(QPointF(90.0f, 0.0f));
         break;
     }
-    case QDataVis::CameraPresetLeft: {
+    case Q3DCamera::CameraPresetLeft: {
         qDebug("CameraPresetLeft");
         CameraHelper::setCameraRotation(QPointF(90.0f, 22.5f));
         break;
     }
-    case QDataVis::CameraPresetLeftHigh: {
+    case Q3DCamera::CameraPresetLeftHigh: {
         qDebug("CameraPresetLeftHigh");
         CameraHelper::setCameraRotation(QPointF(90.0f, 45.0f));
         break;
     }
-    case QDataVis::CameraPresetRightLow: {
+    case Q3DCamera::CameraPresetRightLow: {
         qDebug("CameraPresetRightLow");
         CameraHelper::setCameraRotation(QPointF(-90.0f, 0.0f));
         break;
     }
-    case QDataVis::CameraPresetRight: {
+    case Q3DCamera::CameraPresetRight: {
         qDebug("CameraPresetRight");
         CameraHelper::setCameraRotation(QPointF(-90.0f, 22.5f));
         break;
     }
-    case QDataVis::CameraPresetRightHigh: {
+    case Q3DCamera::CameraPresetRightHigh: {
         qDebug("CameraPresetRightHigh");
         CameraHelper::setCameraRotation(QPointF(-90.0f, 45.0f));
         break;
     }
-    case QDataVis::CameraPresetBehindLow: {
+    case Q3DCamera::CameraPresetBehindLow: {
         qDebug("CameraPresetBehindLow");
         CameraHelper::setCameraRotation(QPointF(180.0f, 0.0f));
         break;
     }
-    case QDataVis::CameraPresetBehind: {
+    case Q3DCamera::CameraPresetBehind: {
         qDebug("CameraPresetBehind");
         CameraHelper::setCameraRotation(QPointF(180.0f, 22.5f));
         break;
     }
-    case QDataVis::CameraPresetBehindHigh: {
+    case Q3DCamera::CameraPresetBehindHigh: {
         qDebug("CameraPresetBehindHigh");
         CameraHelper::setCameraRotation(QPointF(180.0f, 45.0f));
         break;
     }
-    case QDataVis::CameraPresetIsometricLeft: {
+    case Q3DCamera::CameraPresetIsometricLeft: {
         qDebug("CameraPresetIsometricLeft");
         CameraHelper::setCameraRotation(QPointF(45.0f, 22.5f));
         break;
     }
-    case QDataVis::CameraPresetIsometricLeftHigh: {
+    case Q3DCamera::CameraPresetIsometricLeftHigh: {
         qDebug("CameraPresetIsometricLeftHigh");
         CameraHelper::setCameraRotation(QPointF(45.0f, 45.0f));
         break;
     }
-    case QDataVis::CameraPresetIsometricRight: {
+    case Q3DCamera::CameraPresetIsometricRight: {
         qDebug("CameraPresetIsometricRight");
         CameraHelper::setCameraRotation(QPointF(-45.0f, 22.5f));
         break;
     }
-    case QDataVis::CameraPresetIsometricRightHigh: {
+    case Q3DCamera::CameraPresetIsometricRightHigh: {
         qDebug("CameraPresetIsometricRightHigh");
         CameraHelper::setCameraRotation(QPointF(-45.0f, 45.0f));
         break;
     }
-    case QDataVis::CameraPresetDirectlyAbove: {
+    case Q3DCamera::CameraPresetDirectlyAbove: {
         qDebug("CameraPresetDirectlyAbove");
         CameraHelper::setCameraRotation(QPointF(0.0f, 90.0f));
         break;
     }
-    case QDataVis::CameraPresetDirectlyAboveCW45: {
+    case Q3DCamera::CameraPresetDirectlyAboveCW45: {
         qDebug("CameraPresetDirectlyAboveCW45");
         CameraHelper::setCameraRotation(QPointF(-45.0f, 90.0f));
         break;
     }
-    case QDataVis::CameraPresetDirectlyAboveCCW45: {
+    case Q3DCamera::CameraPresetDirectlyAboveCCW45: {
         qDebug("CameraPresetDirectlyAboveCCW45");
         CameraHelper::setCameraRotation(QPointF(45.0f, 90.0f));
         break;
     }
-    case QDataVis::CameraPresetFrontBelow: {
+    case Q3DCamera::CameraPresetFrontBelow: {
         qDebug("CameraPresetFrontBelow");
         CameraHelper::setCameraRotation(QPointF(0.0f, -45.0f));
         break;
     }
-    case QDataVis::CameraPresetLeftBelow: {
+    case Q3DCamera::CameraPresetLeftBelow: {
         qDebug("CameraPresetLeftBelow");
         CameraHelper::setCameraRotation(QPointF(90.0f, -45.0f));
         break;
     }
-    case QDataVis::CameraPresetRightBelow: {
+    case Q3DCamera::CameraPresetRightBelow: {
         qDebug("CameraPresetRightBelow");
         CameraHelper::setCameraRotation(QPointF(-90.0f, -45.0f));
         break;
     }
-    case QDataVis::CameraPresetBehindBelow: {
+    case Q3DCamera::CameraPresetBehindBelow: {
         qDebug("CameraPresetBehindBelow");
         CameraHelper::setCameraRotation(QPointF(180.0f, -45.0f));
         break;
     }
-    case QDataVis::CameraPresetDirectlyBelow: {
+    case Q3DCamera::CameraPresetDirectlyBelow: {
         qDebug("CameraPresetDirectlyBelow");
         CameraHelper::setCameraRotation(QPointF(0.0f, -90.0f));
         break;
diff --git a/src/datavisualization/utils/camerahelper_p.h b/src/datavisualization/utils/camerahelper_p.h
index 1ef4d257..50de93a8 100644
--- a/src/datavisualization/utils/camerahelper_p.h
+++ b/src/datavisualization/utils/camerahelper_p.h
@@ -30,6 +30,7 @@
 #define CAMERAPOSITIONER_P_H
 
 #include "datavisualizationglobal_p.h"
+#include "q3dcamera.h"
 #include "q3dbars.h"
 #include <QObject>
 
@@ -82,7 +83,7 @@ public:
                                             GLfloat fixedRotation = 0.0f,
                                             GLfloat distanceModifier = 0.0f);
     void updateMousePos(const QPoint &mousePos);
-    void setCameraPreset(QDataVis::CameraPreset preset);
+    void setCameraPreset(Q3DCamera::CameraPreset preset);
 };
 
 QT_DATAVISUALIZATION_END_NAMESPACE
-- 
cgit v1.2.3