Refactored MeshStyle and InputState

Task-number: QTRD-2362

Change-Id: I52ad876b9658a4a9f9a79a6358e68323075bd6c9
Change-Id: I52ad876b9658a4a9f9a79a6358e68323075bd6c9
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>

3 files changed, 18 insertions, 18 deletions

diff --git a/src/datavisualization/input/q3dinputhandler.cpp b/src/datavisualization/input/q3dinputhandler.cpp
index bbbde7d8..f6e73a7d 100644
--- a/src/datavisualization/input/q3dinputhandler.cpp
+++ b/src/datavisualization/input/q3dinputhandler.cpp
@@ -88,14 +88,14 @@ void Q3DInputHandler::mousePressEvent(QMouseEvent *event, const QPoint &mousePos
     if (Qt::LeftButton == event->button()) {
         if (scene()->isSlicingActive()) {
             if (scene()->isPointInPrimarySubView(mousePos)) {
-                setInputState(QDataVis::InputOnOverview);
+                setInputState(QDataVis::InputStateOnOverview);
             } else if (scene()->isPointInSecondarySubView(mousePos)) {
-                setInputState(QDataVis::InputOnSlice);
+                setInputState(QDataVis::InputStateOnSlice);
             } else {
-                setInputState(QDataVis::InputNone);
+                setInputState(QDataVis::InputStateNone);
             }
         } else {
-            setInputState(QDataVis::InputOnScene);
+            setInputState(QDataVis::InputStateOnScene);
             // update mouse positions to prevent jumping when releasing or repressing a button
             setInputPosition(mousePos);
         }
@@ -105,7 +105,7 @@ void Q3DInputHandler::mousePressEvent(QMouseEvent *event, const QPoint &mousePos
     } else if (Qt::RightButton == event->button()) {
         // disable rotating when in slice view
         if (!scene()->isSlicingActive())
-            setInputState(QDataVis::InputRotating);
+            setInputState(QDataVis::InputStateRotating);
         // update mouse positions to prevent jumping when releasing or repressing a button
         setInputPosition(mousePos);
     }
@@ -122,11 +122,11 @@ void Q3DInputHandler::mouseReleaseEvent(QMouseEvent *event, const QPoint &mouseP
 #if defined (Q_OS_ANDROID)
     Q_UNUSED(mousePos);
 #else
-    if (QDataVis::InputRotating == inputState()) {
+    if (QDataVis::InputStateRotating == inputState()) {
         // update mouse positions to prevent jumping when releasing or repressing a button
         setInputPosition(mousePos);
     }
-    setInputState(QDataVis::InputNone);
+    setInputState(QDataVis::InputStateNone);
 #endif
 }
 
@@ -140,7 +140,7 @@ void Q3DInputHandler::mouseMoveEvent(QMouseEvent *event, const QPoint &mousePos)
 #if defined (Q_OS_ANDROID)
     Q_UNUSED(mousePos);
 #else
-    if (QDataVis::InputRotating == inputState()) {
+    if (QDataVis::InputStateRotating == inputState()) {
         // Calculate mouse movement since last frame
         QPointF rotations = scene()->activeCamera()->rotations();
         float xRotation = rotations.x();
diff --git a/src/datavisualization/input/qabstract3dinputhandler.cpp b/src/datavisualization/input/qabstract3dinputhandler.cpp
index 9dd5f862..e111ff42 100644
--- a/src/datavisualization/input/qabstract3dinputhandler.cpp
+++ b/src/datavisualization/input/qabstract3dinputhandler.cpp
@@ -196,7 +196,7 @@ QAbstract3DInputHandlerPrivate::QAbstract3DInputHandlerPrivate(QAbstract3DInputH
     q_ptr(q),
     m_prevDistance(0),
     m_previousInputPos(QPoint(0,0)),
-    m_inputState(QDataVis::InputNone),
+    m_inputState(QDataVis::InputStateNone),
     m_inputPosition(QPoint(0,0)),
     m_scene(0)
 {
diff --git a/src/datavisualization/input/qtouch3dinputhandler.cpp b/src/datavisualization/input/qtouch3dinputhandler.cpp
index fd7ce39c..b0eabd34 100644
--- a/src/datavisualization/input/qtouch3dinputhandler.cpp
+++ b/src/datavisualization/input/qtouch3dinputhandler.cpp
@@ -96,18 +96,18 @@ void QTouch3DInputHandler::touchEvent(QTouchEvent *event)
         if (event->type() == QEvent::TouchBegin) {
             if (scene()->isSlicingActive()) {
                 if (scene()->isPointInPrimarySubView(pointerPos.toPoint()))
-                    setInputState(QDataVis::InputOnOverview);
+                    setInputState(QDataVis::InputStateOnOverview);
                 else if (scene()->isPointInSecondarySubView(pointerPos.toPoint()))
-                    setInputState(QDataVis::InputOnSlice);
+                    setInputState(QDataVis::InputStateOnSlice);
                 else
-                    setInputState(QDataVis::InputNone);
+                    setInputState(QDataVis::InputStateNone);
             } else {
                 // Handle possible tap-and-hold selection
                 d_ptr->m_startHoldPos = pointerPos;
                 d_ptr->m_touchHoldPos = d_ptr->m_startHoldPos;
                 d_ptr->m_holdTimer->start();
                 // Start rotating
-                setInputState(QDataVis::InputRotating);
+                setInputState(QDataVis::InputStateRotating);
                 setInputPosition(pointerPos.toPoint());
             }
         } else if (event->type() == QEvent::TouchEnd) {
@@ -148,7 +148,7 @@ void QTouch3DInputHandlerPrivate::handlePinchZoom(qreal distance)
     int prevDist = q_ptr->prevDistance();
     if (prevDist > 0 && qAbs(prevDist - newDistance) < maxPinchJitter)
         return;
-    q_ptr->setInputState(QDataVis::InputOnPinch);
+    q_ptr->setInputState(QDataVis::InputStateOnPinch);
     Q3DCamera *camera = q_ptr->scene()->activeCamera();
     int zoomLevel = camera->zoomLevel();
     qreal zoomRate = qSqrt(qSqrt(zoomLevel));
@@ -169,7 +169,7 @@ void QTouch3DInputHandlerPrivate::handleTapAndHold()
     QPointF distance = m_startHoldPos - m_touchHoldPos;
     if (distance.manhattanLength() < maxTapAndHoldJitter) {
         q_ptr->setInputPosition(m_touchHoldPos.toPoint());
-        q_ptr->setInputState(QDataVis::InputOnScene);
+        q_ptr->setInputState(QDataVis::InputStateOnScene);
     }
 }
 
@@ -177,15 +177,15 @@ void QTouch3DInputHandlerPrivate::handleSelection(const QPointF &position)
 {
     QPointF distance = m_startHoldPos - position;
     if (distance.manhattanLength() < maxSelectionJitter)
-        q_ptr->setInputState(QDataVis::InputOnScene);
+        q_ptr->setInputState(QDataVis::InputStateOnScene);
     else
-        q_ptr->setInputState(QDataVis::InputNone);
+        q_ptr->setInputState(QDataVis::InputStateNone);
     q_ptr->setPreviousInputPos(position.toPoint());
 }
 
 void QTouch3DInputHandlerPrivate::handleRotation(const QPointF &position)
 {
-    if (QDataVis::InputRotating == q_ptr->inputState()) {
+    if (QDataVis::InputStateRotating == q_ptr->inputState()) {
         Q3DScene *scene = q_ptr->scene();
         Q3DCamera *camera = scene->activeCamera();
         QPointF rotations = camera->rotations();