diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2015-08-30 16:39:18 +0100 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2015-10-13 07:15:11 +0000 |
commit | 0269afd106da5d4d999585b3bdb1332a2c01af12 (patch) | |
tree | 693efc7490d3b2fc65f6d0ca7186e65e7b481521 /src/input/inputmanagers_p.h | |
parent | 4888c951fca43515aa49919a5405baa16f1cff3d (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/inputmanagers_p.h')
-rw-r--r-- | src/input/inputmanagers_p.h | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/src/input/inputmanagers_p.h b/src/input/inputmanagers_p.h index 928786c16..6e1341958 100644 --- a/src/input/inputmanagers_p.h +++ b/src/input/inputmanagers_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_INPUT_INPUTMANAGERS_P_H -#define QT3D_INPUT_INPUTMANAGERS_P_H +#ifndef QT3DINPUT_INPUT_INPUTMANAGERS_P_H +#define QT3DINPUT_INPUT_INPUTMANAGERS_P_H #include <QtGlobal> #include <Qt3DInput/private/handle_types_p.h> @@ -47,13 +47,12 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { - +namespace Qt3DInput { namespace Input { -class KeyboardInputManager : public QResourceManager< +class KeyboardInputManager : public Qt3D::QResourceManager< KeyboardInput, - QNodeId, + Qt3D::QNodeId, 16, Qt3D::ArrayAllocatingPolicy> { @@ -61,9 +60,9 @@ public: KeyboardInputManager() {} }; -class KeyboardControllerManager : public QResourceManager< +class KeyboardControllerManager : public Qt3D::QResourceManager< KeyboardController, - QNodeId, + Qt3D::QNodeId, 8, Qt3D::ArrayAllocatingPolicy> { @@ -71,9 +70,9 @@ public: KeyboardControllerManager() {} }; -class MouseControllerManager : public QResourceManager< +class MouseControllerManager : public Qt3D::QResourceManager< MouseController, - QNodeId, + Qt3D::QNodeId, 8, Qt3D::ArrayAllocatingPolicy> { @@ -81,9 +80,9 @@ public: MouseControllerManager() {} }; -class MouseInputManager : public QResourceManager< +class MouseInputManager : public Qt3D::QResourceManager< MouseInput, - QNodeId, + Qt3D::QNodeId, 16, Qt3D::ArrayAllocatingPolicy> { @@ -91,10 +90,9 @@ public: MouseInputManager() {} }; -} // Input - -} // Qt3D +} // namespace Input +} // namespace Qt3DInput QT_END_NAMESPACE -#endif // QT3D_INPUT_INPUTMANAGERS_P_H +#endif // QT3DINPUT_INPUT_INPUTMANAGERS_P_H |