Input: Added Managers to InputHandler

Change-Id: I9d6ab0547c0eec5b26e00487d8c7f8a2005abf47
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

2 files changed, 15 insertions, 0 deletions

diff --git a/src/input/inputhandler.cpp b/src/input/inputhandler.cpp
index d8ba35358..66e99afa7 100644
--- a/src/input/inputhandler.cpp
+++ b/src/input/inputhandler.cpp
@@ -40,6 +40,7 @@
 ****************************************************************************/
 
 #include "inputhandler_p.h"
+#include "inputmanagers_p.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -47,6 +48,12 @@ namespace Qt3D {
 
 namespace Input {
 
+InputHandler::InputHandler()
+    : m_keyboardControllerManager(new KeyboardControllerManager())
+    , m_keyboardInputManager(new KeyboardInputManager())
+{
+}
+
 } // Input
 
 } // Qt3D
diff --git a/src/input/inputhandler_p.h b/src/input/inputhandler_p.h
index 0e5398b84..172f093dc 100644
--- a/src/input/inputhandler_p.h
+++ b/src/input/inputhandler_p.h
@@ -50,12 +50,20 @@ namespace Qt3D {
 
 namespace Input {
 
+class KeyboardInputManager;
+class KeyboardControllerManager;
+
 class InputHandler
 {
 public:
     InputHandler();
 
+    inline KeyboardControllerManager *keyboardControllerManager() const { return m_keyboardControllerManager; }
+    inline KeyboardInputManager *keyboardInputManager() const  { return m_keyboardInputManager; }
+
 private:
+    KeyboardControllerManager *m_keyboardControllerManager;
+    KeyboardInputManager *m_keyboardInputManager;
 
 };