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/qmousecontroller.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/qmousecontroller.h')
-rw-r--r-- | src/input/qmousecontroller.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/input/qmousecontroller.h b/src/input/qmousecontroller.h index 4d0e3ef04..67af9a8e9 100644 --- a/src/input/qmousecontroller.h +++ b/src/input/qmousecontroller.h @@ -34,41 +34,41 @@ ** ****************************************************************************/ -#ifndef QT3D_QMOUSECONTROLLER_H -#define QT3D_QMOUSECONTROLLER_H +#ifndef QT3DINPUT_QMOUSECONTROLLER_H +#define QT3DINPUT_QMOUSECONTROLLER_H #include <Qt3DInput/qt3dinput_global.h> #include <Qt3DCore/qnode.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DInput { class QMouseControllerPrivate; class QMouseInput; -class QT3DINPUTSHARED_EXPORT QMouseController : public QNode +class QT3DINPUTSHARED_EXPORT QMouseController : public Qt3D::QNode { Q_OBJECT public: - explicit QMouseController(QNode *parent = 0); + explicit QMouseController(Qt3D::QNode *parent = 0); protected: - QMouseController(QMouseControllerPrivate &dd, QNode *parent = 0); + QMouseController(QMouseControllerPrivate &dd, Qt3D::QNode *parent = 0); ~QMouseController(); - void sceneChangeEvent(const QSceneChangePtr &change) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3D::QSceneChangePtr &change) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QMouseController) QT3D_CLONEABLE(QMouseController) }; -} // Qt3D +} // namespace Qt3DInput QT_END_NAMESPACE -Q_DECLARE_METATYPE(Qt3D::QMouseController*) +Q_DECLARE_METATYPE(Qt3DInput::QMouseController*) -#endif // QT3D_QMOUSECONTROLLER_H +#endif // QT3DINPUT_QMOUSECONTROLLER_H |