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, 21 insertions, 21 deletions

diff --git a/tests/auto/input/axisinput/tst_axisinput.cpp b/tests/auto/input/axisinput/tst_axisinput.cpp
index cc8576786..670a29ffa 100644
--- a/tests/auto/input/axisinput/tst_axisinput.cpp
+++ b/tests/auto/input/axisinput/tst_axisinput.cpp
@@ -60,7 +60,7 @@ private Q_SLOTS:
         Qt3DInput::QAxisInput axisInput;
         TestDevice sourceDevice;
 
-        axisInput.setKeys(QVariantList() << QVariant(1 << 8));
+        axisInput.setButtons(QVariantList() << QVariant(1 << 8));
         axisInput.setAxis(327);
         axisInput.setScale(0.5f);
         axisInput.setSourceDevice(&sourceDevice);
@@ -71,7 +71,7 @@ private Q_SLOTS:
         // THEN
         QCOMPARE(backendAxisInput.peerUuid(), axisInput.id());
         QCOMPARE(backendAxisInput.isEnabled(), axisInput.isEnabled());
-        compareKeys(backendAxisInput.keys(), axisInput.keys());
+        compareKeys(backendAxisInput.buttons(), axisInput.buttons());
         QCOMPARE(backendAxisInput.axis(), axisInput.axis());
         QCOMPARE(backendAxisInput.scale(), axisInput.scale());
         QCOMPARE(backendAxisInput.sourceDevice(), sourceDevice.id());
@@ -85,7 +85,7 @@ private Q_SLOTS:
         // THEN
         QVERIFY(backendAxisInput.peerUuid().isNull());
         QCOMPARE(backendAxisInput.scale(), 0.0f);
-        QVERIFY(backendAxisInput.keys().isEmpty());
+        QVERIFY(backendAxisInput.buttons().isEmpty());
         QCOMPARE(backendAxisInput.axis(), 0);
         QCOMPARE(backendAxisInput.isEnabled(), false);
         QCOMPARE(backendAxisInput.sourceDevice(), Qt3DCore::QNodeId());
@@ -94,7 +94,7 @@ private Q_SLOTS:
         Qt3DInput::QAxisInput axisInput;
         TestDevice sourceDevice;
 
-        axisInput.setKeys(QVariantList() << QVariant(1 << 8));
+        axisInput.setButtons(QVariantList() << QVariant(1 << 8));
         axisInput.setAxis(327);
         axisInput.setScale(0.5f);
         axisInput.setSourceDevice(&sourceDevice);
@@ -106,7 +106,7 @@ private Q_SLOTS:
         // THEN
         QVERIFY(backendAxisInput.peerUuid().isNull());
         QCOMPARE(backendAxisInput.scale(), 0.0f);
-        QVERIFY(backendAxisInput.keys().isEmpty());
+        QVERIFY(backendAxisInput.buttons().isEmpty());
         QCOMPARE(backendAxisInput.axis(), 0);
         QCOMPARE(backendAxisInput.isEnabled(), false);
         QCOMPARE(backendAxisInput.sourceDevice(), Qt3DCore::QNodeId());
@@ -129,11 +129,11 @@ private Q_SLOTS:
         // WHEN
         updateChange.reset(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId()));
         updateChange->setValue(QVariantList() << QVariant(64));
-        updateChange->setPropertyName("keys");
+        updateChange->setPropertyName("buttons");
         backendAxisInput.sceneChangeEvent(updateChange);
 
         // THEN
-        compareKeys(backendAxisInput.keys(), QVariantList() << QVariant(64));
+        compareKeys(backendAxisInput.buttons(), QVariantList() << QVariant(64));
 
         // WHEN
         updateChange.reset(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId()));
diff --git a/tests/auto/input/qactioninput/tst_qactioninput.cpp b/tests/auto/input/qactioninput/tst_qactioninput.cpp
index 880bac382..0ece3055e 100644
--- a/tests/auto/input/qactioninput/tst_qactioninput.cpp
+++ b/tests/auto/input/qactioninput/tst_qactioninput.cpp
@@ -61,12 +61,12 @@ private Q_SLOTS:
         QTest::newRow("defaultConstructed") << defaultConstructed;
 
         Qt3DInput::QActionInput *actionInputWithKeys = new Qt3DInput::QActionInput();
-        actionInputWithKeys->setKeys(QVariantList() << QVariant((1 << 1) | (1 << 5)));
+        actionInputWithKeys->setButtons(QVariantList() << QVariant((1 << 1) | (1 << 5)));
         QTest::newRow("actionInputWithKeys") << actionInputWithKeys;
 
         Qt3DInput::QActionInput *actionInputWithKeysAndSourceDevice = new Qt3DInput::QActionInput();
         TestDevice *device = new TestDevice();
-        actionInputWithKeysAndSourceDevice->setKeys(QVariantList() << QVariant((1 << 1) | (1 << 5)));
+        actionInputWithKeysAndSourceDevice->setButtons(QVariantList() << QVariant((1 << 1) | (1 << 5)));
         actionInputWithKeysAndSourceDevice->setSourceDevice(device);
         QTest::newRow("actionInputWithKeysAndSourceDevice") << actionInputWithKeysAndSourceDevice;
     }
@@ -83,7 +83,7 @@ private Q_SLOTS:
         // THEN
         QVERIFY(clone != Q_NULLPTR);
         QCOMPARE(actionInput->id(), clone->id());
-        QCOMPARE(actionInput->keys(), clone->keys());
+        QCOMPARE(actionInput->buttons(), clone->buttons());
 
         if (actionInput->sourceDevice() != Q_NULLPTR) {
             QVERIFY(clone->sourceDevice() != Q_NULLPTR);
@@ -98,15 +98,15 @@ private Q_SLOTS:
         TestArbiter arbiter(actionInput.data());
 
         // WHEN
-        QVariantList keys = QVariantList() << QVariant(555);
-        actionInput->setKeys(keys);
+        QVariantList buttons = QVariantList() << QVariant(555);
+        actionInput->setButtons(buttons);
         QCoreApplication::processEvents();
 
         // THEN
         QCOMPARE(arbiter.events.size(), 1);
         Qt3DCore::QScenePropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>();
-        QCOMPARE(change->propertyName(), "keys");
-        QCOMPARE(change->value().toList(), keys);
+        QCOMPARE(change->propertyName(), "buttons");
+        QCOMPARE(change->value().toList(), buttons);
         QCOMPARE(change->type(), Qt3DCore::NodeUpdated);
 
         arbiter.events.clear();
diff --git a/tests/auto/input/qaxisinput/tst_qaxisinput.cpp b/tests/auto/input/qaxisinput/tst_qaxisinput.cpp
index 7f530af4f..dfda083fd 100644
--- a/tests/auto/input/qaxisinput/tst_qaxisinput.cpp
+++ b/tests/auto/input/qaxisinput/tst_qaxisinput.cpp
@@ -61,14 +61,14 @@ private Q_SLOTS:
         QTest::newRow("defaultConstructed") << defaultConstructed;
 
         Qt3DInput::QAxisInput *axisInputWithKeysAndAxis = new Qt3DInput::QAxisInput();
-        axisInputWithKeysAndAxis->setKeys(QVariantList() << QVariant((1 << 1) | (1 << 5)));
+        axisInputWithKeysAndAxis->setButtons(QVariantList() << QVariant((1 << 1) | (1 << 5)));
         axisInputWithKeysAndAxis->setAxis(383);
         axisInputWithKeysAndAxis->setScale(327.0f);
         QTest::newRow("axisInputWithKeys") << axisInputWithKeysAndAxis;
 
         Qt3DInput::QAxisInput *axisInputWithKeysAndSourceDevice = new Qt3DInput::QAxisInput();
         TestDevice *device = new TestDevice();
-        axisInputWithKeysAndSourceDevice->setKeys(QVariantList() << QVariant((1 << 1) | (1 << 5)));
+        axisInputWithKeysAndSourceDevice->setButtons(QVariantList() << QVariant((1 << 1) | (1 << 5)));
         axisInputWithKeysAndSourceDevice->setSourceDevice(device);
         axisInputWithKeysAndSourceDevice->setAxis(427);
         axisInputWithKeysAndAxis->setScale(355.0f);
@@ -87,7 +87,7 @@ private Q_SLOTS:
         // THEN
         QVERIFY(clone != Q_NULLPTR);
         QCOMPARE(axisInput->id(), clone->id());
-        QCOMPARE(axisInput->keys(), clone->keys());
+        QCOMPARE(axisInput->buttons(), clone->buttons());
         QCOMPARE(axisInput->axis(), clone->axis());
         QCOMPARE(axisInput->scale(), clone->scale());
 
@@ -104,15 +104,15 @@ private Q_SLOTS:
         TestArbiter arbiter(axisInput.data());
 
         // WHEN
-        QVariantList keys = QVariantList() << QVariant(555);
-        axisInput->setKeys(keys);
+        QVariantList buttons = QVariantList() << QVariant(555);
+        axisInput->setButtons(buttons);
         QCoreApplication::processEvents();
 
         // THEN
         QCOMPARE(arbiter.events.size(), 1);
         Qt3DCore::QScenePropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>();
-        QCOMPARE(change->propertyName(), "keys");
-        QCOMPARE(change->value().toList(), keys);
+        QCOMPARE(change->propertyName(), "buttons");
+        QCOMPARE(change->value().toList(), buttons);
         QCOMPARE(change->type(), Qt3DCore::NodeUpdated);
 
         arbiter.events.clear();