1 files changed, 12 insertions, 14 deletions
diff --git a/src/input/keyboardcontroller.cpp b/src/input/keyboardcontroller.cpp
index 0df458ed3..9e62633a5 100644
--- a/src/input/keyboardcontroller.cpp
+++ b/src/input/keyboardcontroller.cpp
@@ -41,8 +41,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
-
+namespace Qt3DInput {
 namespace Input {
 
 // TO DO: Send change to frontend when activeInput changes
@@ -53,11 +52,11 @@ KeyboardController::KeyboardController()
 {
 }
 
-void KeyboardController::updateFromPeer(QNode *)
+void KeyboardController::updateFromPeer(Qt3D::QNode *)
 {
 }
 
-void KeyboardController::requestFocusForInput(const QNodeId &inputId)
+void KeyboardController::requestFocusForInput(const Qt3D::QNodeId &inputId)
 {
     // Saves the last inputId, this will then be used in an Aspect Job to determine which
     // input will have the focus. This in turn will call KeyboardInput::setFocus which will
@@ -70,7 +69,7 @@ void KeyboardController::setInputHandler(InputHandler *handler)
     m_inputHandler = handler;
 }
 
-void KeyboardController::addKeyboardInput(const QNodeId &input)
+void KeyboardController::addKeyboardInput(const Qt3D::QNodeId &input)
 {
     if (!m_keyboardInputs.contains(input)) {
         m_keyboardInputs.append(input);
@@ -78,18 +77,18 @@ void KeyboardController::addKeyboardInput(const QNodeId &input)
     }
 }
 
-void KeyboardController::removeKeyboardInput(const QNodeId &input)
+void KeyboardController::removeKeyboardInput(const Qt3D::QNodeId &input)
 {
     m_keyboardInputs.removeAll(input);
     m_keyboardInputHandles.removeAll(m_inputHandler->keyboardInputManager()->lookupHandle(input));
 }
 
-void KeyboardController::setCurrentFocusItem(const QNodeId &input)
+void KeyboardController::setCurrentFocusItem(const Qt3D::QNodeId &input)
 {
     m_currentFocusItem = input;
 }
 
-void KeyboardController::sceneChangeEvent(const QSceneChangePtr &)
+void KeyboardController::sceneChangeEvent(const Qt3D::QSceneChangePtr &)
 {
 }
 
@@ -98,7 +97,7 @@ KeyboardControllerFunctor::KeyboardControllerFunctor(InputHandler *handler)
 {
 }
 
-QBackendNode *KeyboardControllerFunctor::create(QNode *frontend, const QBackendNodeFactory *factory) const
+Qt3D::QBackendNode *KeyboardControllerFunctor::create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const
 {
     KeyboardController *controller = m_handler->keyboardControllerManager()->getOrCreateResource(frontend->id());
     controller->setFactory(factory);
@@ -108,19 +107,18 @@ QBackendNode *KeyboardControllerFunctor::create(QNode *frontend, const QBackendN
     return controller;
 }
 
-QBackendNode *KeyboardControllerFunctor::get(const QNodeId &id) const
+Qt3D::QBackendNode *KeyboardControllerFunctor::get(const Qt3D::QNodeId &id) const
 {
     return m_handler->keyboardControllerManager()->lookupResource(id);
 }
 
-void KeyboardControllerFunctor::destroy(const QNodeId &id) const
+void KeyboardControllerFunctor::destroy(const Qt3D::QNodeId &id) const
 {
     m_handler->removeKeyboardController(m_handler->keyboardControllerManager()->lookupHandle(id));
     m_handler->keyboardControllerManager()->releaseResource(id);
 }
 
-} // Inputs
-
-} // Qt3D
+} // namespace Inputs
+} // namespace Qt3DInput
 
 QT_END_NAMESPACE