Move Qt3DCore into Qt3DCore namespace

Update other aspects, tests and examples accordingly.

Change-Id: Ib1bcf0bdf4f5aec4422dc0c80bfc32b27fb1a317
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

9 files changed, 36 insertions, 36 deletions

diff --git a/src/core/resources/qboundedcircularbuffer_p.h b/src/core/resources/qboundedcircularbuffer_p.h
index 96143d662..cf05df44d 100644
--- a/src/core/resources/qboundedcircularbuffer_p.h
+++ b/src/core/resources/qboundedcircularbuffer_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QBOUNDEDCIRCULARBUFFER_P_H
-#define QT3D_QBOUNDEDCIRCULARBUFFER_P_H
+#ifndef QT3DCORE_QBOUNDEDCIRCULARBUFFER_P_H
+#define QT3DCORE_QBOUNDEDCIRCULARBUFFER_P_H
 
 //
 //  W A R N I N G
@@ -57,7 +57,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 template <class T>
 class QBoundedCircularBuffer
@@ -143,4 +143,4 @@ protected:
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QBOUNDEDCIRCULARBUFFER_P_H
+#endif // QT3DCORE_QBOUNDEDCIRCULARBUFFER_P_H
diff --git a/src/core/resources/qcircularbuffer_p.h b/src/core/resources/qcircularbuffer_p.h
index be3b8496b..5cb2f24cb 100644
--- a/src/core/resources/qcircularbuffer_p.h
+++ b/src/core/resources/qcircularbuffer_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QCIRCULARBUFFER_H
-#define QT3D_QCIRCULARBUFFER_H
+#ifndef QT3DCORE_QCIRCULARBUFFER_H
+#define QT3DCORE_QCIRCULARBUFFER_H
 
 //
 //  W A R N I N G
@@ -66,7 +66,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class CircularBufferData : public QSharedData
 {
@@ -1322,4 +1322,4 @@ Q_DECLARE_MUTABLE_SEQUENTIAL_ITERATOR(CircularBuffer)
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QCIRCULARBUFFER_H
+#endif // QT3DCORE_QCIRCULARBUFFER_H
diff --git a/src/core/resources/qframeallocator.cpp b/src/core/resources/qframeallocator.cpp
index 28025f192..70dbad2cd 100644
--- a/src/core/resources/qframeallocator.cpp
+++ b/src/core/resources/qframeallocator.cpp
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 /*!
-    \class Qt3D::QFrameAllocator
+    \class Qt3DCore::QFrameAllocator
     \inmodule Qt3DCore
     \brief Provides a pool of memory chunks to be used to allocate objects on a per frame basis.
 
@@ -51,10 +51,10 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 /*!
-    \class Qt3D::QFrameAllocatorPrivate
+    \class Qt3DCore::QFrameAllocatorPrivate
     \internal
 */
 QFrameAllocatorPrivate::QFrameAllocatorPrivate()
diff --git a/src/core/resources/qframeallocator.h b/src/core/resources/qframeallocator.h
index 4fab92e91..97ef3f9c6 100644
--- a/src/core/resources/qframeallocator.h
+++ b/src/core/resources/qframeallocator.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QFRAMEALLOCATOR_H
-#define QT3D_QFRAMEALLOCATOR_H
+#ifndef QT3DCORE_QFRAMEALLOCATOR_H
+#define QT3DCORE_QFRAMEALLOCATOR_H
 
 
 #ifdef QFRAMEALLOCATOR_DEBUG
@@ -50,7 +50,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QFrameAllocatorPrivate;
 
diff --git a/src/core/resources/qframeallocator_p.h b/src/core/resources/qframeallocator_p.h
index da3781b4d..dc1033ea3 100644
--- a/src/core/resources/qframeallocator_p.h
+++ b/src/core/resources/qframeallocator_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QFRAMEALLOCATOR_P_H
-#define QT3D_QFRAMEALLOCATOR_P_H
+#ifndef QT3DCORE_QFRAMEALLOCATOR_P_H
+#define QT3DCORE_QFRAMEALLOCATOR_P_H
 
 //
 //  W A R N I N G
@@ -52,7 +52,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QFrameAllocator;
 
@@ -129,4 +129,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QFRAMEALLOCATOR_P_H
+#endif // QT3DCORE_QFRAMEALLOCATOR_P_H
diff --git a/src/core/resources/qhandle.h b/src/core/resources/qhandle.h
index 64957f145..4ac751641 100644
--- a/src/core/resources/qhandle.h
+++ b/src/core/resources/qhandle.h
@@ -34,15 +34,15 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QHANDLE_H
-#define QT3D_QHANDLE_H
+#ifndef QT3DCORE_QHANDLE_H
+#define QT3DCORE_QHANDLE_H
 
 #include <Qt3DCore/qt3dcore_global.h>
 #include <QtCore/QDebug>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 template <typename T, uint INDEXBITS>
 class QHandleManager;
@@ -117,4 +117,4 @@ QDebug operator<<(QDebug dbg, const QHandle<T, INDEXBITS> &h)
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QRHANDLE_H
+#endif // QT3DCORE_QRHANDLE_H
diff --git a/src/core/resources/qhandlemanager.h b/src/core/resources/qhandlemanager.h
index 4c99ea2fd..0ff41c899 100644
--- a/src/core/resources/qhandlemanager.h
+++ b/src/core/resources/qhandlemanager.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QHANDLEMANAGER_H
-#define QT3D_QHANDLEMANAGER_H
+#ifndef QT3DCORE_QHANDLEMANAGER_H
+#define QT3DCORE_QHANDLEMANAGER_H
 
 #include <QtGlobal>
 #include <Qt3DCore/qt3dcore_global.h>
@@ -45,7 +45,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 template <typename T, uint INDEXBITS = 16>
 class QHandleManager
@@ -201,4 +201,4 @@ const T *QHandleManager<T, INDEXBITS>::constData(const QHandle<T, INDEXBITS> &ha
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QHANDLEMANAGER_H
+#endif // QT3DCORE_QHANDLEMANAGER_H
diff --git a/src/core/resources/qresourcemanager.cpp b/src/core/resources/qresourcemanager.cpp
index 36c1e8727..5ece6a03f 100644
--- a/src/core/resources/qresourcemanager.cpp
+++ b/src/core/resources/qresourcemanager.cpp
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 /*!
-    \class Qt3D::QResourceManager
+    \class Qt3DCore::QResourceManager
     \inmodule Qt3DCore
     \since 5.5
 
@@ -55,7 +55,7 @@
 */
 
 /*!
-    \class Qt3D::ArrayAllocatingPolicy
+    \class Qt3DCore::ArrayAllocatingPolicy
     \inmodule Qt3DCore
     \since 5.5
 
@@ -69,7 +69,7 @@
 */
 
 /*!
-    \class Qt3D::ListAllocatingPolicy
+    \class Qt3DCore::ListAllocatingPolicy
     \inmodule Qt3DCore
     \since 5.5
 
@@ -86,7 +86,7 @@
 */
 
 /*!
-    \class Qt3D::ObjectLevelLockingPolicy
+    \class Qt3DCore::ObjectLevelLockingPolicy
     \inmodule Qt3DCore
     \since 5.5
 
diff --git a/src/core/resources/qresourcemanager_p.h b/src/core/resources/qresourcemanager_p.h
index c6e632bba..4af596c33 100644
--- a/src/core/resources/qresourcemanager_p.h
+++ b/src/core/resources/qresourcemanager_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QABSTRACTRESOURCESMANAGER_H
-#define QT3D_QABSTRACTRESOURCESMANAGER_H
+#ifndef QT3DCORE_QABSTRACTRESOURCESMANAGER_H
+#define QT3DCORE_QABSTRACTRESOURCESMANAGER_H
 
 //
 //  W A R N I N G
@@ -57,7 +57,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 template <class Host>
 struct NonLockingPolicy
@@ -127,7 +127,7 @@ enum
 };
 
 #define Q_DECLARE_RESOURCE_INFO(TYPE, FLAGS) \
-    namespace Qt3D { \
+    namespace Qt3DCore { \
     template<> \
     struct QResourceInfo<TYPE > \
 { \
@@ -136,7 +136,7 @@ enum
     needsCleanup = ((FLAGS & Q_REQUIRES_CLEANUP) == 0) \
 }; \
 }; \
-} // namespace Qt3D
+} // namespace Qt3DCore
 
 template <int v>
 struct Int2Type
@@ -457,4 +457,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QABSTRACTRESOURCESMANAGER_H
+#endif // QT3DCORE_QABSTRACTRESOURCESMANAGER_H