Move Qt3DCore into Qt3DCore namespace

Update other aspects, tests and examples accordingly.

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

15 files changed, 53 insertions, 53 deletions

diff --git a/src/logic/callbackjob_p.h b/src/logic/callbackjob_p.h
index 2b73c18c5..0e8cb2996 100644
--- a/src/logic/callbackjob_p.h
+++ b/src/logic/callbackjob_p.h
@@ -57,7 +57,7 @@ namespace Logic {
 
 class Manager;
 
-class CallbackJob : public Qt3D::QAspectJob
+class CallbackJob : public Qt3DCore::QAspectJob
 {
 public:
     CallbackJob();
@@ -70,7 +70,7 @@ private:
 };
 
 } // namespace Logic
-} // namespace Qt3D
+} // namespace Qt3DLogic
 
 QT_END_NAMESPACE
 
diff --git a/src/logic/executor.cpp b/src/logic/executor.cpp
index a14e8d201..95de46f0e 100644
--- a/src/logic/executor.cpp
+++ b/src/logic/executor.cpp
@@ -42,7 +42,7 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 
 namespace Qt3DLogic {
 namespace Logic {
@@ -63,7 +63,7 @@ void Executor::clearQueueAndProceed()
         m_semaphore->release();
 }
 
-void Executor::enqueueLogicFrameUpdates(const QVector<Qt3D::QNodeId> &nodeIds)
+void Executor::enqueueLogicFrameUpdates(const QVector<Qt3DCore::QNodeId> &nodeIds)
 {
     m_nodeIds = nodeIds;
 }
@@ -99,6 +99,6 @@ void Executor::processLogicFrameUpdates()
 }
 
 } // namespace Logic
-} // namespace Qt3D
+} // namespace Qt3DLogic
 
 QT_END_NAMESPACE
diff --git a/src/logic/executor_p.h b/src/logic/executor_p.h
index fbfab79c7..ec48a3e38 100644
--- a/src/logic/executor_p.h
+++ b/src/logic/executor_p.h
@@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE
 
 class QSemaphore;
 
-namespace Qt3D {
+namespace Qt3DCore {
 class QScene;
 }
 
@@ -77,25 +77,25 @@ class Executor : public QObject
 public:
     explicit Executor(QObject *parent = 0);
 
-    void setScene(Qt3D::QScene *scene) { m_scene = scene; }
+    void setScene(Qt3DCore::QScene *scene) { m_scene = scene; }
     void setSemephore(QSemaphore *semaphore) { m_semaphore = semaphore; }
     void clearQueueAndProceed();
 
 public Q_SLOTS:
-    void enqueueLogicFrameUpdates(const QVector<Qt3D::QNodeId> &nodeIds);
+    void enqueueLogicFrameUpdates(const QVector<Qt3DCore::QNodeId> &nodeIds);
 
 protected:
     bool event(QEvent *e);
     void processLogicFrameUpdates();
 
 private:
-    QVector<Qt3D::QNodeId> m_nodeIds;
-    Qt3D::QScene *m_scene;
+    QVector<Qt3DCore::QNodeId> m_nodeIds;
+    Qt3DCore::QScene *m_scene;
     QSemaphore *m_semaphore;
 };
 
 } // namespace Logic
-} // namespace Qt3D
+} // namespace Qt3DLogic
 
 QT_END_NAMESPACE
 
diff --git a/src/logic/handle_types_p.h b/src/logic/handle_types_p.h
index a0186c186..94eb05aa2 100644
--- a/src/logic/handle_types_p.h
+++ b/src/logic/handle_types_p.h
@@ -56,10 +56,10 @@ namespace Qt3DLogic {
 namespace Logic {
 
 class Handler;
-typedef Qt3D::QHandle<Handler, 16> HHandler;
+typedef Qt3DCore::QHandle<Handler, 16> HHandler;
 
 } // namespace Logic
-} // namespace Qt3D
+} // namespace Qt3DLogic
 
 QT_END_NAMESPACE
 
diff --git a/src/logic/handler.cpp b/src/logic/handler.cpp
index d5a94b0e8..81a4645e4 100644
--- a/src/logic/handler.cpp
+++ b/src/logic/handler.cpp
@@ -49,12 +49,12 @@ Handler::Handler()
 {
 }
 
-void Handler::updateFromPeer(Qt3D::QNode *peer)
+void Handler::updateFromPeer(Qt3DCore::QNode *peer)
 {
     Q_UNUSED(peer);
 }
 
-void Handler::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
+void Handler::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
 {
     Q_UNUSED(e);
 }
@@ -64,7 +64,7 @@ HandlerFunctor::HandlerFunctor(Manager *manager)
 {
 }
 
-Qt3D::QBackendNode *HandlerFunctor::create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const
+Qt3DCore::QBackendNode *HandlerFunctor::create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const
 {
     Handler *handler = m_manager->logicHandlerManager()->getOrCreateResource(frontend->id());
     handler->setFactory(factory);
@@ -74,17 +74,17 @@ Qt3D::QBackendNode *HandlerFunctor::create(Qt3D::QNode *frontend, const Qt3D::QB
     return handler;
 }
 
-Qt3D::QBackendNode *HandlerFunctor::get(const Qt3D::QNodeId &id) const
+Qt3DCore::QBackendNode *HandlerFunctor::get(const Qt3DCore::QNodeId &id) const
 {
     return m_manager->logicHandlerManager()->lookupResource(id);
 }
 
-void HandlerFunctor::destroy(const Qt3D::QNodeId &id) const
+void HandlerFunctor::destroy(const Qt3DCore::QNodeId &id) const
 {
     m_manager->removeHandler(id);
 }
 
 } // namespace Logic
-} // namespace Qt3D
+} // namespace Qt3DLogic
 
 QT_END_NAMESPACE
diff --git a/src/logic/handler_p.h b/src/logic/handler_p.h
index ee82496b5..cddfc864d 100644
--- a/src/logic/handler_p.h
+++ b/src/logic/handler_p.h
@@ -59,39 +59,39 @@ namespace Logic {
 
 class Manager;
 
-class Handler : public Qt3D::QBackendNode
+class Handler : public Qt3DCore::QBackendNode
 {
 public:
     Handler();
 
-    void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE;
+    void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE;
 
     void setManager(Manager *manager) { m_logicManager = manager; }
     Manager *logicManager() const { return m_logicManager; }
 
 protected:
-    void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
 
 private:
     Manager *m_logicManager;
 };
 
 
-class HandlerFunctor : public Qt3D::QBackendNodeFunctor
+class HandlerFunctor : public Qt3DCore::QBackendNodeFunctor
 {
 public:
     explicit HandlerFunctor(Manager *handler);
 
-    Qt3D::QBackendNode *create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const Q_DECL_OVERRIDE;
-    Qt3D::QBackendNode *get(const Qt3D::QNodeId &id) const Q_DECL_OVERRIDE;
-    void destroy(const Qt3D::QNodeId &id) const Q_DECL_OVERRIDE;
+    Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const Q_DECL_OVERRIDE;
+    Qt3DCore::QBackendNode *get(const Qt3DCore::QNodeId &id) const Q_DECL_OVERRIDE;
+    void destroy(const Qt3DCore::QNodeId &id) const Q_DECL_OVERRIDE;
 
 private:
     Manager *m_manager;
 };
 
 } // namespace Logic
-} // namespace Qt3D
+} // namespace Qt3DLogic
 
 QT_END_NAMESPACE
 
diff --git a/src/logic/manager.cpp b/src/logic/manager.cpp
index 7802fc0de..e6ab804f8 100644
--- a/src/logic/manager.cpp
+++ b/src/logic/manager.cpp
@@ -73,7 +73,7 @@ void Manager::appendHandler(Handler *handler)
     m_logicComponentIds.append(handler->peerUuid());
 }
 
-void Manager::removeHandler(const Qt3D::QNodeId &id)
+void Manager::removeHandler(const Qt3DCore::QNodeId &id)
 {
     HHandler handle = m_logicHandlerManager->lookupHandle(id);
     m_logicComponentIds.removeAll(id);
diff --git a/src/logic/manager_p.h b/src/logic/manager_p.h
index 49e7ece2c..8d62a20c2 100644
--- a/src/logic/manager_p.h
+++ b/src/logic/manager_p.h
@@ -78,14 +78,14 @@ public:
     HandlerManager *logicHandlerManager() const { return m_logicHandlerManager.data(); }
 
     void appendHandler(Handler *handler);
-    void removeHandler(const Qt3D::QNodeId &id);
+    void removeHandler(const Qt3DCore::QNodeId &id);
 
     void triggerLogicFrameUpdates();
 
 private:
     QScopedPointer<HandlerManager> m_logicHandlerManager;
     QVector<HHandler> m_logicHandlers;
-    QVector<Qt3D::QNodeId> m_logicComponentIds;
+    QVector<Qt3DCore::QNodeId> m_logicComponentIds;
     QLogicAspect *m_logicAspect;
     Executor *m_executor;
     QSemaphore m_semaphore;
diff --git a/src/logic/managers_p.h b/src/logic/managers_p.h
index 33874e8b1..f25600e26 100644
--- a/src/logic/managers_p.h
+++ b/src/logic/managers_p.h
@@ -58,18 +58,18 @@ QT_BEGIN_NAMESPACE
 namespace Qt3DLogic {
 namespace Logic {
 
-class HandlerManager : public Qt3D::QResourceManager<
+class HandlerManager : public Qt3DCore::QResourceManager<
         Handler,
-        Qt3D::QNodeId,
+        Qt3DCore::QNodeId,
         16,
-        Qt3D::ArrayAllocatingPolicy>
+        Qt3DCore::ArrayAllocatingPolicy>
 {
 public:
     HandlerManager() {}
 };
 
 } // namespace Logic
-} // namespace Qt3D
+} // namespace Qt3DLogic
 
 QT_END_NAMESPACE
 
diff --git a/src/logic/qlogicaspect.cpp b/src/logic/qlogicaspect.cpp
index be94a3ac0..395c536b5 100644
--- a/src/logic/qlogicaspect.cpp
+++ b/src/logic/qlogicaspect.cpp
@@ -56,12 +56,12 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 
 namespace Qt3DLogic {
 
 /*!
-    \class Qt3D::QLogicAspectPrivate
+    \class Qt3DCore::QLogicAspectPrivate
     \internal
 */
 QLogicAspectPrivate::QLogicAspectPrivate()
@@ -109,7 +109,7 @@ QVector<QAspectJobPtr> QLogicAspect::jobsToExecute(qint64 time)
     return jobs;
 }
 
-void QLogicAspect::sceneNodeAdded(Qt3D::QSceneChangePtr &e)
+void QLogicAspect::sceneNodeAdded(Qt3DCore::QSceneChangePtr &e)
 {
     QScenePropertyChangePtr propertyChange = e.staticCast<QScenePropertyChange>();
     QNodePtr nodePtr = propertyChange->value().value<QNodePtr>();
@@ -118,7 +118,7 @@ void QLogicAspect::sceneNodeAdded(Qt3D::QSceneChangePtr &e)
     visitor.traverse(n, this, &QLogicAspect::visitNode);
 }
 
-void QLogicAspect::sceneNodeRemoved(Qt3D::QSceneChangePtr &e)
+void QLogicAspect::sceneNodeRemoved(Qt3DCore::QSceneChangePtr &e)
 {
     QScenePropertyChangePtr propertyChange = e.staticCast<QScenePropertyChange>();
     QNodePtr nodePtr = propertyChange->value().value<QNodePtr>();
@@ -126,7 +126,7 @@ void QLogicAspect::sceneNodeRemoved(Qt3D::QSceneChangePtr &e)
     QAbstractAspect::clearBackendNode(n);
 }
 
-void QLogicAspect::setRootEntity(Qt3D::QEntity *rootObject)
+void QLogicAspect::setRootEntity(Qt3DCore::QEntity *rootObject)
 {
     QNodeVisitor visitor;
     visitor.traverse(rootObject, this, &QLogicAspect::visitNode);
@@ -155,7 +155,7 @@ void QLogicAspect::onShutdown()
     d->m_executor->clearQueueAndProceed();
 }
 
-void QLogicAspect::visitNode(Qt3D::QNode *node)
+void QLogicAspect::visitNode(Qt3DCore::QNode *node)
 {
     QAbstractAspect::createBackendNode(node);
 }
diff --git a/src/logic/qlogicaspect.h b/src/logic/qlogicaspect.h
index bc8e388a1..eaf74e7a2 100644
--- a/src/logic/qlogicaspect.h
+++ b/src/logic/qlogicaspect.h
@@ -46,28 +46,28 @@ namespace Qt3DLogic {
 
 class QLogicAspectPrivate;
 
-class QT3DLOGICSHARED_EXPORT QLogicAspect : public Qt3D::QAbstractAspect
+class QT3DLOGICSHARED_EXPORT QLogicAspect : public Qt3DCore::QAbstractAspect
 {
     Q_OBJECT
 public:
     explicit QLogicAspect(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 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(QLogicAspect)
     QLogicAspect(QLogicAspectPrivate &dd, QObject *parent);
diff --git a/src/logic/qlogicaspect_p.h b/src/logic/qlogicaspect_p.h
index 63dffb616..6df90bcf6 100644
--- a/src/logic/qlogicaspect_p.h
+++ b/src/logic/qlogicaspect_p.h
@@ -61,7 +61,7 @@ class Executor;
 class Manager;
 }
 
-class QLogicAspectPrivate : public Qt3D::QAbstractAspectPrivate
+class QLogicAspectPrivate : public Qt3DCore::QAbstractAspectPrivate
 {
     QLogicAspectPrivate();
 
diff --git a/src/logic/qlogiccomponent.cpp b/src/logic/qlogiccomponent.cpp
index 006173fc7..3b2755538 100644
--- a/src/logic/qlogiccomponent.cpp
+++ b/src/logic/qlogiccomponent.cpp
@@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE
 namespace Qt3DLogic {
 
 /*!
-    \class Qt3D::QLogicComponentPrivate
+    \class Qt3DCore::QLogicComponentPrivate
     \internal
 */
 QLogicComponentPrivate::QLogicComponentPrivate()
@@ -51,7 +51,7 @@ QLogicComponentPrivate::QLogicComponentPrivate()
 }
 
 /*!
-    \class Qt3D::QLogicComponent
+    \class Qt3DCore::QLogicComponent
     \inmodule Qt3DLogic
     \since 5.5
     \brief Provides a way to have a synchronous function executed each frame.
@@ -71,7 +71,7 @@ QLogicComponentPrivate::QLogicComponentPrivate()
 /*!
     \qmltype LogicComponent
     \inqmlmodule Qt3D.Logic
-    \instantiates Qt3D::QLogicComponent
+    \instantiates Qt3DCore::QLogicComponent
     \inherits Component3D
     \since 5.5
 */
diff --git a/src/logic/qlogiccomponent.h b/src/logic/qlogiccomponent.h
index 9497d4921..500b1d85b 100644
--- a/src/logic/qlogiccomponent.h
+++ b/src/logic/qlogiccomponent.h
@@ -51,12 +51,12 @@ namespace Logic {
 class Executor;
 }
 
-class QT3DLOGICSHARED_EXPORT QLogicComponent : public Qt3D::QComponent
+class QT3DLOGICSHARED_EXPORT QLogicComponent : public Qt3DCore::QComponent
 {
     Q_OBJECT
 
 public:
-    explicit QLogicComponent(Qt3D::QNode *parent = 0);
+    explicit QLogicComponent(Qt3DCore::QNode *parent = 0);
     ~QLogicComponent();
 
 protected:
diff --git a/src/logic/qlogiccomponent_p.h b/src/logic/qlogiccomponent_p.h
index 76bdce49d..245c1b7c7 100644
--- a/src/logic/qlogiccomponent_p.h
+++ b/src/logic/qlogiccomponent_p.h
@@ -56,7 +56,7 @@ namespace Qt3DLogic {
 
 class QLogicComponent;
 
-class QLogicComponentPrivate : public Qt3D::QComponentPrivate
+class QLogicComponentPrivate : public Qt3DCore::QComponentPrivate
 {
 public:
     QLogicComponentPrivate();