summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Lemire <paul.lemire@kdab.com>2016-01-19 08:26:54 +0100
committerPaul Lemire <paul.lemire@kdab.com>2016-01-19 15:21:14 +0000
commit07c7869fc8ee1dad267a062fa8da62e0088797cd (patch)
treea737437e790c6edcedcc34064d03a3313290a2bd /src
parent3af2c463545eba1f7a333a0b3da21b38f41e39fc (diff)
Add InputSettings member on InputHandler
Change-Id: I33be7349d5c61554402d9373ff04547b186d2d8e Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src')
-rw-r--r--src/input/backend/inputhandler.cpp7
-rw-r--r--src/input/backend/inputhandler_p.h5
2 files changed, 12 insertions, 0 deletions
diff --git a/src/input/backend/inputhandler.cpp b/src/input/backend/inputhandler.cpp
index 8fdef2bf2..483772c8e 100644
--- a/src/input/backend/inputhandler.cpp
+++ b/src/input/backend/inputhandler.cpp
@@ -42,6 +42,7 @@
#include "keyeventdispatcherjob_p.h"
#include "mouseeventdispatcherjob_p.h"
#include <Qt3DCore/private/qeventfilterservice_p.h>
+#include "inputsettings_p.h"
QT_BEGIN_NAMESPACE
@@ -67,6 +68,7 @@ InputHandler::InputHandler()
, m_inputSequenceManager(new InputSequenceManager())
, m_logicalDeviceManager(new LogicalDeviceManager())
, m_genericPhysicalDeviceBackendNodeManager(new GenericDeviceBackendNodeManager)
+ , m_settings(Q_NULLPTR)
{
m_keyboardEventFilter->setInputHandler(this);
m_mouseEventFilter->setInputHandler(this);
@@ -220,6 +222,11 @@ void InputHandler::addInputDeviceIntegration(QInputDeviceIntegration *inputInteg
m_inputDeviceIntegrations.push_back(inputIntegration);
}
+void InputHandler::setInputSettings(InputSettings *settings)
+{
+ m_settings = settings;
+}
+
} // namespace Input
} // namespace Qt3DInput
diff --git a/src/input/backend/inputhandler_p.h b/src/input/backend/inputhandler_p.h
index 97b7da6a2..c2a8fe77f 100644
--- a/src/input/backend/inputhandler_p.h
+++ b/src/input/backend/inputhandler_p.h
@@ -83,6 +83,7 @@ class InputSequenceManager;
class LogicalDeviceManager;
class GenericPhysicalDeviceManager;
class GenericDeviceBackendNodeManager;
+class InputSettings;
class InputHandler
{
@@ -105,6 +106,7 @@ public:
inline InputSequenceManager *inputSequenceManager() const { return m_inputSequenceManager; }
inline LogicalDeviceManager *logicalDeviceManager() const { return m_logicalDeviceManager; }
inline GenericDeviceBackendNodeManager *genericDeviceBackendNodeManager() const { return m_genericPhysicalDeviceBackendNodeManager; }
+ inline InputSettings *inputSettings() const { return m_settings; }
void appendKeyEvent(const QT_PREPEND_NAMESPACE(QKeyEvent) &event);
QList<QT_PREPEND_NAMESPACE(QKeyEvent)> pendingKeyEvents();
@@ -129,6 +131,8 @@ public:
QVector<Qt3DInput::QInputDeviceIntegration *> inputDeviceIntegrations() const;
void addInputDeviceIntegration(QInputDeviceIntegration *inputIntegration);
+ void setInputSettings(InputSettings *settings);
+
private:
KeyboardControllerManager *m_keyboardControllerManager;
KeyboardInputManager *m_keyboardInputManager;
@@ -155,6 +159,7 @@ private:
LogicalDeviceManager *m_logicalDeviceManager;
GenericDeviceBackendNodeManager *m_genericPhysicalDeviceBackendNodeManager;
QVector<Qt3DInput::QInputDeviceIntegration *> m_inputDeviceIntegrations;
+ InputSettings *m_settings;
};
} // namespace Input