Refactored MeshStyle and InputState

Task-number: QTRD-2362

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

14 files changed, 64 insertions, 64 deletions

diff --git a/src/datavisualization/engine/bars3dcontroller.cpp b/src/datavisualization/engine/bars3dcontroller.cpp
index cff730e7..26014c12 100644
--- a/src/datavisualization/engine/bars3dcontroller.cpp
+++ b/src/datavisualization/engine/bars3dcontroller.cpp
@@ -39,7 +39,7 @@ Bars3DController::Bars3DController(QRect boundRect)
       m_renderer(0)
 {
     // Default bar type; specific to bars
-    setBarType(QDataVis::BevelBars, false);
+    setBarType(QDataVis::MeshStyleBevelBars, false);
 
     setActiveDataProxy(0);
 
@@ -311,15 +311,15 @@ bool Bars3DController::isBarSpecRelative()
 void Bars3DController::setBarType(QDataVis::MeshStyle style, bool smooth)
 {
     QString objFile;
-    if (style == QDataVis::Bars)
+    if (style == QDataVis::MeshStyleBars)
         objFile = QStringLiteral(":/defaultMeshes/bar");
-    else if (style == QDataVis::Pyramids)
+    else if (style == QDataVis::MeshStylePyramids)
         objFile = QStringLiteral(":/defaultMeshes/pyramid");
-    else if (style == QDataVis::Cones)
+    else if (style == QDataVis::MeshStyleCones)
         objFile = QStringLiteral(":/defaultMeshes/cone");
-    else if (style == QDataVis::Cylinders)
+    else if (style == QDataVis::MeshStyleCylinders)
         objFile = QStringLiteral(":/defaultMeshes/cylinder");
-    else if (style == QDataVis::BevelBars)
+    else if (style == QDataVis::MeshStyleBevelBars)
         objFile = QStringLiteral(":/defaultMeshes/bevelbar");
 
     if (smooth)
diff --git a/src/datavisualization/engine/bars3drenderer.cpp b/src/datavisualization/engine/bars3drenderer.cpp
index 8274675d..2649fe85 100644
--- a/src/datavisualization/engine/bars3drenderer.cpp
+++ b/src/datavisualization/engine/bars3drenderer.cpp
@@ -712,7 +712,7 @@ void Bars3DRenderer::drawScene(GLuint defaultFboHandle)
         glEnable(GL_DITHER);
 
         // Read color under cursor
-        if (QDataVis::InputOnScene == m_controller->inputState()) {
+        if (QDataVis::InputStateOnScene == m_controller->inputState()) {
             m_selection = Utils::getSelection(m_controller->inputPosition(),
                                               m_cachedBoundingRect.height());
         }
@@ -749,7 +749,7 @@ void Bars3DRenderer::drawScene(GLuint defaultFboHandle)
 
     bool selectionDirty = (m_selection != m_previousSelection
             || (m_selection != selectionSkipColor
-            && QDataVis::InputOnScene == m_controller->inputState()
+            && QDataVis::InputStateOnScene == m_controller->inputState()
             && !m_cachedIsSlicingActivated));
     if (selectionDirty) {
         m_previousSelection = m_selection;
@@ -1388,7 +1388,7 @@ void Bars3DRenderer::drawScene(GLuint defaultFboHandle)
         m_selectedBar = NULL;
         if (m_cachedIsSlicingActivated
                 && (m_selection == selectionSkipColor
-                    || QDataVis::InputOnOverview == m_controller->inputState())) {
+                    || QDataVis::InputStateOnOverview == m_controller->inputState())) {
             m_cachedScene->setSlicingActive(false);
         }
     } else if (m_cachedSelectionMode >= QDataVis::SelectionModeSliceRow && selectionDirty) {
diff --git a/src/datavisualization/engine/q3dbars.cpp b/src/datavisualization/engine/q3dbars.cpp
index 1a0ff961..b1b74b93 100644
--- a/src/datavisualization/engine/q3dbars.cpp
+++ b/src/datavisualization/engine/q3dbars.cpp
@@ -238,7 +238,7 @@ bool Q3DBars::isBarSpacingRelative()
 
 /*!
  * Sets the bar \a style to one of the values in \c QDataVis::MeshStyle. It is preset to
- * \c QDataVis::Bars by default. A \a smooth flag can be used to set shading to smooth.
+ * \c QDataVis::MeshStyleBars by default. A \a smooth flag can be used to set shading to smooth.
  * It is \c false by default.
  *
  * \sa setMeshFileName()
diff --git a/src/datavisualization/engine/q3dscatter.cpp b/src/datavisualization/engine/q3dscatter.cpp
index 64df5f04..78b60968 100644
--- a/src/datavisualization/engine/q3dscatter.cpp
+++ b/src/datavisualization/engine/q3dscatter.cpp
@@ -178,7 +178,7 @@ void Q3DScatter::setHeight(const int height)
 
 /*!
  * Sets the item \a style to one of the values in \c QDataVis::MeshStyle. It is preset to
- * \c QDataVis::Spheres by default. A \a smooth flag can be used to set shading to smooth.
+ * \c QDataVis::MeshStyleSpheres by default. A \a smooth flag can be used to set shading to smooth.
  * It is \c false by default.
  *
  * \sa setMeshFileName()
diff --git a/src/datavisualization/engine/scatter3dcontroller.cpp b/src/datavisualization/engine/scatter3dcontroller.cpp
index 126f6736..e3b649db 100644
--- a/src/datavisualization/engine/scatter3dcontroller.cpp
+++ b/src/datavisualization/engine/scatter3dcontroller.cpp
@@ -35,7 +35,7 @@ Scatter3DController::Scatter3DController(QRect boundRect)
       m_selectedItemIndex(noSelectionIndex())
 {
     // Default object type; specific to scatter
-    setObjectType(QDataVis::Spheres, false);
+    setObjectType(QDataVis::MeshStyleSpheres, false);
 
     setActiveDataProxy(new QScatterDataProxy);
 
@@ -191,7 +191,7 @@ void Scatter3DController::handleAxisAutoAdjustRangeChangedInOrientation(
 void Scatter3DController::setObjectType(QDataVis::MeshStyle style, bool smooth)
 {
     QString objFile;
-    if (style == QDataVis::Spheres) {
+    if (style == QDataVis::MeshStyleSpheres) {
         if (smooth)
             objFile = QStringLiteral(":/defaultMeshes/sphereSmooth");
         else
diff --git a/src/datavisualization/engine/scatter3drenderer.cpp b/src/datavisualization/engine/scatter3drenderer.cpp
index 83e9a72f..61610e1a 100644
--- a/src/datavisualization/engine/scatter3drenderer.cpp
+++ b/src/datavisualization/engine/scatter3drenderer.cpp
@@ -438,7 +438,7 @@ void Scatter3DRenderer::drawScene(const GLuint defaultFboHandle)
         glEnable(GL_DITHER);
 
         // Read color under cursor
-        if (QDataVis::InputOnScene == m_controller->inputState()) {
+        if (QDataVis::InputStateOnScene == m_controller->inputState()) {
             m_selection = Utils::getSelection(m_controller->inputPosition(),
                                               m_cachedBoundingRect.height());
         }
diff --git a/src/datavisualization/engine/surface3drenderer.cpp b/src/datavisualization/engine/surface3drenderer.cpp
index b0472c9b..4501c126 100644
--- a/src/datavisualization/engine/surface3drenderer.cpp
+++ b/src/datavisualization/engine/surface3drenderer.cpp
@@ -919,7 +919,7 @@ void Surface3DRenderer::drawScene(GLuint defaultFboHandle)
     glEnable(GL_TEXTURE_2D);
 
     // Draw selection buffer
-    if (!m_cachedIsSlicingActivated && m_controller->inputState() == QDataVis::InputOnScene
+    if (!m_cachedIsSlicingActivated && m_controller->inputState() == QDataVis::InputStateOnScene
             && m_surfaceObj && m_cachedSelectionMode > QDataVis::SelectionModeNone) {
         m_selectionShader->bind();
         glBindFramebuffer(GL_FRAMEBUFFER, m_selectionFrameBuffer);
@@ -1649,7 +1649,7 @@ void Surface3DRenderer::drawScene(GLuint defaultFboHandle)
 
         m_selectionModeChanged = false;
     }
-    if (m_controller->inputState() == QDataVis::InputOnOverview) {
+    if (m_controller->inputState() == QDataVis::InputStateOnOverview) {
         if (m_cachedIsSlicingActivated) {
             m_cachedScene->setSlicingActive(false);
             m_selectionActive = false;
diff --git a/src/datavisualization/global/qdatavisualizationenums.h b/src/datavisualization/global/qdatavisualizationenums.h
index d76e54e1..3d765ff2 100644
--- a/src/datavisualization/global/qdatavisualizationenums.h
+++ b/src/datavisualization/global/qdatavisualizationenums.h
@@ -37,22 +37,22 @@ class QT_DATAVISUALIZATION_EXPORT QDataVis : public QObject
 
 public:
     enum InputState {
-        InputNone = 0,
-        InputOnScene,
-        InputOnOverview,
-        InputOnSlice,
-        InputRotating,
-        InputOnPinch
+        InputStateNone = 0,
+        InputStateOnScene,
+        InputStateOnOverview,
+        InputStateOnSlice,
+        InputStateRotating,
+        InputStateOnPinch
     };
 
     enum MeshStyle {
-        Bars = 0,
-        Pyramids,
-        Cones,
-        Cylinders,
-        BevelBars,
-        Spheres,
-        Dots
+        MeshStyleBars = 0,
+        MeshStylePyramids,
+        MeshStyleCones,
+        MeshStyleCylinders,
+        MeshStyleBevelBars,
+        MeshStyleSpheres,
+        MeshStyleDots
     };
 
     enum CameraPreset {
diff --git a/src/datavisualization/global/qtdatavisualizationenums.qdoc b/src/datavisualization/global/qtdatavisualizationenums.qdoc
index 4d6d651a..fde6a258 100644
--- a/src/datavisualization/global/qtdatavisualizationenums.qdoc
+++ b/src/datavisualization/global/qtdatavisualizationenums.qdoc
@@ -27,17 +27,17 @@
 
     Predefined input states for mouse and touch based input handlers. All states are not valid with all input handlers.
 
-    \value InputNone
+    \value InputStateNone
            Default "no input received" state.
-    \value InputOnScene
+    \value InputStateOnScene
            Mouse or touch input received on the 3D scene.
-    \value InputOnOverview
+    \value InputStateOnOverview
            Mouse or touch input received on the overview area.
-    \value InputOnSlice
+    \value InputStateOnSlice
            Mouse or touch input received on the slice view area.
-    \value InputRotating
+    \value InputStateRotating
            Rotation of the 3D geometry ongoing.
-    \value InputOnPinch
+    \value InputStateOnPinch
            Pinch/punch multitouch input received.
 */
 
@@ -46,19 +46,19 @@
 
     Predefined mesh types. All styles are not usable with all visualization types.
 
-    \value Bars
+    \value MeshStyleBars
            Basic cubic bar.
-    \value Pyramids
+    \value MeshStylePyramids
            Four-sided pyramid.
-    \value Cones
+    \value MeshStyleCones
            Basic cone.
-    \value Cylinders
+    \value MeshStyleCylinders
            Basic cylinder.
-    \value BevelBars
+    \value MeshStyleBevelBars
            Slightly beveled (rounded) cubic bar.
-    \value Spheres
+    \value MeshStyleSpheres
            Sphere. Not usable in Q3DBars.
-    \value Dots
+    \value MeshStyleDots
            Triangular pyramid. Usable only with Q3DScatter.
 */
 
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();
diff --git a/src/datavisualizationqml2/declarativebars.cpp b/src/datavisualizationqml2/declarativebars.cpp
index c15ca495..9ed80106 100644
--- a/src/datavisualizationqml2/declarativebars.cpp
+++ b/src/datavisualizationqml2/declarativebars.cpp
@@ -163,9 +163,9 @@ QDataVis::MeshStyle DeclarativeBars::barType() const
 {
     QString objFile = m_shared->meshFileName();
     if (objFile.contains("/sphere"))
-        return QDataVis::Spheres;
+        return QDataVis::MeshStyleSpheres;
     else
-        return QDataVis::Dots;
+        return QDataVis::MeshStyleDots;
 }
 
 void DeclarativeBars::setBarSmoothingEnabled(bool enabled)
diff --git a/src/datavisualizationqml2/declarativescatter.cpp b/src/datavisualizationqml2/declarativescatter.cpp
index 6447c781..346abec2 100644
--- a/src/datavisualizationqml2/declarativescatter.cpp
+++ b/src/datavisualizationqml2/declarativescatter.cpp
@@ -127,9 +127,9 @@ QDataVis::MeshStyle DeclarativeScatter::objectType() const
 {
     QString objFile = m_shared->meshFileName();
     if (objFile.contains("/sphere"))
-        return QDataVis::Spheres;
+        return QDataVis::MeshStyleSpheres;
     else
-        return QDataVis::Dots;
+        return QDataVis::MeshStyleDots;
 }
 
 void DeclarativeScatter::setObjectSmoothingEnabled(bool enabled)