Merge branch 'develop'v1.0.0-beta1

Change-Id: I1c9a255eb8f30a24b665856d3711f0abe77c6ef4

1 files changed, 3 insertions, 31 deletions

diff --git a/src/datavisualization/utils/camerahelper.cpp b/src/datavisualization/utils/camerahelper.cpp
index 9e7e58aa..220c49db 100644
--- a/src/datavisualization/utils/camerahelper.cpp
+++ b/src/datavisualization/utils/camerahelper.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc
+** Copyright (C) 2014 Digia Plc
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
@@ -22,7 +22,7 @@
 #include <QMatrix4x4>
 #include <QVector3D>
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 CameraHelper::CameraHelper(QObject *parent) :
     QObject(parent),
@@ -42,8 +42,6 @@ CameraHelper::~CameraHelper()
 {
 }
 
-
-// FUNCTIONS
 void CameraHelper::setRotationSpeed(int speed)
 {
     // increase for faster rotation
@@ -106,7 +104,6 @@ QMatrix4x4 CameraHelper::calculateViewMatrix(const QPoint &mousePos, int zoom,
     viewMatrix.scale((GLfloat)zoom / 100.0f);
     // Compensate for translation (if m_target is off origin)
     viewMatrix.translate(-m_target.x(), -m_target.y(), -m_target.z());
-    //qDebug() << m_xRotation << m_yRotation;
 
     m_previousMousePos = mousePos;
     return viewMatrix;
@@ -135,7 +132,6 @@ QVector3D CameraHelper::calculateLightPosition(const QVector3D &lightPosition,
     newLightPosition = QVector3D(-xPos + lightPosition.x(),
                                  yPos + lightPosition.y(),
                                  zPos + lightPosition.z());
-    //qDebug() << newLightPosition << xAngle << yAngle << fixedRotation;
     return newLightPosition;
 }
 
@@ -159,122 +155,98 @@ void CameraHelper::setCameraPreset(Q3DCamera::CameraPreset preset)
 {
     switch (preset) {
     case Q3DCamera::CameraPresetFrontLow: {
-        qDebug("CameraPresetFrontLow");
         CameraHelper::setCameraRotation(QPointF(0.0f, 0.0f));
         break;
     }
     case Q3DCamera::CameraPresetFront: {
-        qDebug("CameraPresetFront");
         CameraHelper::setCameraRotation(QPointF(0.0f, 22.5f));
         break;
     }
     case Q3DCamera::CameraPresetFrontHigh: {
-        qDebug("CameraPresetFrontHigh");
         CameraHelper::setCameraRotation(QPointF(0.0f, 45.0f));
         break;
     }
     case Q3DCamera::CameraPresetLeftLow: {
-        qDebug("CameraPresetLeftLow");
         CameraHelper::setCameraRotation(QPointF(90.0f, 0.0f));
         break;
     }
     case Q3DCamera::CameraPresetLeft: {
-        qDebug("CameraPresetLeft");
         CameraHelper::setCameraRotation(QPointF(90.0f, 22.5f));
         break;
     }
     case Q3DCamera::CameraPresetLeftHigh: {
-        qDebug("CameraPresetLeftHigh");
         CameraHelper::setCameraRotation(QPointF(90.0f, 45.0f));
         break;
     }
     case Q3DCamera::CameraPresetRightLow: {
-        qDebug("CameraPresetRightLow");
         CameraHelper::setCameraRotation(QPointF(-90.0f, 0.0f));
         break;
     }
     case Q3DCamera::CameraPresetRight: {
-        qDebug("CameraPresetRight");
         CameraHelper::setCameraRotation(QPointF(-90.0f, 22.5f));
         break;
     }
     case Q3DCamera::CameraPresetRightHigh: {
-        qDebug("CameraPresetRightHigh");
         CameraHelper::setCameraRotation(QPointF(-90.0f, 45.0f));
         break;
     }
     case Q3DCamera::CameraPresetBehindLow: {
-        qDebug("CameraPresetBehindLow");
         CameraHelper::setCameraRotation(QPointF(180.0f, 0.0f));
         break;
     }
     case Q3DCamera::CameraPresetBehind: {
-        qDebug("CameraPresetBehind");
         CameraHelper::setCameraRotation(QPointF(180.0f, 22.5f));
         break;
     }
     case Q3DCamera::CameraPresetBehindHigh: {
-        qDebug("CameraPresetBehindHigh");
         CameraHelper::setCameraRotation(QPointF(180.0f, 45.0f));
         break;
     }
     case Q3DCamera::CameraPresetIsometricLeft: {
-        qDebug("CameraPresetIsometricLeft");
         CameraHelper::setCameraRotation(QPointF(45.0f, 22.5f));
         break;
     }
     case Q3DCamera::CameraPresetIsometricLeftHigh: {
-        qDebug("CameraPresetIsometricLeftHigh");
         CameraHelper::setCameraRotation(QPointF(45.0f, 45.0f));
         break;
     }
     case Q3DCamera::CameraPresetIsometricRight: {
-        qDebug("CameraPresetIsometricRight");
         CameraHelper::setCameraRotation(QPointF(-45.0f, 22.5f));
         break;
     }
     case Q3DCamera::CameraPresetIsometricRightHigh: {
-        qDebug("CameraPresetIsometricRightHigh");
         CameraHelper::setCameraRotation(QPointF(-45.0f, 45.0f));
         break;
     }
     case Q3DCamera::CameraPresetDirectlyAbove: {
-        qDebug("CameraPresetDirectlyAbove");
         CameraHelper::setCameraRotation(QPointF(0.0f, 90.0f));
         break;
     }
     case Q3DCamera::CameraPresetDirectlyAboveCW45: {
-        qDebug("CameraPresetDirectlyAboveCW45");
         CameraHelper::setCameraRotation(QPointF(-45.0f, 90.0f));
         break;
     }
     case Q3DCamera::CameraPresetDirectlyAboveCCW45: {
-        qDebug("CameraPresetDirectlyAboveCCW45");
         CameraHelper::setCameraRotation(QPointF(45.0f, 90.0f));
         break;
     }
     case Q3DCamera::CameraPresetFrontBelow: {
-        qDebug("CameraPresetFrontBelow");
         CameraHelper::setCameraRotation(QPointF(0.0f, -45.0f));
         break;
     }
     case Q3DCamera::CameraPresetLeftBelow: {
-        qDebug("CameraPresetLeftBelow");
         CameraHelper::setCameraRotation(QPointF(90.0f, -45.0f));
         break;
     }
     case Q3DCamera::CameraPresetRightBelow: {
-        qDebug("CameraPresetRightBelow");
         CameraHelper::setCameraRotation(QPointF(-90.0f, -45.0f));
         break;
     }
     case Q3DCamera::CameraPresetBehindBelow: {
-        qDebug("CameraPresetBehindBelow");
         CameraHelper::setCameraRotation(QPointF(180.0f, -45.0f));
         break;
     }
     case Q3DCamera::CameraPresetDirectlyBelow: {
-        qDebug("CameraPresetDirectlyBelow");
         CameraHelper::setCameraRotation(QPointF(0.0f, -90.0f));
         break;
     }
@@ -283,4 +255,4 @@ void CameraHelper::setCameraPreset(Q3DCamera::CameraPreset preset)
     }
 }
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+QT_END_NAMESPACE_DATAVISUALIZATION