diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2015-12-08 09:39:22 +0000 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2015-12-09 16:55:02 +0000 |
| commit | 4fc1f58689ac91ff9e338d58e82727eb7ad7cc62 (patch) | |
| tree | 31e01637f51291df921bfb7fc13bc6687a913c0d /src/input/frontend | |
| parent | 94f3df1aacab5853d09e79596eb3bdae3aecae0a (diff) | |
Use lists of ints for axes on axis settings
Change-Id: Ie1cc4b46f7888f4e9ecdecb0b204c30703da36ee
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/input/frontend')
| -rw-r--r-- | src/input/frontend/qaxissetting.cpp | 8 | ||||
| -rw-r--r-- | src/input/frontend/qaxissetting.h | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/input/frontend/qaxissetting.cpp b/src/input/frontend/qaxissetting.cpp index eee0be04b..5590200a3 100644 --- a/src/input/frontend/qaxissetting.cpp +++ b/src/input/frontend/qaxissetting.cpp @@ -47,12 +47,12 @@ public: QAxisSettingPrivate() : Qt3DCore::QNodePrivate() , m_deadZone(0.0f) - , m_axes(0) + , m_axes() , m_filter(false) {} float m_deadZone; - int m_axes; + QVariantList m_axes; bool m_filter; }; @@ -66,7 +66,7 @@ QAxisSetting::~QAxisSetting() QNode::cleanup(); } -int QAxisSetting::axes() const +QVariantList QAxisSetting::axes() const { Q_D(const QAxisSetting); return d->m_axes; @@ -94,7 +94,7 @@ void QAxisSetting::setDeadZone(float deadZone) emit deadZoneChanged(deadZone); } -void QAxisSetting::setAxes(int axes) +void QAxisSetting::setAxes(const QVariantList &axes) { Q_D(QAxisSetting); if (d->m_axes == axes) diff --git a/src/input/frontend/qaxissetting.h b/src/input/frontend/qaxissetting.h index 1737b5bb2..8c6c2ac25 100644 --- a/src/input/frontend/qaxissetting.h +++ b/src/input/frontend/qaxissetting.h @@ -52,7 +52,7 @@ class QT3DINPUTSHARED_EXPORT QAxisSetting : public Qt3DCore::QNode { Q_OBJECT Q_PROPERTY(float deadZone READ deadZone WRITE setDeadZone NOTIFY deadZoneChanged) - Q_PROPERTY(int axes READ axes WRITE setAxes NOTIFY axesChanged) + Q_PROPERTY(QVariantList axes READ axes WRITE setAxes NOTIFY axesChanged) Q_PROPERTY(bool filter READ isFilterEnabled WRITE setFilterEnabled NOTIFY filterChanged) public: @@ -60,17 +60,17 @@ public: ~QAxisSetting(); float deadZone() const; - int axes() const; + QVariantList axes() const; bool isFilterEnabled() const; public Q_SLOTS: void setDeadZone(float deadZone); - void setAxes(int axes); + void setAxes(const QVariantList &axes); void setFilterEnabled(bool enabled); Q_SIGNALS: void deadZoneChanged(float deadZone); - void axesChanged(int axes); + void axesChanged(QVariantList axes); void filterChanged(bool filter); protected: |