diff options
Diffstat (limited to 'src/input/qkeyboardcontroller.h')
| -rw-r--r-- | src/input/qkeyboardcontroller.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/input/qkeyboardcontroller.h b/src/input/qkeyboardcontroller.h index d447ba3dc..b68faa830 100644 --- a/src/input/qkeyboardcontroller.h +++ b/src/input/qkeyboardcontroller.h @@ -34,23 +34,23 @@ ** ****************************************************************************/ -#ifndef QT3D_INPUT_QKEYBOARDCONTROLLER_H -#define QT3D_INPUT_QKEYBOARDCONTROLLER_H +#ifndef QT3DINPUT_INPUT_QKEYBOARDCONTROLLER_H +#define QT3DINPUT_INPUT_QKEYBOARDCONTROLLER_H #include <Qt3DInput/qt3dinput_global.h> #include <Qt3DCore/qnode.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DInput { class QKeyboardControllerPrivate; class QKeyboardInput; -class QT3DINPUTSHARED_EXPORT QKeyboardController : public QNode +class QT3DINPUTSHARED_EXPORT QKeyboardController : public Qt3D::QNode { Q_OBJECT - Q_PROPERTY(Qt3D::QKeyboardInput *activeInput READ activeInput NOTIFY activeInputChanged) + Q_PROPERTY(Qt3DInput::QKeyboardInput *activeInput READ activeInput NOTIFY activeInputChanged) public: explicit QKeyboardController(QNode *parent = 0); @@ -60,7 +60,7 @@ public: protected: QKeyboardController(QKeyboardControllerPrivate &dd, QNode *parent = 0); - void sceneChangeEvent(const QSceneChangePtr &change) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3D::QSceneChangePtr &change) Q_DECL_OVERRIDE; Q_SIGNALS: void activeInputChanged(); @@ -71,8 +71,8 @@ private: void setActiveInput(QKeyboardInput *activeInput); }; -} // Qt3D +} // namespace Qt3DInput QT_END_NAMESPACE -#endif // QT3D_INPUT_QKEYBOARDCONTROLLER_H +#endif // QT3DINPUT_INPUT_QKEYBOARDCONTROLLER_H |