diff options
| author | Robert Brock <robert.brock@kdab.com> | 2016-04-29 08:18:06 +0200 |
|---|---|---|
| committer | Kevin Ottens <kevin.ottens@kdab.com> | 2016-05-02 10:26:25 +0000 |
| commit | f63397953d052dc2a35bcc0ec32eaff0ebd80f05 (patch) | |
| tree | 869d1bd567a7a8a6d399a2ecb4e6d9e561c6b557 /src/input/frontend/qinputaspect.cpp | |
| parent | 617e4c768616868a3e306668630efdfca69604d7 (diff) | |
Splitting of QAxisInput
Placed buttons and scale into a new class
named QButtonAxisInput
Change-Id: I0e8407dc361d9d6eda38973a8950f77b17119467
Task-number: QTBUG-51474
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/input/frontend/qinputaspect.cpp')
| -rw-r--r-- | src/input/frontend/qinputaspect.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/input/frontend/qinputaspect.cpp b/src/input/frontend/qinputaspect.cpp index e78b65057..0169be233 100644 --- a/src/input/frontend/qinputaspect.cpp +++ b/src/input/frontend/qinputaspect.cpp @@ -40,6 +40,7 @@ #include "qinputaspect.h" #include "qinputaspect_p.h" #include "inputhandler_p.h" +#include "buttonaxisinput_p.h" #include "keyboarddevice_p.h" #include "keyboardhandler_p.h" #include "mousedevice_p.h" @@ -64,6 +65,7 @@ #include <Qt3DInput/qaxisinput.h> #include <Qt3DInput/qaxissetting.h> #include <Qt3DInput/qactioninput.h> +#include <Qt3DInput/qbuttonaxisinput.h> #include <Qt3DInput/qinputchord.h> #include <Qt3DInput/qinputsequence.h> #include <Qt3DInput/qlogicaldevice.h> @@ -117,6 +119,7 @@ QInputAspect::QInputAspect(QObject *parent) registerBackendType<QMouseHandler>(QBackendNodeMapperPtr(new Input::MouseHandlerFunctor(d_func()->m_inputHandler.data()))); registerBackendType<QAxis>(QBackendNodeMapperPtr(new Input::InputNodeFunctor<Input::Axis, Input::AxisManager>(d_func()->m_inputHandler->axisManager()))); registerBackendType<QAxisInput>(QBackendNodeMapperPtr(new Input::InputNodeFunctor<Input::AxisInput, Input::AxisInputManager>(d_func()->m_inputHandler->axisInputManager()))); + registerBackendType<QButtonAxisInput>(QBackendNodeMapperPtr(new Input::InputNodeFunctor<Input::ButtonAxisInput, Input::ButtonAxisInputManager>(d_func()->m_inputHandler->buttonAxisInputManager()))); registerBackendType<QAxisSetting>(QBackendNodeMapperPtr(new Input::InputNodeFunctor<Input::AxisSetting, Input::AxisSettingManager>(d_func()->m_inputHandler->axisSettingManager()))); registerBackendType<Qt3DInput::QAction>(QBackendNodeMapperPtr(new Input::InputNodeFunctor<Input::Action, Input::ActionManager>(d_func()->m_inputHandler->actionManager()))); registerBackendType<QActionInput>(QBackendNodeMapperPtr(new Input::InputNodeFunctor<Input::ActionInput, Input::ActionInputManager>(d_func()->m_inputHandler->actionInputManager()))); |