Move Qt3DCore into Qt3DCore namespace

Update other aspects, tests and examples accordingly.

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

5 files changed, 27 insertions, 27 deletions

diff --git a/src/render/services/qraycastingservice.cpp b/src/render/services/qraycastingservice.cpp
index ccfbb34a6..68907b8b5 100644
--- a/src/render/services/qraycastingservice.cpp
+++ b/src/render/services/qraycastingservice.cpp
@@ -48,12 +48,12 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 
 namespace Qt3DRender {
 
-QCollisionQueryResult QRayCastingServicePrivate::collides(const Qt3D::QRay3D &ray, Qt3D::QBoundingVolumeProvider *provider,
-                                                          Qt3D::QAbstractCollisionQueryService::QueryMode mode, const Qt3D::QQueryHandle &handle)
+QCollisionQueryResult QRayCastingServicePrivate::collides(const Qt3DCore::QRay3D &ray, Qt3DCore::QBoundingVolumeProvider *provider,
+                                                          Qt3DCore::QAbstractCollisionQueryService::QueryMode mode, const Qt3DCore::QQueryHandle &handle)
 {
     Q_Q(QRayCastingService);
 
@@ -97,13 +97,13 @@ QRayCastingServicePrivate::QRayCastingServicePrivate(const QString &description,
 {
 }
 
-QRayCastingService::QRayCastingService(Qt3D::QBoundingVolumeProvider *provider)
+QRayCastingService::QRayCastingService(Qt3DCore::QBoundingVolumeProvider *provider)
     : QAbstractCollisionQueryService(*new QRayCastingServicePrivate(QStringLiteral("Collision detection service using Ray Casting"),
                                                                     provider))
 {
 }
 
-Qt3D::QQueryHandle QRayCastingService::query(const Qt3D::QRay3D &ray, QAbstractCollisionQueryService::QueryMode mode)
+Qt3DCore::QQueryHandle QRayCastingService::query(const Qt3DCore::QRay3D &ray, QAbstractCollisionQueryService::QueryMode mode)
 {
     Q_D(QRayCastingService);
 
@@ -117,14 +117,14 @@ Qt3D::QQueryHandle QRayCastingService::query(const Qt3D::QRay3D &ray, QAbstractC
     return handle;
 }
 
-Qt3D::QCollisionQueryResult QRayCastingService::fetchResult(const Qt3D::QQueryHandle &handle)
+Qt3DCore::QCollisionQueryResult QRayCastingService::fetchResult(const Qt3DCore::QQueryHandle &handle)
 {
     Q_D(QRayCastingService);
 
     return d->m_results.value(handle).result();
 }
 
-QVector<Qt3D::QCollisionQueryResult> QRayCastingService::fetchAllResults() const
+QVector<Qt3DCore::QCollisionQueryResult> QRayCastingService::fetchAllResults() const
 {
     Q_D(const QRayCastingService);
 
diff --git a/src/render/services/qraycastingservice.h b/src/render/services/qraycastingservice.h
index 0dbb93863..387b77592 100644
--- a/src/render/services/qraycastingservice.h
+++ b/src/render/services/qraycastingservice.h
@@ -43,7 +43,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 class QBoundingVolumeProvider;
 }
 
@@ -51,15 +51,15 @@ namespace Qt3DRender {
 
 class QRayCastingServicePrivate;
 
-class QT3DRENDERERSHARED_EXPORT QRayCastingService : public Qt3D::QAbstractCollisionQueryService
+class QT3DRENDERERSHARED_EXPORT QRayCastingService : public Qt3DCore::QAbstractCollisionQueryService
 {
 public:
-    explicit QRayCastingService(Qt3D::QBoundingVolumeProvider *provider);
+    explicit QRayCastingService(Qt3DCore::QBoundingVolumeProvider *provider);
 
-    Qt3D::QQueryHandle query(const Qt3D::QRay3D &ray, QueryMode mode) Q_DECL_OVERRIDE;
+    Qt3DCore::QQueryHandle query(const Qt3DCore::QRay3D &ray, QueryMode mode) Q_DECL_OVERRIDE;
 
-    Qt3D::QCollisionQueryResult fetchResult(const Qt3D::QQueryHandle &handle) Q_DECL_OVERRIDE;
-    QVector<Qt3D::QCollisionQueryResult> fetchAllResults() const Q_DECL_OVERRIDE;
+    Qt3DCore::QCollisionQueryResult fetchResult(const Qt3DCore::QQueryHandle &handle) Q_DECL_OVERRIDE;
+    QVector<Qt3DCore::QCollisionQueryResult> fetchAllResults() const Q_DECL_OVERRIDE;
 
 protected:
     QRayCastingService(QRayCastingServicePrivate &dd);
diff --git a/src/render/services/qraycastingservice_p.h b/src/render/services/qraycastingservice_p.h
index 1de070b72..95b455ee1 100644
--- a/src/render/services/qraycastingservice_p.h
+++ b/src/render/services/qraycastingservice_p.h
@@ -59,38 +59,38 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 class QBoundingVolume;
 class QBoundingVolumeProvider;
 }
 
 namespace Qt3DRender {
 
-typedef QFuture<Qt3D::QCollisionQueryResult> FutureQueryResult;
+typedef QFuture<Qt3DCore::QCollisionQueryResult> FutureQueryResult;
 
-class QRayCastingServicePrivate : public Qt3D::QAbstractCollisionQueryServicePrivate
+class QRayCastingServicePrivate : public Qt3DCore::QAbstractCollisionQueryServicePrivate
 {
 public:
-    QRayCastingServicePrivate(const QString &description, Qt3D::QBoundingVolumeProvider *provider);
+    QRayCastingServicePrivate(const QString &description, Qt3DCore::QBoundingVolumeProvider *provider);
 
-    Qt3D::QCollisionQueryResult collides(const Qt3D::QRay3D &ray,
-                                         Qt3D::QBoundingVolumeProvider *provider,
-                                         Qt3D::QAbstractCollisionQueryService::QueryMode mode,
-                                         const Qt3D::QQueryHandle &handle);
+    Qt3DCore::QCollisionQueryResult collides(const Qt3DCore::QRay3D &ray,
+                                         Qt3DCore::QBoundingVolumeProvider *provider,
+                                         Qt3DCore::QAbstractCollisionQueryService::QueryMode mode,
+                                         const Qt3DCore::QQueryHandle &handle);
 
     Q_DECLARE_PUBLIC(QRayCastingService)
 
     struct Query
     {
-        Qt3D::QQueryHandle handle;
-        Qt3D::QRay3D ray;
+        Qt3DCore::QQueryHandle handle;
+        Qt3DCore::QRay3D ray;
         QRayCastingService::QueryMode mode;
     };
 
-    QHash<Qt3D::QQueryHandle, FutureQueryResult> m_results;
+    QHash<Qt3DCore::QQueryHandle, FutureQueryResult> m_results;
     QAtomicInt m_handlesCount;
 
-    Qt3D::QBoundingVolumeProvider *m_boundingProvider;
+    Qt3DCore::QBoundingVolumeProvider *m_boundingProvider;
 };
 
 } // namespace Qt3DRender
diff --git a/src/render/services/vsyncframeadvanceservice.cpp b/src/render/services/vsyncframeadvanceservice.cpp
index 5c937e6ed..19d7e70d1 100644
--- a/src/render/services/vsyncframeadvanceservice.cpp
+++ b/src/render/services/vsyncframeadvanceservice.cpp
@@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE
 namespace Qt3DRender {
 namespace Render {
 
-class VSyncFrameAdvanceServicePrivate Q_DECL_FINAL : public Qt3D::QAbstractFrameAdvanceServicePrivate
+class VSyncFrameAdvanceServicePrivate Q_DECL_FINAL : public Qt3DCore::QAbstractFrameAdvanceServicePrivate
 {
 public:
     VSyncFrameAdvanceServicePrivate()
diff --git a/src/render/services/vsyncframeadvanceservice_p.h b/src/render/services/vsyncframeadvanceservice_p.h
index fa0d308ec..d09f74efd 100644
--- a/src/render/services/vsyncframeadvanceservice_p.h
+++ b/src/render/services/vsyncframeadvanceservice_p.h
@@ -58,7 +58,7 @@ namespace Render {
 
 class VSyncFrameAdvanceServicePrivate;
 
-class Q_AUTOTEST_EXPORT VSyncFrameAdvanceService Q_DECL_FINAL : public Qt3D::QAbstractFrameAdvanceService
+class Q_AUTOTEST_EXPORT VSyncFrameAdvanceService Q_DECL_FINAL : public Qt3DCore::QAbstractFrameAdvanceService
 {
 public:
     VSyncFrameAdvanceService();