Split QAnalogAxisInput out of QAxisInput

The axis property of QAxisInput goes there.

Change-Id: Ie226de652848909fc6e3a425612d877ef18b35f3
Task-number: QTBUG-51474
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

4 files changed, 12 insertions, 12 deletions

diff --git a/src/extras/defaults/qfirstpersoncameracontroller.cpp b/src/extras/defaults/qfirstpersoncameracontroller.cpp
index 0a69dc2ca..1e42223a2 100644
--- a/src/extras/defaults/qfirstpersoncameracontroller.cpp
+++ b/src/extras/defaults/qfirstpersoncameracontroller.cpp
@@ -52,7 +52,7 @@
 #include "qfirstpersoncameracontroller.h"
 #include <Qt3DRender/QCamera>
 #include <Qt3DInput/QAxis>
-#include <Qt3DInput/QAxisInput>
+#include <Qt3DInput/QAnalogAxisInput>
 #include <Qt3DInput/QButtonAxisInput>
 #include <Qt3DInput/QAction>
 #include <Qt3DInput/QActionInput>
@@ -78,8 +78,8 @@ QFirstPersonCameraControllerPrivate::QFirstPersonCameraControllerPrivate()
     , m_tzAxis(new Qt3DInput::QAxis())
     , m_leftMouseButtonInput(new Qt3DInput::QActionInput())
     , m_fineMotionKeyInput(new Qt3DInput::QActionInput())
-    , m_mouseRxInput(new Qt3DInput::QAxisInput())
-    , m_mouseRyInput(new Qt3DInput::QAxisInput())
+    , m_mouseRxInput(new Qt3DInput::QAnalogAxisInput())
+    , m_mouseRyInput(new Qt3DInput::QAnalogAxisInput())
     , m_keyboardTxPosInput(new Qt3DInput::QButtonAxisInput())
     , m_keyboardTyPosInput(new Qt3DInput::QButtonAxisInput())
     , m_keyboardTzPosInput(new Qt3DInput::QButtonAxisInput())
diff --git a/src/extras/defaults/qfirstpersoncameracontroller_p.h b/src/extras/defaults/qfirstpersoncameracontroller_p.h
index 756ab668d..9ea830f85 100644
--- a/src/extras/defaults/qfirstpersoncameracontroller_p.h
+++ b/src/extras/defaults/qfirstpersoncameracontroller_p.h
@@ -84,7 +84,7 @@ class QLogicalDevice;
 class QAction;
 class QActionInput;
 class QAxis;
-class QAxisInput;
+class QAnalogAxisInput;
 class QButtonAxisInput;
 class QAxisActionHandler;
 
@@ -113,8 +113,8 @@ public:
     Qt3DInput::QActionInput *m_leftMouseButtonInput;
     Qt3DInput::QActionInput *m_fineMotionKeyInput;
 
-    Qt3DInput::QAxisInput *m_mouseRxInput;
-    Qt3DInput::QAxisInput *m_mouseRyInput;
+    Qt3DInput::QAnalogAxisInput *m_mouseRxInput;
+    Qt3DInput::QAnalogAxisInput *m_mouseRyInput;
     Qt3DInput::QButtonAxisInput *m_keyboardTxPosInput;
     Qt3DInput::QButtonAxisInput *m_keyboardTyPosInput;
     Qt3DInput::QButtonAxisInput *m_keyboardTzPosInput;
diff --git a/src/extras/defaults/qorbitcontrol.cpp b/src/extras/defaults/qorbitcontrol.cpp
index 7c1c5e6f8..47703ea17 100644
--- a/src/extras/defaults/qorbitcontrol.cpp
+++ b/src/extras/defaults/qorbitcontrol.cpp
@@ -39,7 +39,7 @@
 #include <QtGlobal>
 #include <Qt3DRender/QCamera>
 #include <Qt3DInput/QAxis>
-#include <Qt3DInput/QAxisInput>
+#include <Qt3DInput/QAnalogAxisInput>
 #include <Qt3DInput/QButtonAxisInput>
 #include <Qt3DInput/QAction>
 #include <Qt3DInput/QActionInput>
@@ -74,8 +74,8 @@ QOrbitControlPrivate::QOrbitControlPrivate()
     , m_rightMouseButtonInput(new Qt3DInput::QActionInput())
     , m_altButtonInput(new Qt3DInput::QActionInput())
     , m_shiftButtonInput(new Qt3DInput::QActionInput())
-    , m_mouseRxInput(new Qt3DInput::QAxisInput())
-    , m_mouseRyInput(new Qt3DInput::QAxisInput())
+    , m_mouseRxInput(new Qt3DInput::QAnalogAxisInput())
+    , m_mouseRyInput(new Qt3DInput::QAnalogAxisInput())
     , m_keyboardTxPosInput(new Qt3DInput::QButtonAxisInput())
     , m_keyboardTyPosInput(new Qt3DInput::QButtonAxisInput())
     , m_keyboardTzPosInput(new Qt3DInput::QButtonAxisInput())
diff --git a/src/extras/defaults/qorbitcontrol_p.h b/src/extras/defaults/qorbitcontrol_p.h
index 900227152..f3f384493 100644
--- a/src/extras/defaults/qorbitcontrol_p.h
+++ b/src/extras/defaults/qorbitcontrol_p.h
@@ -70,7 +70,7 @@ class QLogicalDevice;
 class QAction;
 class QActionInput;
 class QAxis;
-class QAxisInput;
+class QAnalogAxisInput;
 class QButtonAxisInput;
 class QAxisActionHandler;
 
@@ -103,8 +103,8 @@ public:
     Qt3DInput::QActionInput *m_altButtonInput;
     Qt3DInput::QActionInput *m_shiftButtonInput;
 
-    Qt3DInput::QAxisInput *m_mouseRxInput;
-    Qt3DInput::QAxisInput *m_mouseRyInput;
+    Qt3DInput::QAnalogAxisInput *m_mouseRxInput;
+    Qt3DInput::QAnalogAxisInput *m_mouseRyInput;
     Qt3DInput::QButtonAxisInput *m_keyboardTxPosInput;
     Qt3DInput::QButtonAxisInput *m_keyboardTyPosInput;
     Qt3DInput::QButtonAxisInput *m_keyboardTzPosInput;