QActionInput and QAxisInput keys to buttons

As per API review
renamed keys to buttons as it is more descriptive

Change-Id: If0907b382a863d64bd8d86e2796613767a1fd12b
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

3 files changed, 25 insertions, 25 deletions

diff --git a/examples/qt3d/examples-common/FirstPersonCameraController.qml b/examples/qt3d/examples-common/FirstPersonCameraController.qml
index 6c805a5bf..e439030ff 100644
--- a/examples/qt3d/examples-common/FirstPersonCameraController.qml
+++ b/examples/qt3d/examples-common/FirstPersonCameraController.qml
@@ -89,14 +89,14 @@ Entity {
                     id: leftMouseButtonAction
                     ActionInput {
                         sourceDevice: mouseSourceDevice
-                        keys: [MouseController.Left]
+                        buttons: [MouseController.Left]
                     }
                 },
                 Action {
                     id: fineMotionAction
                     ActionInput {
                         sourceDevice: keyboardSourceDevice
-                        keys: [Qt.Key_Shift]
+                        buttons: [Qt.Key_Shift]
                     }
                 }
             ] // actions
@@ -122,12 +122,12 @@ Entity {
                     id: txAxis
                     AxisInput {
                         sourceDevice: keyboardSourceDevice
-                        keys: [Qt.Key_Left]
+                        buttons: [Qt.Key_Left]
                         scale: -1.0
                     }
                     AxisInput {
                         sourceDevice: keyboardSourceDevice
-                        keys: [Qt.Key_Right]
+                        buttons: [Qt.Key_Right]
                         scale: 1.0
                     }
                 },
@@ -135,12 +135,12 @@ Entity {
                     id: tzAxis
                     AxisInput {
                         sourceDevice: keyboardSourceDevice
-                        keys: [Qt.Key_Up]
+                        buttons: [Qt.Key_Up]
                         scale: 1.0
                     }
                     AxisInput {
                         sourceDevice: keyboardSourceDevice
-                        keys: [Qt.Key_Down]
+                        buttons: [Qt.Key_Down]
                         scale: -1.0
                     }
                 },
@@ -148,12 +148,12 @@ Entity {
                     id: tyAxis
                     AxisInput {
                         sourceDevice: keyboardSourceDevice
-                        keys: [Qt.Key_PageUp]
+                        buttons: [Qt.Key_PageUp]
                         scale: 1.0
                     }
                     AxisInput {
                         sourceDevice: keyboardSourceDevice
-                        keys: [Qt.Key_PageDown]
+                        buttons: [Qt.Key_PageDown]
                         scale: -1.0
                     }
                 }
diff --git a/examples/qt3d/examples-common/qfirstpersoncameracontroller.cpp b/examples/qt3d/examples-common/qfirstpersoncameracontroller.cpp
index dd12ec344..049c577c7 100644
--- a/examples/qt3d/examples-common/qfirstpersoncameracontroller.cpp
+++ b/examples/qt3d/examples-common/qfirstpersoncameracontroller.cpp
@@ -99,12 +99,12 @@ void QFirstPersonCameraControllerPrivate::init()
     //// Actions
 
     // Left Mouse Button Action
-    m_leftMouseButtonInput->setKeys(QVariantList() << QMouseController::Left);
+    m_leftMouseButtonInput->setButtons(QVariantList() << QMouseController::Left);
     m_leftMouseButtonInput->setSourceDevice(m_mouseController);
     m_leftMouseButtonAction->addInput(m_leftMouseButtonInput);
 
     // Fine Motion Action
-    m_fineMotionKeyInput->setKeys(QVariantList() << Qt::Key_Shift);
+    m_fineMotionKeyInput->setButtons(QVariantList() << Qt::Key_Shift);
     m_fineMotionKeyInput->setSourceDevice(m_keyboardController);
     m_fineMotionAction->addInput(m_fineMotionKeyInput);
 
@@ -121,37 +121,37 @@ void QFirstPersonCameraControllerPrivate::init()
     m_ryAxis->addInput(m_mouseRyInput);
 
     // Keyboard Pos Tx
-    m_keyboardTxPosInput->setKeys(QVariantList() << Qt::Key_Right);
+    m_keyboardTxPosInput->setButtons(QVariantList() << Qt::Key_Right);
     m_keyboardTxPosInput->setScale(1.0f);
     m_keyboardTxPosInput->setSourceDevice(m_keyboardController);
     m_txAxis->addInput(m_keyboardTxPosInput);
 
     // Keyboard Pos Ty
-    m_keyboardTyPosInput->setKeys(QVariantList() << Qt::Key_PageUp);
+    m_keyboardTyPosInput->setButtons(QVariantList() << Qt::Key_PageUp);
     m_keyboardTyPosInput->setScale(1.0f);
     m_keyboardTyPosInput->setSourceDevice(m_keyboardController);
     m_tyAxis->addInput(m_keyboardTyPosInput);
 
     // Keyboard Pos Tz
-    m_keyboardTzPosInput->setKeys(QVariantList() << Qt::Key_Up);
+    m_keyboardTzPosInput->setButtons(QVariantList() << Qt::Key_Up);
     m_keyboardTzPosInput->setScale(1.0f);
     m_keyboardTzPosInput->setSourceDevice(m_keyboardController);
     m_tzAxis->addInput(m_keyboardTzPosInput);
 
     // Keyboard Neg Tx
-    m_keyboardTxNegInput->setKeys(QVariantList() << Qt::Key_Left);
+    m_keyboardTxNegInput->setButtons(QVariantList() << Qt::Key_Left);
     m_keyboardTxNegInput->setScale(-1.0f);
     m_keyboardTxNegInput->setSourceDevice(m_keyboardController);
     m_txAxis->addInput(m_keyboardTxNegInput);
 
     // Keyboard Neg Ty
-    m_keyboardTyNegInput->setKeys(QVariantList() << Qt::Key_PageDown);
+    m_keyboardTyNegInput->setButtons(QVariantList() << Qt::Key_PageDown);
     m_keyboardTyNegInput->setScale(-1.0f);
     m_keyboardTyNegInput->setSourceDevice(m_keyboardController);
     m_tyAxis->addInput(m_keyboardTyNegInput);
 
     // Keyboard Neg Tz
-    m_keyboardTzNegInput->setKeys(QVariantList() << Qt::Key_Down);
+    m_keyboardTzNegInput->setButtons(QVariantList() << Qt::Key_Down);
     m_keyboardTzNegInput->setScale(-1.0f);
     m_keyboardTzNegInput->setSourceDevice(m_keyboardController);
     m_tzAxis->addInput(m_keyboardTzNegInput);
diff --git a/examples/qt3d/simple-qml/CameraController.qml b/examples/qt3d/simple-qml/CameraController.qml
index 086c5ed7e..c00dd5ce2 100644
--- a/examples/qt3d/simple-qml/CameraController.qml
+++ b/examples/qt3d/simple-qml/CameraController.qml
@@ -93,7 +93,7 @@ Entity {
                 inputs: [
                     ActionInput {
                         sourceDevice: mouseSourceDevice
-                        keys: [MouseController.Left]
+                        buttons: [MouseController.Left]
                     }
                 ]
             },
@@ -102,7 +102,7 @@ Entity {
                 inputs: [
                     ActionInput {
                         sourceDevice: mouseSourceDevice
-                        keys: [MouseController.Right]
+                        buttons: [MouseController.Right]
                     }
                 ]
             },
@@ -111,7 +111,7 @@ Entity {
                 inputs: [
                     ActionInput {
                         sourceDevice: keyboardSourceDevice
-                        keys: [Qt.Key_Shift]
+                        buttons: [Qt.Key_Shift]
                     }
                 ]
             }
@@ -144,12 +144,12 @@ Entity {
                 inputs: [
                     AxisInput {
                         sourceDevice: keyboardSourceDevice
-                        keys: [Qt.Key_Left]
+                        buttons: [Qt.Key_Left]
                         scale: -1.0
                     },
                     AxisInput {
                         sourceDevice: keyboardSourceDevice
-                        keys: [Qt.Key_Right]
+                        buttons: [Qt.Key_Right]
                         scale: 1.0
                     }
                 ]
@@ -159,12 +159,12 @@ Entity {
                 inputs: [
                     AxisInput {
                         sourceDevice: keyboardSourceDevice
-                        keys: [Qt.Key_Up]
+                        buttons: [Qt.Key_Up]
                         scale: 1.0
                     },
                     AxisInput {
                         sourceDevice: keyboardSourceDevice
-                        keys: [Qt.Key_Down]
+                        buttons: [Qt.Key_Down]
                         scale: -1.0
                     }
                 ]
@@ -174,12 +174,12 @@ Entity {
                 inputs: [
                     AxisInput {
                         sourceDevice: keyboardSourceDevice
-                        keys: [Qt.Key_PageUp]
+                        buttons: [Qt.Key_PageUp]
                         scale: 1.0
                     },
                     AxisInput {
                         sourceDevice: keyboardSourceDevice
-                        keys: [Qt.Key_PageDown]
+                        buttons: [Qt.Key_PageDown]
                         scale: -1.0
                     }
                 ]