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/collision/qcollisionaspect.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/collision/qcollisionaspect.h')
-rw-r--r-- | src/collision/qcollisionaspect.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/collision/qcollisionaspect.h b/src/collision/qcollisionaspect.h index 5095b18ba..36f79c68b 100644 --- a/src/collision/qcollisionaspect.h +++ b/src/collision/qcollisionaspect.h @@ -46,26 +46,26 @@ namespace Qt3DCollision { class QCollisionAspectPrivate; -class QT3DCOLLISIONSHARED_EXPORT QCollisionAspect : public Qt3D::QAbstractAspect +class QT3DCOLLISIONSHARED_EXPORT QCollisionAspect : public Qt3DCore::QAbstractAspect { Q_OBJECT public: explicit QCollisionAspect(QObject *parent = 0); - 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; protected: void registerBackendTypes(); 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 onCleanup() Q_DECL_OVERRIDE; - void visitNode(Qt3D::QNode *node); + void visitNode(Qt3DCore::QNode *node); Q_DECLARE_PRIVATE(QCollisionAspect) QCollisionAspect(QCollisionAspectPrivate &dd, QObject *parent); |