1 files changed, 15 insertions, 4 deletions
diff --git a/src/datavisualization/input/qabstract3dinputhandler.h b/src/datavisualization/input/qabstract3dinputhandler.h
index fed6e3e0..313abef3 100644
--- a/src/datavisualization/input/qabstract3dinputhandler.h
+++ b/src/datavisualization/input/qabstract3dinputhandler.h
@@ -30,11 +30,22 @@ class QAbstract3DInputHandlerPrivate;
 class QT_DATAVISUALIZATION_EXPORT QAbstract3DInputHandler : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(QtDataVisualization::QDataVis::InputState inputState READ inputState WRITE setInputState NOTIFY inputStateChanged)
+    Q_ENUMS(InputState)
+    Q_PROPERTY(InputState inputState READ inputState WRITE setInputState NOTIFY inputStateChanged)
     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,
+        InputStateOnScene,
+        InputStateOnPrimaryView,
+        InputStateOnSecondaryView,
+        InputStateRotating,
+        InputStatePinching
+    };
+
+public:
     explicit QAbstract3DInputHandler(QObject *parent = 0);
     virtual ~QAbstract3DInputHandler();
 
@@ -48,8 +59,8 @@ public:
 
 public:
     // TODO: Check if the inputState needs to be visible outside of subclasses in the final architecture
-    QDataVis::InputState inputState();
-    void setInputState(QDataVis::InputState inputState);
+    InputState inputState();
+    void setInputState(InputState inputState);
 
     QPoint inputPosition() const;
     void setInputPosition(const QPoint &position);
@@ -59,7 +70,7 @@ public:
 
 signals:
     void positionChanged(QPoint position);
-    void inputStateChanged(QDataVis::InputState state);
+    void inputStateChanged(InputState state);
     void sceneChanged(const Q3DScene *scene);
 
 protected: