diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2015-11-27 14:35:56 +0100 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2015-11-28 08:15:14 +0000 |
| commit | 6d14e81d8e25f9d7a37579f0b0d93b2bb66d0adc (patch) | |
| tree | e07e2a262ae723be879451c3c9182c6c56b4a370 /src/input/frontend/qaxisinput.h | |
| parent | c49d1183596d6f896611804bc677ad7f103915cc (diff) | |
QActionInput/QAxisInput: add property for keys
Change-Id: Ia8cb306dfc63027d66e4e0ad58ae453ddf1ed1f3
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/input/frontend/qaxisinput.h')
| -rw-r--r-- | src/input/frontend/qaxisinput.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/input/frontend/qaxisinput.h b/src/input/frontend/qaxisinput.h index cbda7feab..3fe1b978d 100644 --- a/src/input/frontend/qaxisinput.h +++ b/src/input/frontend/qaxisinput.h @@ -40,7 +40,6 @@ #include <Qt3DInput/qt3dinput_global.h> #include <Qt3DCore/qnode.h> #include <QVector3D> -#include <QBitArray> QT_BEGIN_NAMESPACE @@ -55,6 +54,7 @@ class 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(QVariantList keys READ keys WRITE setKeys NOTIFY keysChanged) public: explicit QAxisInput(Qt3DCore::QNode *parent = Q_NULLPTR); @@ -69,15 +69,14 @@ public: void setAxis(int axis); int axis() const; - void addKey(int key); - void removeKey(int key); - QVector<int> keys() const; - QBitArray keysBitArray() const; + void setKeys(const QVariantList &keys); + QVariantList keys() const; Q_SIGNALS: void sourceDeviceChanged(); void scaleChanged(); void axisChanged(); + void keysChanged(); protected: void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; |