InputState enum moved to private

Task-number: QTRD-2784

Change-Id: Ibda5445cc9872e2a5bf234914f11d4c380447cf4
Change-Id: Ibda5445cc9872e2a5bf234914f11d4c380447cf4
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>

10 files changed, 92 insertions, 111 deletions

diff --git a/src/datavisualization/engine/qabstract3dgraph.cpp b/src/datavisualization/engine/qabstract3dgraph.cpp
index ebf2daac..860df145 100644
--- a/src/datavisualization/engine/qabstract3dgraph.cpp
+++ b/src/datavisualization/engine/qabstract3dgraph.cpp
@@ -44,10 +44,10 @@ QT_BEGIN_NAMESPACE_DATAVISUALIZATION
  * Anti-aliasing is turned on by default on C++, except in OpenGL ES2
  * environments, where anti-aliasing is not supported by Qt Data Visualization.
  * To specify non-default anti-aliasing for a graph, give a custom surface format as
- * a constructor parameter. You can use the convenience function \c{QtDataVisualization::qDefaultSurfaceFormat()}
+ * a constructor parameter. You can use the convenience function \c QtDataVisualization::qDefaultSurfaceFormat()
  * to create the surface format object.
  *
- * \note QAbstract3DGraph sets window flag \c{Qt::FramelessWindowHint} on by default. If you want to display
+ * \note QAbstract3DGraph sets window flag \c Qt::FramelessWindowHint on by default. If you want to display
  * graph windows as standalone windows with regular window frame, clear this flag after constructing
  * the graph. For example:
  *
@@ -115,7 +115,8 @@ QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 /*!
  * \internal
  */
-QAbstract3DGraph::QAbstract3DGraph(QAbstract3DGraphPrivate *d, const QSurfaceFormat *format, QWindow *parent)
+QAbstract3DGraph::QAbstract3DGraph(QAbstract3DGraphPrivate *d, const QSurfaceFormat *format,
+                                   QWindow *parent)
     : QWindow(parent),
       d_ptr(d)
 {
@@ -175,7 +176,7 @@ QAbstract3DGraph::~QAbstract3DGraph()
 
 /*!
  * Adds the given \a inputHandler to the graph. The input handlers added via addInputHandler
- * are not taken in to use directly. Only the ownership of the a\ inputHandler is given to the graph.
+ * are not taken in to use directly. Only the ownership of the \a inputHandler is given to the graph.
  * The \a inputHandler must not be null or already added to another graph.
  *
  * \sa releaseInputHandler(), setActiveInputHandler()
@@ -289,7 +290,7 @@ QList<Q3DTheme *> QAbstract3DGraph::themes() const
  *
  * Sets selection \a mode to a combination of SelectionFlags. It is preset to
  * \c SelectionItem by default.
- * Different graph types support different selection modes. See \c SelectionFlags
+ * Different graph types support different selection modes. See SelectionFlags
  * documentation for details.
  */
 void QAbstract3DGraph::setSelectionMode(SelectionFlags mode)
@@ -325,7 +326,7 @@ QAbstract3DGraph::ShadowQuality QAbstract3DGraph::shadowQuality() const
 /*!
  * \property QAbstract3DGraph::scene
  *
- * This property contains the read only Q3DScene that can be used to access e.g. camera object.
+ * This property contains the read only Q3DScene that can be used to access for example a camera object.
  */
 Q3DScene *QAbstract3DGraph::scene() const
 {
diff --git a/src/datavisualization/input/q3dinputhandler.cpp b/src/datavisualization/input/q3dinputhandler.cpp
index 9e19df0c..17f5aee5 100644
--- a/src/datavisualization/input/q3dinputhandler.cpp
+++ b/src/datavisualization/input/q3dinputhandler.cpp
@@ -17,9 +17,8 @@
 ****************************************************************************/
 
 #include "datavisualizationglobal_p.h"
-#include "q3dinputhandler.h"
+#include "q3dinputhandler_p.h"
 #include "q3dcamera_p.h"
-#include "q3dlight.h"
 
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
@@ -44,20 +43,24 @@ const float rotationSpeed      = 100.0f;
  *
  * Default input handler has the following functionalty:
  * \table
- *   \header
- *     \li Mouse action                   \li Action
- *   \row
- *     \li Drag with right button pressed \li Rotate graph within limits set for Q3DCamera.
- *   \row
- *     \li Left click                     \li Select item under cursor or remove selection if none.
- *                                            May open the secondary view depending on the
- *                                            selection mode.
- *   \row
- *     \li Mouse wheel                    \li Zoom in/out within default range (10...500%).
- *   \row
- *     \li Left click on the primary view when the secondary view is visible
- *                                        \li Closes the secondary view.
- *                                            \note Secondary view is available only for Q3DBars and Q3DSurface graphs.
+ *      \header
+ *          \li Mouse action
+ *          \li Action
+ *      \row
+ *          \li Drag with right button pressed
+ *          \li Rotate graph within limits set for Q3DCamera.
+ *      \row
+ *          \li Left click
+ *          \li Select item under cursor or remove selection if none.
+ *              May open the secondary view depending on the
+ *              \l {QAbstract3DGraph::selectionMode}{selection mode}.
+ *      \row
+ *          \li Mouse wheel
+ *          \li Zoom in/out within default range (10...500%).
+ *      \row
+ *          \li Left click on the primary view when the secondary view is visible
+ *          \li Closes the secondary view.
+ *          \note Secondary view is available only for Q3DBars and Q3DSurface graphs.
  * \endtable
  */
 
@@ -66,7 +69,8 @@ const float rotationSpeed      = 100.0f;
  * and is then passed to QObject constructor.
  */
 Q3DInputHandler::Q3DInputHandler(QObject *parent) :
-    QAbstract3DInputHandler(parent)
+    QAbstract3DInputHandler(parent),
+    d_ptr(new Q3DInputHandlerPrivate(this))
 {
 }
 
@@ -102,7 +106,7 @@ void Q3DInputHandler::mousePressEvent(QMouseEvent *event, const QPoint &mousePos
             setInputPosition(mousePos);
             scene()->setSelectionQueryPosition(mousePos);
             setInputView(InputViewOnPrimary);
-            setInputState(InputStateSelecting);
+            d_ptr->m_inputState = QAbstract3DInputHandlerPrivate::InputStateSelecting;
         }
     } else if (Qt::MiddleButton == event->button()) {
         // reset rotations
@@ -110,7 +114,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(InputStateRotating);
+            d_ptr->m_inputState = QAbstract3DInputHandlerPrivate::InputStateRotating;
         // update mouse positions to prevent jumping when releasing or repressing a button
         setInputPosition(mousePos);
     }
@@ -127,11 +131,11 @@ void Q3DInputHandler::mouseReleaseEvent(QMouseEvent *event, const QPoint &mouseP
 #if defined (Q_OS_ANDROID)
     Q_UNUSED(mousePos);
 #else
-    if (InputStateRotating == inputState()) {
+    if (QAbstract3DInputHandlerPrivate::InputStateRotating == d_ptr->m_inputState) {
         // update mouse positions to prevent jumping when releasing or repressing a button
         setInputPosition(mousePos);
     }
-    setInputState(InputStateNone);
+    d_ptr->m_inputState = QAbstract3DInputHandlerPrivate::InputStateNone;
     setInputView(InputViewNone);
 #endif
 }
@@ -146,7 +150,7 @@ void Q3DInputHandler::mouseMoveEvent(QMouseEvent *event, const QPoint &mousePos)
 #if defined (Q_OS_ANDROID)
     Q_UNUSED(mousePos);
 #else
-    if (InputStateRotating == inputState()) {
+    if (QAbstract3DInputHandlerPrivate::InputStateRotating == d_ptr->m_inputState) {
         // Calculate mouse movement since last frame
         float xRotation = scene()->activeCamera()->xRotation();
         float yRotation = scene()->activeCamera()->yRotation();
@@ -192,4 +196,14 @@ void Q3DInputHandler::wheelEvent(QWheelEvent *event)
     scene()->activeCamera()->setZoomLevel(zoomLevel);
 }
 
+Q3DInputHandlerPrivate::Q3DInputHandlerPrivate(Q3DInputHandler *q)
+    : q_ptr(q),
+      m_inputState(QAbstract3DInputHandlerPrivate::InputStateNone)
+{
+}
+
+Q3DInputHandlerPrivate::~Q3DInputHandlerPrivate()
+{
+}
+
 QT_END_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualization/input/q3dinputhandler.h b/src/datavisualization/input/q3dinputhandler.h
index 501ac004..535d08bf 100644
--- a/src/datavisualization/input/q3dinputhandler.h
+++ b/src/datavisualization/input/q3dinputhandler.h
@@ -42,9 +42,9 @@ public:
 private:
     Q_DISABLE_COPY(Q3DInputHandler)
 
-    QScopedPointer<Q3DInputHandlerPrivate> *d_ptr;
+    QScopedPointer<Q3DInputHandlerPrivate> d_ptr;
 };
 
 QT_END_NAMESPACE_DATAVISUALIZATION
 
-#endif // QDEFAULT3DINPUTHANDLER_H
+#endif
diff --git a/src/datavisualization/input/q3dinputhandler_p.h b/src/datavisualization/input/q3dinputhandler_p.h
index df8a1978..6d93460b 100644
--- a/src/datavisualization/input/q3dinputhandler_p.h
+++ b/src/datavisualization/input/q3dinputhandler_p.h
@@ -29,12 +29,11 @@
 #ifndef Q3DINPUTHANDLER_P_H
 #define Q3DINPUTHANDLER_P_H
 
-#include "datavisualizationglobal_p.h"
+#include "qabstract3dinputhandler_p.h"
+#include "q3dinputhandler.h"
 
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
-class Q3DInputHandler;
-
 class Q3DInputHandlerPrivate
 {
 public:
@@ -43,7 +42,7 @@ public:
 
 public:
     Q3DInputHandler *q_ptr;
-
+    QAbstract3DInputHandlerPrivate::InputState m_inputState;
 };
 
 QT_END_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualization/input/qabstract3dinputhandler.cpp b/src/datavisualization/input/qabstract3dinputhandler.cpp
index a369a054..b2d02596 100644
--- a/src/datavisualization/input/qabstract3dinputhandler.cpp
+++ b/src/datavisualization/input/qabstract3dinputhandler.cpp
@@ -15,6 +15,7 @@
 ** contact form at http://qt.digia.com
 **
 ****************************************************************************/
+
 #include "qabstract3dinputhandler_p.h"
 
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
@@ -31,20 +32,6 @@ QT_BEGIN_NAMESPACE_DATAVISUALIZATION
  */
 
 /*!
- * \enum QAbstract3DInputHandler::InputState
- *
- * Predefined input states for mouse and touch based input handlers. All states are not valid
- * with all input handlers.
- *
- * \value InputStateNone
- *        Default "no input received" state.
- * \value InputStateRotating
- *        Rotation of the 3D geometry ongoing.
- * \value InputStatePinching
- *        Pinch/punch multitouch input ongoing.
- */
-
-/*!
  * \enum QAbstract3DInputHandler::InputView
  *
  * Predefined input views for mouse and touch based input handlers.
@@ -52,7 +39,8 @@ QT_BEGIN_NAMESPACE_DATAVISUALIZATION
  * \value InputViewNone
  *        Mouse or touch not on a view.
  * \value InputViewOnPrimary
- *        Mouse or touch input received on the primary view area.
+ *        Mouse or touch input received on the primary view area. If secondary view is displayed when
+ *        inputView becomes InputViewOnPrimary, secondary view is closed.
  * \value InputViewOnSecondary
  *        Mouse or touch input received on the secondary view area.
  */
@@ -67,7 +55,7 @@ QT_BEGIN_NAMESPACE_DATAVISUALIZATION
  *
  * This type is uncreatable.
  *
- * For AbstractInputHandler3D enums, see \l QAbstract3DInputHandler::InputState
+ * For AbstractInputHandler3D enums, see \l QAbstract3DInputHandler::InputView
  */
 
 /*!
@@ -147,25 +135,6 @@ void QAbstract3DInputHandler::wheelEvent(QWheelEvent *event)
 
 // Property get/set
 /*!
- * \property QAbstract3DInputHandler::inputState
- *
- * Current enumerated input state based on the processed input events.
- * When the state changes inputStateChanged() is emitted.
- */
-QAbstract3DInputHandler::InputState QAbstract3DInputHandler::inputState()
-{
-    return d_ptr->m_inputState;
-}
-
-void QAbstract3DInputHandler::setInputState(InputState inputState)
-{
-    if (inputState != d_ptr->m_inputState) {
-        d_ptr->m_inputState = inputState;
-        emit inputStateChanged(inputState);
-    }
-}
-
-/*!
  * \property QAbstract3DInputHandler::inputView
  *
  * Current enumerated input view based on the view of the processed input events.
@@ -259,7 +228,6 @@ QAbstract3DInputHandlerPrivate::QAbstract3DInputHandlerPrivate(QAbstract3DInputH
     q_ptr(q),
     m_prevDistance(0),
     m_previousInputPos(QPoint(0,0)),
-    m_inputState(QAbstract3DInputHandler::InputStateNone),
     m_inputView(QAbstract3DInputHandler::InputViewNone),
     m_inputPosition(QPoint(0,0)),
     m_scene(0)
diff --git a/src/datavisualization/input/qabstract3dinputhandler.h b/src/datavisualization/input/qabstract3dinputhandler.h
index 47ae9e1c..94a34475 100644
--- a/src/datavisualization/input/qabstract3dinputhandler.h
+++ b/src/datavisualization/input/qabstract3dinputhandler.h
@@ -29,21 +29,12 @@ class QAbstract3DInputHandlerPrivate;
 class QT_DATAVISUALIZATION_EXPORT QAbstract3DInputHandler : public QObject
 {
     Q_OBJECT
-    Q_ENUMS(InputState)
     Q_ENUMS(InputView)
-    Q_PROPERTY(InputState inputState READ inputState WRITE setInputState NOTIFY inputStateChanged)
     Q_PROPERTY(InputView inputView READ inputView WRITE setInputView NOTIFY inputViewChanged)
     Q_PROPERTY(QPoint inputPosition READ inputPosition WRITE setInputPosition NOTIFY positionChanged)
     Q_PROPERTY(Q3DScene *scene READ scene WRITE setScene NOTIFY sceneChanged)
 
 public:
-    enum InputState {
-        InputStateNone = 0,
-        InputStateSelecting,
-        InputStateRotating,
-        InputStatePinching
-    };
-
     enum InputView {
         InputViewNone = 0,
         InputViewOnPrimary,
@@ -63,11 +54,6 @@ public:
     virtual void wheelEvent(QWheelEvent *event);
 
 public:
-    // TODO: Check if the inputState needs to be visible outside of subclasses in the final architecture
-    InputState inputState();
-    void setInputState(InputState inputState);
-
-    // TODO: Check if the inputView needs to be visible outside of subclasses in the final architecture
     InputView inputView();
     void setInputView(InputView inputView);
 
@@ -79,7 +65,6 @@ public:
 
 signals:
     void positionChanged(QPoint position);
-    void inputStateChanged(InputState state);
     void inputViewChanged(InputView view);
     void sceneChanged(const Q3DScene *scene);
 
diff --git a/src/datavisualization/input/qabstract3dinputhandler_p.h b/src/datavisualization/input/qabstract3dinputhandler_p.h
index c210feee..001040b8 100644
--- a/src/datavisualization/input/qabstract3dinputhandler_p.h
+++ b/src/datavisualization/input/qabstract3dinputhandler_p.h
@@ -45,6 +45,13 @@ public:
     ~QAbstract3DInputHandlerPrivate();
 
 public:
+    enum InputState {
+        InputStateNone = 0,
+        InputStateSelecting,
+        InputStateRotating,
+        InputStatePinching
+    };
+
     QAbstract3DInputHandler *q_ptr;
     int m_prevDistance;
     QPoint m_previousInputPos;
@@ -53,7 +60,6 @@ public:
     GLfloat m_defaultYRotation;
 
 private:
-    QAbstract3DInputHandler::InputState m_inputState;
     QAbstract3DInputHandler::InputView m_inputView;
     QPoint m_inputPosition;
     QRect m_mainViewPort;
diff --git a/src/datavisualization/input/qtouch3dinputhandler.cpp b/src/datavisualization/input/qtouch3dinputhandler.cpp
index 3fc5bea4..d0b57aee 100644
--- a/src/datavisualization/input/qtouch3dinputhandler.cpp
+++ b/src/datavisualization/input/qtouch3dinputhandler.cpp
@@ -45,22 +45,27 @@ const int maxZoomLevel = 500;
  *
  * Default touch input handler has the following functionalty:
  * \table
- *   \header
- *     \li Gesture                  \li Action
- *   \row
- *     \li Touch-And-Move           \li Rotate graph within limits set for Q3DCamera
- *   \row
- *     \li Tap                      \li Select the item tapped or remove selection if none.
- *                                      May open the secondary view depending on the
- *                                      selection mode.
- *   \row
- *     \li Tap-And-Hold             \li Same as tap.
- *   \row
- *     \li Pinch                    \li Zoom in/out within default range (10...500%).
- *   \row
- *     \li Tap on the primary view when the secondary view is visible
- *                                  \li Closes the secondary view.
- *                                      \note Secondary view is available only for Q3DBars and Q3DSurface graphs.
+ *      \header
+ *          \li Gesture
+ *          \li Action
+ *      \row
+ *          \li Touch-And-Move
+ *          \li Rotate graph within limits set for Q3DCamera
+ *      \row
+ *          \li Tap
+ *          \li Select the item tapped or remove selection if none.
+ *              May open the secondary view depending on the
+ *              \l {QAbstract3DGraph::selectionMode}{selection mode}.
+ *      \row
+ *          \li Tap-And-Hold
+ *          \li Same as tap.
+ *      \row
+ *          \li Pinch
+ *          \li Zoom in/out within default range (10...500%).
+ *      \row
+ *          \li Tap on the primary view when the secondary view is visible
+ *          \li Closes the secondary view.
+ *          \note Secondary view is available only for Q3DBars and Q3DSurface graphs.
  * \endtable
  */
 
@@ -111,14 +116,14 @@ void QTouch3DInputHandler::touchEvent(QTouchEvent *event)
                 d_ptr->m_holdTimer->start();
                 setInputView(InputViewOnPrimary);
                 // Start rotating
-                setInputState(InputStateRotating);
+                d_ptr->m_inputState = QAbstract3DInputHandlerPrivate::InputStateRotating;
                 setInputPosition(pointerPos.toPoint());
             }
         } else if (event->type() == QEvent::TouchEnd) {
             setInputView(InputViewNone);
             d_ptr->m_holdTimer->stop();
             // Handle possible selection
-            if (QAbstract3DInputHandler::InputStatePinching != inputState())
+            if (QAbstract3DInputHandlerPrivate::InputStatePinching != d_ptr->m_inputState)
                 d_ptr->handleSelection(pointerPos);
         } else if (event->type() == QEvent::TouchUpdate) {
             if (!scene()->isSlicingActive()) {
@@ -134,7 +139,8 @@ void QTouch3DInputHandler::touchEvent(QTouchEvent *event)
 
 QTouch3DInputHandlerPrivate::QTouch3DInputHandlerPrivate(QTouch3DInputHandler *q)
     : q_ptr(q),
-      m_holdTimer(0)
+      m_holdTimer(0),
+      m_inputState(QAbstract3DInputHandlerPrivate::InputStateNone)
 {
     m_holdTimer = new QTimer();
     m_holdTimer->setSingleShot(true);
@@ -154,7 +160,7 @@ void QTouch3DInputHandlerPrivate::handlePinchZoom(float distance)
     int prevDist = q_ptr->prevDistance();
     if (prevDist > 0 && qAbs(prevDist - newDistance) < maxPinchJitter)
         return;
-    q_ptr->setInputState(QAbstract3DInputHandler::InputStatePinching);
+    m_inputState = QAbstract3DInputHandlerPrivate::InputStatePinching;
     Q3DCamera *camera = q_ptr->scene()->activeCamera();
     int zoomLevel = camera->zoomLevel();
     float zoomRate = qSqrt(qSqrt(zoomLevel));
@@ -176,7 +182,7 @@ void QTouch3DInputHandlerPrivate::handleTapAndHold()
     if (distance.manhattanLength() < maxTapAndHoldJitter) {
         q_ptr->setInputPosition(m_touchHoldPos.toPoint());
         q_ptr->scene()->setSelectionQueryPosition(m_touchHoldPos.toPoint());
-        q_ptr->setInputState(QAbstract3DInputHandler::InputStateSelecting);
+        m_inputState = QAbstract3DInputHandlerPrivate::InputStateSelecting;
     }
 }
 
@@ -184,10 +190,10 @@ void QTouch3DInputHandlerPrivate::handleSelection(const QPointF &position)
 {
     QPointF distance = m_startHoldPos - position;
     if (distance.manhattanLength() < maxSelectionJitter) {
-        q_ptr->setInputState(QAbstract3DInputHandler::InputStateSelecting);
+        m_inputState = QAbstract3DInputHandlerPrivate::InputStateSelecting;
         q_ptr->scene()->setSelectionQueryPosition(position.toPoint());
     } else {
-        q_ptr->setInputState(QAbstract3DInputHandler::InputStateNone);
+        m_inputState = QAbstract3DInputHandlerPrivate::InputStateNone;
         q_ptr->setInputView(QAbstract3DInputHandler::InputViewNone);
     }
     q_ptr->setPreviousInputPos(position.toPoint());
@@ -195,7 +201,7 @@ void QTouch3DInputHandlerPrivate::handleSelection(const QPointF &position)
 
 void QTouch3DInputHandlerPrivate::handleRotation(const QPointF &position)
 {
-    if (QAbstract3DInputHandler::InputStateRotating == q_ptr->inputState()) {
+    if (QAbstract3DInputHandlerPrivate::InputStateRotating == m_inputState) {
         Q3DScene *scene = q_ptr->scene();
         Q3DCamera *camera = scene->activeCamera();
         float xRotation = camera->xRotation();
diff --git a/src/datavisualization/input/qtouch3dinputhandler.h b/src/datavisualization/input/qtouch3dinputhandler.h
index fef63c3b..41670cec 100644
--- a/src/datavisualization/input/qtouch3dinputhandler.h
+++ b/src/datavisualization/input/qtouch3dinputhandler.h
@@ -44,4 +44,4 @@ private:
 
 QT_END_NAMESPACE_DATAVISUALIZATION
 
-#endif // QTOUCH3DINPUTHANDLER_H
+#endif
diff --git a/src/datavisualization/input/qtouch3dinputhandler_p.h b/src/datavisualization/input/qtouch3dinputhandler_p.h
index 143c828d..143c3664 100644
--- a/src/datavisualization/input/qtouch3dinputhandler_p.h
+++ b/src/datavisualization/input/qtouch3dinputhandler_p.h
@@ -19,6 +19,7 @@
 #ifndef QTOUCH3DINPUTHANDLER_P_H
 #define QTOUCH3DINPUTHANDLER_P_H
 
+#include "qabstract3dinputhandler_p.h"
 #include "qtouch3dinputhandler.h"
 
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
@@ -41,6 +42,7 @@ public:
 public:
     QTouch3DInputHandler *q_ptr;
     QTimer *m_holdTimer;
+    QAbstract3DInputHandlerPrivate::InputState m_inputState;
     QPointF m_startHoldPos;
     QPointF m_touchHoldPos;
 };