summaryrefslogtreecommitdiffstats
path: root/src/input/qkeyboardcontroller.cpp
diff options
context:
space:
mode:
authorSean Harmer <sean.harmer@kdab.com>2015-08-30 16:39:18 +0100
committerSean Harmer <sean.harmer@kdab.com>2015-10-13 07:15:11 +0000
commit0269afd106da5d4d999585b3bdb1332a2c01af12 (patch)
tree693efc7490d3b2fc65f6d0ca7186e65e7b481521 /src/input/qkeyboardcontroller.cpp
parent4888c951fca43515aa49919a5405baa16f1cff3d (diff)
Move Input aspect to Qt3DInput namespace
Also update examples accordingly. Change-Id: I8d19c3165899e4b7b791deb33098af4fb439f44a Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/input/qkeyboardcontroller.cpp')
-rw-r--r--src/input/qkeyboardcontroller.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/input/qkeyboardcontroller.cpp b/src/input/qkeyboardcontroller.cpp
index e6c8fcc34..23578ef03 100644
--- a/src/input/qkeyboardcontroller.cpp
+++ b/src/input/qkeyboardcontroller.cpp
@@ -42,7 +42,9 @@
QT_BEGIN_NAMESPACE
-namespace Qt3D {
+using namespace Qt3D;
+
+namespace Qt3DInput {
/*!
\class Qt3D::QKeyboardControllerPrivate
@@ -93,7 +95,7 @@ QKeyboardController::QKeyboardController(QKeyboardControllerPrivate &dd, QNode *
{
}
-void QKeyboardController::sceneChangeEvent(const QSceneChangePtr &change)
+void QKeyboardController::sceneChangeEvent(const Qt3D::QSceneChangePtr &change)
{
Q_D(QKeyboardController);
QBackendScenePropertyChangePtr e = qSharedPointerCast<QBackendScenePropertyChange>(change);
@@ -112,6 +114,6 @@ void QKeyboardController::setActiveInput(QKeyboardInput *activeInput)
}
}
-} // Qt3D
+} // namespace Qt3DInput
QT_END_NAMESPACE