diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2015-10-12 20:45:19 +0100 |
---|---|---|
committer | Paul Lemire <paul.lemire@kdab.com> | 2015-10-13 13:19:50 +0000 |
commit | 7c971e0e7791ab38d7d3d8ebc25468c44cbe49c5 (patch) | |
tree | 53197a9e5eb7501d6f5b497f70c25dad9c265a6f /src/input/qinputaspect.h | |
parent | 0bfd20ad3b8eb3edec8d6317af9eb5504f8c0871 (diff) |
Move Qt3DCore into Qt3DCore namespace
Update other aspects, tests and examples accordingly.
Change-Id: Ib1bcf0bdf4f5aec4422dc0c80bfc32b27fb1a317
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/input/qinputaspect.h')
-rw-r--r-- | src/input/qinputaspect.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/input/qinputaspect.h b/src/input/qinputaspect.h index e76712e83..c7ef94d5d 100644 --- a/src/input/qinputaspect.h +++ b/src/input/qinputaspect.h @@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QCamera; } @@ -50,32 +50,32 @@ namespace Qt3DInput { class QInputAspectPrivate; -class QT3DINPUTSHARED_EXPORT QInputAspect : public Qt3D::QAbstractAspect +class QT3DINPUTSHARED_EXPORT QInputAspect : public Qt3DCore::QAbstractAspect { Q_OBJECT - Q_PROPERTY(Qt3D::QCamera* camera READ camera WRITE setCamera) + Q_PROPERTY(Qt3DCore::QCamera* camera READ camera WRITE setCamera) public: explicit QInputAspect(QObject *parent = 0); - Qt3D::QCamera *camera() const; + Qt3DCore::QCamera *camera() const; public Q_SLOTS: - void setCamera(Qt3D::QCamera *camera); + void setCamera(Qt3DCore::QCamera *camera); public: - QVector<Qt3D::QAspectJobPtr> jobsToExecute(qint64 time) Q_DECL_OVERRIDE; + QVector<Qt3DCore::QAspectJobPtr> jobsToExecute(qint64 time) Q_DECL_OVERRIDE; - void sceneNodeAdded(Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; - void sceneNodeRemoved(Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; + void sceneNodeAdded(Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; + void sceneNodeRemoved(Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; private: - void setRootEntity(Qt3D::QEntity *rootObject) Q_DECL_OVERRIDE; + void setRootEntity(Qt3DCore::QEntity *rootObject) Q_DECL_OVERRIDE; void onInitialize(const QVariantMap &data) Q_DECL_OVERRIDE; void onStartup() Q_DECL_OVERRIDE; void onShutdown() Q_DECL_OVERRIDE; void onCleanup() Q_DECL_OVERRIDE; - void visitNode(Qt3D::QNode *node); + void visitNode(Qt3DCore::QNode *node); Q_DECLARE_PRIVATE(QInputAspect) }; |