diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2015-12-03 10:58:46 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2015-12-04 19:07:41 +0000 |
| commit | 19d8d0443bed987a997f486c70ffb9ad62bc1419 (patch) | |
| tree | 8d02f1f32f92f7c15fafe1a97eef02dbb46424a8 /src/input/frontend/qactioninput.cpp | |
| parent | c9961da49757b5d76164a5334ed1f114fffcfca0 (diff) | |
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>
Diffstat (limited to 'src/input/frontend/qactioninput.cpp')
| -rw-r--r-- | src/input/frontend/qactioninput.cpp | 7 |
1 files changed, 3 insertions, 4 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) { |