diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2015-11-27 11:38:08 +0000 |
---|---|---|
committer | Paul Lemire <paul.lemire@kdab.com> | 2015-11-28 08:15:06 +0000 |
commit | c49d1183596d6f896611804bc677ad7f103915cc (patch) | |
tree | fe98b62691fffa250f910cdc9fdfb0f15a8ede16 /src/input/frontend/qaxisinput.h | |
parent | c2851f4297767464b16d4abac81f4d7cfb9d279f (diff) |
Start refactoring the input device plugin
The plugin will now create a QInputDeviceIntegration object which can
act as a "mini input aspect" by setting things up and creating jobs
each frame.
This will also (soon) register the frontend QAbstractPhysicalDevice
subclass with a factory on the QInputAspect to allow C++ users to create
the frontend device type.
Change-Id: I709febfe12b5fae7b6157d1192fb8720362c7622
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/input/frontend/qaxisinput.h')
-rw-r--r-- | src/input/frontend/qaxisinput.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/input/frontend/qaxisinput.h b/src/input/frontend/qaxisinput.h index 40284edb7..cbda7feab 100644 --- a/src/input/frontend/qaxisinput.h +++ b/src/input/frontend/qaxisinput.h @@ -46,13 +46,13 @@ QT_BEGIN_NAMESPACE namespace Qt3DInput { -class QAbstractInputDevice; +class QAbstractPhysicalDevice; class QAxisInputPrivate; class QAxisInput : public Qt3DCore::QNode { Q_OBJECT - Q_PROPERTY(Qt3DInput::QAbstractInputDevice *sourceDevice READ sourceDevice WRITE setSourceDevice NOTIFY sourceDeviceChanged) + 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) @@ -60,8 +60,8 @@ public: explicit QAxisInput(Qt3DCore::QNode *parent = Q_NULLPTR); ~QAxisInput(); - void setSourceDevice(QAbstractInputDevice *sourceDevice); - QAbstractInputDevice *sourceDevice() const; + void setSourceDevice(QAbstractPhysicalDevice *sourceDevice); + QAbstractPhysicalDevice *sourceDevice() const; void setScale(float scale); float scale() const; |