QAxisInput/QActionInput: use list of int rather than int mask

Needed to allow devices like keyboards which have more than 64 keys

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

4 files changed, 12 insertions, 14 deletions

diff --git a/src/input/frontend/qactioninput.cpp b/src/input/frontend/qactioninput.cpp
index 54531df06..dd0773dc8 100644
--- a/src/input/frontend/qactioninput.cpp
+++ b/src/input/frontend/qactioninput.cpp
@@ -46,11 +46,10 @@ class QActionInputPrivate : public Qt3DCore::QNodePrivate
 public:
     QActionInputPrivate()
         : Qt3DCore::QNodePrivate()
-        , m_keys(0)
         , m_sourceDevice(Q_NULLPTR)
     {}
 
-    int m_keys;
+    QVariantList m_keys;
     QAbstractPhysicalDevice *m_sourceDevice;
 };
 
@@ -64,7 +63,7 @@ QActionInput::~QActionInput()
     QNode::cleanup();
 }
 
-int QActionInput::keys() const
+QVariantList QActionInput::keys() const
 {
     Q_D(const QActionInput);
     return d->m_keys;
@@ -91,7 +90,7 @@ QAbstractPhysicalDevice *QActionInput::sourceDevice() const
     return d->m_sourceDevice;
 }
 
-void QActionInput::setKeys(int keys)
+void QActionInput::setKeys(const QVariantList &keys)
 {
     Q_D(QActionInput);
     if (d->m_keys != keys) {
diff --git a/src/input/frontend/qactioninput.h b/src/input/frontend/qactioninput.h
index 537e7e1e0..37e9c7957 100644
--- a/src/input/frontend/qactioninput.h
+++ b/src/input/frontend/qactioninput.h
@@ -51,7 +51,7 @@ class QT3DINPUTSHARED_EXPORT QActionInput : public Qt3DCore::QNode
 {
     Q_OBJECT
     Q_PROPERTY(Qt3DInput::QAbstractPhysicalDevice *sourceDevice READ sourceDevice WRITE setSourceDevice NOTIFY sourceDeviceChanged)
-    Q_PROPERTY(int keys READ keys WRITE setKeys NOTIFY keysChanged)
+    Q_PROPERTY(QVariantList keys READ keys WRITE setKeys NOTIFY keysChanged)
 
 public:
     explicit QActionInput(Qt3DCore::QNode *parent = Q_NULLPTR);
@@ -60,8 +60,8 @@ public:
     void setSourceDevice(QAbstractPhysicalDevice *sourceDevice);
     QAbstractPhysicalDevice *sourceDevice() const;
 
-    void setKeys(int keys);
-    int keys() const;
+    void setKeys(const QVariantList &keys);
+    QVariantList keys() const;
 
 Q_SIGNALS:
     void sourceDeviceChanged();
diff --git a/src/input/frontend/qaxisinput.cpp b/src/input/frontend/qaxisinput.cpp
index f854286b4..35f16beb0 100644
--- a/src/input/frontend/qaxisinput.cpp
+++ b/src/input/frontend/qaxisinput.cpp
@@ -47,13 +47,12 @@ class QAxisInputPrivate : public Qt3DCore::QNodePrivate
 public:
     QAxisInputPrivate()
         : Qt3DCore::QNodePrivate()
-        , m_keys(0)
         , m_sourceDevice(Q_NULLPTR)
         , m_scale(0.0f)
         , m_axis(-1)
     {}
 
-    int m_keys;
+    QVariantList m_keys;
     QAbstractPhysicalDevice *m_sourceDevice;
     float m_scale;
     int m_axis;
@@ -119,7 +118,7 @@ int QAxisInput::axis() const
     return d->m_axis;
 }
 
-void QAxisInput::setKeys(int keys)
+void QAxisInput::setKeys(const QVariantList &keys)
 {
     Q_D(QAxisInput);
     if (keys != d->m_keys) {
@@ -128,7 +127,7 @@ void QAxisInput::setKeys(int keys)
     }
 }
 
-int QAxisInput::keys() const
+QVariantList QAxisInput::keys() const
 {
     Q_D(const QAxisInput);
     return d->m_keys;
diff --git a/src/input/frontend/qaxisinput.h b/src/input/frontend/qaxisinput.h
index 08cc8be6a..b28e85a3a 100644
--- a/src/input/frontend/qaxisinput.h
+++ b/src/input/frontend/qaxisinput.h
@@ -54,7 +54,7 @@ class QT3DINPUTSHARED_EXPORT QAxisInput : public Qt3DCore::QNode
     Q_PROPERTY(Qt3DInput::QAbstractPhysicalDevice *sourceDevice READ sourceDevice WRITE setSourceDevice NOTIFY sourceDeviceChanged)
     Q_PROPERTY(float scale READ scale WRITE setScale NOTIFY scaleChanged)
     Q_PROPERTY(int axis READ axis WRITE setAxis NOTIFY axisChanged)
-    Q_PROPERTY(int keys READ keys WRITE setKeys NOTIFY keysChanged)
+    Q_PROPERTY(QVariantList keys READ keys WRITE setKeys NOTIFY keysChanged)
 
 public:
     explicit QAxisInput(Qt3DCore::QNode *parent = Q_NULLPTR);
@@ -69,8 +69,8 @@ public:
     void setAxis(int axis);
     int axis() const;
 
-    void setKeys(int keys);
-    int keys() const;
+    void setKeys(const QVariantList &keys);
+    QVariantList keys() const;
 
 Q_SIGNALS:
     void sourceDeviceChanged();