From 7c971e0e7791ab38d7d3d8ebc25468c44cbe49c5 Mon Sep 17 00:00:00 2001 From: Sean Harmer Date: Mon, 12 Oct 2015 20:45:19 +0100 Subject: Move Qt3DCore into Qt3DCore namespace Update other aspects, tests and examples accordingly. Change-Id: Ib1bcf0bdf4f5aec4422dc0c80bfc32b27fb1a317 Reviewed-by: Paul Lemire --- src/core/aspects/qaspectmanager_p.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/core/aspects/qaspectmanager_p.h') diff --git a/src/core/aspects/qaspectmanager_p.h b/src/core/aspects/qaspectmanager_p.h index bdf8b9233..8c1e372af 100644 --- a/src/core/aspects/qaspectmanager_p.h +++ b/src/core/aspects/qaspectmanager_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QASPECTMANAGER_P_H -#define QT3D_QASPECTMANAGER_P_H +#ifndef QT3DCORE_QASPECTMANAGER_P_H +#define QT3DCORE_QASPECTMANAGER_P_H // // W A R N I N G @@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE class QSurface; -namespace Qt3D { +namespace Qt3DCore { class QNode; class QEntity; @@ -83,9 +83,9 @@ public Q_SLOTS: void initialize(); void shutdown(); - void setRootEntity(Qt3D::QEntity *root); + void setRootEntity(Qt3DCore::QEntity *root); void setData(const QVariantMap &data); - void registerAspect(Qt3D::QAbstractAspect *aspect); + void registerAspect(Qt3DCore::QAbstractAspect *aspect); QVariantMap data() const; void exec(); @@ -109,8 +109,8 @@ private: QSemaphore m_waitForEndOfExecLoop; }; -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE -#endif // QT3D_QASPECTMANAGER_P_H +#endif // QT3DCORE_QASPECTMANAGER_P_H -- cgit v1.2.3