Move Render aspect into the Qt3DRender namespace

Updated examples and tests accordingly.

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

20 files changed, 110 insertions, 115 deletions

diff --git a/src/render/backend/jobs/framecleanupjob.cpp b/src/render/backend/jobs/framecleanupjob.cpp
index b1d909626..91aa3bef2 100644
--- a/src/render/backend/jobs/framecleanupjob.cpp
+++ b/src/render/backend/jobs/framecleanupjob.cpp
@@ -43,8 +43,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
-
+namespace Qt3DRender {
 namespace Render {
 
 FrameCleanupJob::FrameCleanupJob(Renderer *renderer)
@@ -59,7 +58,7 @@ FrameCleanupJob::~FrameCleanupJob()
 void FrameCleanupJob::run()
 {
     // set each RenderShaderData to not need an update
-    Q_FOREACH (const QNodeId &id, RenderShaderData::updatedShaderDataList()) {
+    Q_FOREACH (const Qt3D::QNodeId &id, RenderShaderData::updatedShaderDataList()) {
         RenderShaderData *shaderData = m_renderer->shaderDataManager()->lookupResource(id);
         if (shaderData != Q_NULLPTR)
             shaderData->clearUpdate();
@@ -71,8 +70,7 @@ void FrameCleanupJob::run()
     textureDataManager->cleanup();
 }
 
-} // Render
-
-} // Qt3D
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/backend/jobs/framecleanupjob_p.h b/src/render/backend/jobs/framecleanupjob_p.h
index 5e435cdd8..f200130e8 100644
--- a/src/render/backend/jobs/framecleanupjob_p.h
+++ b/src/render/backend/jobs/framecleanupjob_p.h
@@ -34,15 +34,15 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_FRAMECLEANUPJOB_H
-#define QT3D_RENDER_FRAMECLEANUPJOB_H
+#ifndef QT3DRENDER_RENDER_FRAMECLEANUPJOB_H
+#define QT3DRENDER_RENDER_FRAMECLEANUPJOB_H
 
 #include <Qt3DCore/qaspectjob.h>
 #include <Qt3DRenderer/qt3drenderer_global.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 namespace Render {
 
@@ -64,10 +64,10 @@ private:
 
 typedef QSharedPointer<FrameCleanupJob> FrameCleanupJobPtr;
 
-} // Render
+} // namespace Render
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_FRAMECLEANUPJOB_H
+#endif // QT3DRENDER_RENDER_FRAMECLEANUPJOB_H
diff --git a/src/render/backend/jobs/framepreparationjob.cpp b/src/render/backend/jobs/framepreparationjob.cpp
index c402783cc..b573a5fdf 100644
--- a/src/render/backend/jobs/framepreparationjob.cpp
+++ b/src/render/backend/jobs/framepreparationjob.cpp
@@ -42,8 +42,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
-
+namespace Qt3DRender {
 namespace Render {
 
 FramePreparationJob::FramePreparationJob(RenderEntity *root)
@@ -64,11 +63,11 @@ void FramePreparationJob::run()
 void FramePreparationJob::parseNodeTree(RenderEntity *node)
 {
     // Initialize worldBoundingVolume if Mesh associated
-    Qt3D::Render::RenderGeometryRenderer *mesh = Q_NULLPTR;
+    Qt3DRender::Render::RenderGeometryRenderer *mesh = Q_NULLPTR;
     if ((node->localBoundingVolume()->isNull())
             && (mesh = node->renderComponent<RenderGeometryRenderer>()) != Q_NULLPTR) {
         //        if (!mesh->meshDataHandle().isNull()) {
-        //            Qt3D::QMeshData *meshData = mesh->meshData();
+        //            Qt3DRender::QMeshData *meshData = mesh->meshData();
         //            if (meshData != Q_NULLPTR) {
         //                const QAxisAlignedBoundingBox box = meshData->boundingBox();
         //                node->localBoundingVolume()->setCenter(box.center());
@@ -90,8 +89,7 @@ void FramePreparationJob::parseNodeTree(RenderEntity *node)
         parseNodeTree(child);
 }
 
-} // Render
-
-} // Qt3D
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/backend/jobs/framepreparationjob_p.h b/src/render/backend/jobs/framepreparationjob_p.h
index 3ed69ad63..5de978639 100644
--- a/src/render/backend/jobs/framepreparationjob_p.h
+++ b/src/render/backend/jobs/framepreparationjob_p.h
@@ -34,14 +34,14 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_FRAMEPREPARATIONJOB_H
-#define QT3D_RENDER_FRAMEPREPARATIONJOB_H
+#ifndef QT3DRENDER_RENDER_FRAMEPREPARATIONJOB_H
+#define QT3DRENDER_RENDER_FRAMEPREPARATIONJOB_H
 
 #include <Qt3DCore/qaspectjob.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 namespace Render {
 
@@ -65,10 +65,10 @@ private:
 
 typedef QSharedPointer<FramePreparationJob> FramePreparationJobPtr;
 
-} // Render
+} // namespace Render
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_FRAMEPREPARATIONJOB_H
+#endif // QT3DRENDER_RENDER_FRAMEPREPARATIONJOB_H
diff --git a/src/render/backend/jobs/loadbufferjob.cpp b/src/render/backend/jobs/loadbufferjob.cpp
index 8bcdf4347..278dac9ff 100644
--- a/src/render/backend/jobs/loadbufferjob.cpp
+++ b/src/render/backend/jobs/loadbufferjob.cpp
@@ -41,7 +41,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 namespace Render {
 
@@ -65,8 +65,8 @@ void LoadBufferJob::run()
     buffer->executeFunctor();
 }
 
-} // Render
+} // namespace Render
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/backend/jobs/loadbufferjob_p.h b/src/render/backend/jobs/loadbufferjob_p.h
index b8e342b90..7ad43a8a0 100644
--- a/src/render/backend/jobs/loadbufferjob_p.h
+++ b/src/render/backend/jobs/loadbufferjob_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_LOADBUFFERJOB_H
-#define QT3D_RENDER_LOADBUFFERJOB_H
+#ifndef QT3DRENDER_RENDER_LOADBUFFERJOB_H
+#define QT3DRENDER_RENDER_LOADBUFFERJOB_H
 
 #include <QSharedPointer>
 #include <Qt3DCore/qaspectjob.h>
@@ -43,7 +43,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 namespace Render {
 
@@ -65,10 +65,10 @@ protected:
 
 typedef QSharedPointer<LoadBufferJob> LoadBufferJobPtr;
 
-} // Render
+} // namespace Render
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_LOADBUFFERJOB_H
+#endif // QT3DRENDER_RENDER_LOADBUFFERJOB_H
diff --git a/src/render/backend/jobs/loadgeometryjob.cpp b/src/render/backend/jobs/loadgeometryjob.cpp
index a5efb5d00..895ac3c34 100644
--- a/src/render/backend/jobs/loadgeometryjob.cpp
+++ b/src/render/backend/jobs/loadgeometryjob.cpp
@@ -40,7 +40,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 namespace Render {
 
@@ -61,8 +61,8 @@ void LoadGeometryJob::run()
         geometryRenderer->executeFunctor();
 }
 
-} // Render
+} // namespace Render
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/backend/jobs/loadgeometryjob_p.h b/src/render/backend/jobs/loadgeometryjob_p.h
index 6203e7d8a..493b1b694 100644
--- a/src/render/backend/jobs/loadgeometryjob_p.h
+++ b/src/render/backend/jobs/loadgeometryjob_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_LOADGEOMETRYJOB_H
-#define QT3D_RENDER_LOADGEOMETRYJOB_H
+#ifndef QT3DRENDER_RENDER_LOADGEOMETRYJOB_H
+#define QT3DRENDER_RENDER_LOADGEOMETRYJOB_H
 
 #include <QSharedPointer>
 #include <Qt3DCore/qaspectjob.h>
@@ -43,13 +43,13 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 namespace Render {
 
 class Renderer;
 
-class LoadGeometryJob : public QAspectJob
+class LoadGeometryJob : public Qt3D::QAspectJob
 {
 public:
     explicit LoadGeometryJob(const HGeometryRenderer &handle);
@@ -65,10 +65,10 @@ protected:
 
 typedef QSharedPointer<LoadGeometryJob> LoadGeometryJobPtr;
 
-} // Render
+} // namespace Render
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_LOADGEOMETRYJOB_H
+#endif // QT3DRENDER_RENDER_LOADGEOMETRYJOB_H
diff --git a/src/render/backend/jobs/loadscenejob.cpp b/src/render/backend/jobs/loadscenejob.cpp
index 169804e19..bae7afcc2 100644
--- a/src/render/backend/jobs/loadscenejob.cpp
+++ b/src/render/backend/jobs/loadscenejob.cpp
@@ -42,11 +42,10 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
-
+namespace Qt3DRender {
 namespace Render {
 
-LoadSceneJob::LoadSceneJob(const QUrl &source, const QNodeId &m_sceneComponent)
+LoadSceneJob::LoadSceneJob(const QUrl &source, const Qt3D::QNodeId &m_sceneComponent)
     : QAspectJob()
     , m_renderer(Q_NULLPTR)
     , m_source(source)
@@ -56,7 +55,7 @@ LoadSceneJob::LoadSceneJob(const QUrl &source, const QNodeId &m_sceneComponent)
 
 void LoadSceneJob::run()
 {
-    QEntity *sceneTree = m_renderer->sceneManager()->sceneTreeFromSource(m_source);
+    Qt3D::QEntity *sceneTree = m_renderer->sceneManager()->sceneTreeFromSource(m_source);
     if (sceneTree == Q_NULLPTR) {
         Q_FOREACH (AbstractSceneParser *parser, m_renderer->sceneParsers()) {
             if (parser->isExtensionSupported(m_source)) {
@@ -71,8 +70,7 @@ void LoadSceneJob::run()
     scene->setSceneSubtree(sceneTree);
 }
 
-} // Render
-
-} // Qt3D
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/backend/jobs/loadscenejob_p.h b/src/render/backend/jobs/loadscenejob_p.h
index 1497f7c9f..d4831d7ed 100644
--- a/src/render/backend/jobs/loadscenejob_p.h
+++ b/src/render/backend/jobs/loadscenejob_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_LOADSCENEJOB_H
-#define QT3D_RENDER_LOADSCENEJOB_H
+#ifndef QT3DRENDER_RENDER_LOADSCENEJOB_H
+#define QT3DRENDER_RENDER_LOADSCENEJOB_H
 
 #include <Qt3DCore/qaspectjob.h>
 #include <Qt3DCore/qnodeid.h>
@@ -44,7 +44,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 namespace Render {
 
@@ -53,7 +53,7 @@ class Renderer;
 class LoadSceneJob : public Qt3D::QAspectJob
 {
 public:
-    explicit LoadSceneJob(const QUrl &source, const QNodeId &sceneComponent);
+    explicit LoadSceneJob(const QUrl &source, const Qt3D::QNodeId &sceneComponent);
     void setRenderer(Renderer *renderer) { m_renderer = renderer; }
 
 protected:
@@ -62,14 +62,14 @@ protected:
 private:
     Renderer *m_renderer;
     QUrl m_source;
-    QNodeId m_sceneComponent;
+    Qt3D::QNodeId m_sceneComponent;
 };
 
 typedef QSharedPointer<LoadSceneJob> LoadSceneJobPtr;
 
-} // Render
+} // namespace Render
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
diff --git a/src/render/backend/jobs/loadtexturedatajob.cpp b/src/render/backend/jobs/loadtexturedatajob.cpp
index 7176f7ae2..ceb83cf53 100644
--- a/src/render/backend/jobs/loadtexturedatajob.cpp
+++ b/src/render/backend/jobs/loadtexturedatajob.cpp
@@ -42,11 +42,10 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
-
+namespace Qt3DRender {
 namespace Render {
 
-LoadTextureDataJob::LoadTextureDataJob(const QNodeId &textureId)
+LoadTextureDataJob::LoadTextureDataJob(const Qt3D::QNodeId &textureId)
     : m_textureId(textureId)
 {
 }
@@ -127,8 +126,7 @@ void LoadTextureDataJob::run()
     }
 }
 
-} // Render
-
-} // Qt3D
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/backend/jobs/loadtexturedatajob_p.h b/src/render/backend/jobs/loadtexturedatajob_p.h
index 7e3af054b..15b32c79b 100644
--- a/src/render/backend/jobs/loadtexturedatajob_p.h
+++ b/src/render/backend/jobs/loadtexturedatajob_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_LOADTEXTUREDATAJOB_H
-#define QT3D_RENDER_LOADTEXTUREDATAJOB_H
+#ifndef QT3DRENDER_RENDER_LOADTEXTUREDATAJOB_H
+#define QT3DRENDER_RENDER_LOADTEXTUREDATAJOB_H
 
 #include <Qt3DCore/qnodeid.h>
 #include <Qt3DCore/qaspectjob.h>
@@ -43,16 +43,16 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 namespace Render {
 
 class Renderer;
 
-class LoadTextureDataJob : public QAspectJob
+class LoadTextureDataJob : public Qt3D::QAspectJob
 {
 public:
-    LoadTextureDataJob(const QNodeId &textureId);
+    LoadTextureDataJob(const Qt3D::QNodeId &textureId);
     ~LoadTextureDataJob();
     inline void setRenderer(Renderer *renderer) { m_renderer = renderer; }
 
@@ -60,16 +60,16 @@ protected:
     void run() Q_DECL_FINAL;
 
 private:
-    QNodeId m_textureId;
+    Qt3D::QNodeId m_textureId;
     Renderer *m_renderer;
 };
 
 typedef QSharedPointer<LoadTextureDataJob> LoadTextureDataJobPtr;
 
-} // Render
+} // namespace Render
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_LOADTEXTUREDATAJOB_H
+#endif // QT3DRENDER_RENDER_LOADTEXTUREDATAJOB_H
diff --git a/src/render/backend/jobs/renderviewjob.cpp b/src/render/backend/jobs/renderviewjob.cpp
index 6819aed38..962bcaaa7 100644
--- a/src/render/backend/jobs/renderviewjob.cpp
+++ b/src/render/backend/jobs/renderviewjob.cpp
@@ -43,7 +43,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 namespace Render {
 
 void RenderViewJob::run()
@@ -53,7 +53,7 @@ void RenderViewJob::run()
     // Create a RenderView object
     // The RenderView are created from a QFrameAllocator stored in the current Thread local storage
 
-    QFrameAllocator *currentFrameAllocator = m_renderer->currentFrameAllocator();
+    Qt3D::QFrameAllocator *currentFrameAllocator = m_renderer->currentFrameAllocator();
     RenderView *renderView = currentFrameAllocator->allocate<RenderView>();
 
     // RenderView should allocate heap resources using only the currentFrameAllocator
@@ -77,6 +77,6 @@ void RenderViewJob::run()
 }
 
 } // namespace Render
-} // namespace Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/backend/jobs/renderviewjob_p.h b/src/render/backend/jobs/renderviewjob_p.h
index bbaa494b9..281928500 100644
--- a/src/render/backend/jobs/renderviewjob_p.h
+++ b/src/render/backend/jobs/renderviewjob_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_RENDERVIEWJOB_H
-#define QT3D_RENDER_RENDERVIEWJOB_H
+#ifndef QT3DRENDER_RENDER_RENDERVIEWJOB_H
+#define QT3DRENDER_RENDER_RENDERVIEWJOB_H
 
 #include <Qt3DCore/qaspectjob.h>
 #include <Qt3DCore/qframeallocator.h>
@@ -44,14 +44,14 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 namespace Render {
 
 class Renderer;
 class FrameGraphNode;
 
-class RenderViewJob : public QAspectJob
+class RenderViewJob : public Qt3D::QAspectJob
 {
 public:
     RenderViewJob()
@@ -88,8 +88,8 @@ private:
 typedef QSharedPointer<RenderViewJob> RenderViewJobPtr;
 
 } // namespace Render
-} // namespace Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_RENDERVIEWJOB_H
+#endif // QT3DRENDER_RENDER_RENDERVIEWJOB_H
diff --git a/src/render/backend/jobs/renderviewjobutils.cpp b/src/render/backend/jobs/renderviewjobutils.cpp
index 3cbb07d69..c4b2168f1 100644
--- a/src/render/backend/jobs/renderviewjobutils.cpp
+++ b/src/render/backend/jobs/renderviewjobutils.cpp
@@ -60,7 +60,9 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+using namespace Qt3D;
+
+namespace Qt3DRender {
 namespace Render {
 
 /*!
@@ -322,7 +324,7 @@ ParameterInfoList::iterator findParamInfo(ParameterInfoList *params, const QStri
 }
 
 void addParametersForIds(ParameterInfoList *params, ParameterManager *manager,
-                                const QList<QNodeId> &parameterIds)
+                                const QList<Qt3D::QNodeId> &parameterIds)
 {
     Q_FOREACH (const QNodeId &paramId, parameterIds) {
         RenderParameter *param = manager->lookupResource(paramId);
@@ -434,6 +436,6 @@ void UniformBlockValueBuilder::buildActiveUniformNameValueMapStructHelper(Render
 }
 
 } // namespace Render
-} // namespace Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/backend/jobs/renderviewjobutils_p.h b/src/render/backend/jobs/renderviewjobutils_p.h
index 6ac2c6b75..78ba67ff3 100644
--- a/src/render/backend/jobs/renderviewjobutils_p.h
+++ b/src/render/backend/jobs/renderviewjobutils_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDERVIEWJOBUTILS_P_H
-#define QT3D_RENDERVIEWJOBUTILS_P_H
+#ifndef QT3DRENDER_RENDERVIEWJOBUTILS_P_H
+#define QT3DRENDER_RENDERVIEWJOBUTILS_P_H
 
 #include <Qt3DRenderer/qt3drenderer_global.h>
 #include <Qt3DCore/qnodeid.h>
@@ -45,9 +45,10 @@
 QT_BEGIN_NAMESPACE
 
 namespace Qt3D {
-
 class QFrameAllocator;
+}
 
+namespace Qt3DRender {
 namespace Render {
 
 class FrameGraphNode;
@@ -102,7 +103,7 @@ Q_AUTOTEST_EXPORT void parametersFromMaterialEffectTechnique(ParameterInfoList *
                                                              RenderTechnique *technique);
 
 Q_AUTOTEST_EXPORT void addParametersForIds(ParameterInfoList *params, ParameterManager *manager,
-                                           const QList<QNodeId> &parameterIds);
+                                           const QList<Qt3D::QNodeId> &parameterIds);
 
 template<class T>
 void parametersFromParametersProvider(ParameterInfoList *infoList,
@@ -117,7 +118,7 @@ Q_AUTOTEST_EXPORT ParameterInfoList::iterator findParamInfo(ParameterInfoList *i
                                                             const QString &name);
 
 Q_AUTOTEST_EXPORT RenderStateSet *buildRenderStateSet(const QList<RenderState*> &states,
-                                                      QFrameAllocator *allocator);
+                                                      Qt3D::QFrameAllocator *allocator);
 
 
 struct Q_AUTOTEST_EXPORT UniformBlockValueBuilder
@@ -139,10 +140,10 @@ struct Q_AUTOTEST_EXPORT UniformBlockValueBuilder
 };
 
 } // namespace Render
-} // namespace Qt3D
+} // namespace Qt3DRender
 
-Q_DECLARE_TYPEINFO(Qt3D::Render::ParameterInfo, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(Qt3DRender::Render::ParameterInfo, Q_MOVABLE_TYPE);
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDERVIEWJOBUTILS_P_H
+#endif // QT3DRENDER_RENDERVIEWJOBUTILS_P_H
diff --git a/src/render/backend/jobs/updateboundingvolumejob.cpp b/src/render/backend/jobs/updateboundingvolumejob.cpp
index 49ddc9cc1..a346a0bee 100644
--- a/src/render/backend/jobs/updateboundingvolumejob.cpp
+++ b/src/render/backend/jobs/updateboundingvolumejob.cpp
@@ -47,14 +47,14 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 namespace Render {
 
 namespace {
 
-void expandWorldBoundingVolume(Qt3D::Render::RenderEntity *node)
+void expandWorldBoundingVolume(Qt3DRender::Render::RenderEntity *node)
 {
-    Qt3D::Render::RenderEntity *currentNode = node;
+    Qt3DRender::Render::RenderEntity *currentNode = node;
     QStack<int> childIndexStack;
     forever {
 
@@ -68,15 +68,15 @@ void expandWorldBoundingVolume(Qt3D::Render::RenderEntity *node)
             return;
 
         // Initialize parent bounding volume to be equal to that of the first child
-        Qt3D::Render::RenderEntity *parentNode = currentNode->parent();
-        Qt3D::Sphere *parentBoundingVolume = parentNode->worldBoundingVolume();
+        Qt3DRender::Render::RenderEntity *parentNode = currentNode->parent();
+        Qt3DRender::Sphere *parentBoundingVolume = parentNode->worldBoundingVolume();
         *(parentBoundingVolume) = *(currentNode->worldBoundingVolume());
 
         // Expand the parent bounding volume by each of remaining the siblings
         QVector<RenderEntity *> siblings = parentNode->children();
         const int siblingCount = siblings.count();
         for (int i = 1; i < siblingCount; ++i) {
-            Qt3D::Sphere *siblingBoundingVolume = siblings.at(i)->worldBoundingVolume();
+            Qt3DRender::Sphere *siblingBoundingVolume = siblings.at(i)->worldBoundingVolume();
             parentBoundingVolume->expandToContain(*siblingBoundingVolume);
         }
 
@@ -111,6 +111,6 @@ void UpdateBoundingVolumeJob::run()
 }
 
 } // namespace Render
-} // namespace Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/backend/jobs/updateboundingvolumejob_p.h b/src/render/backend/jobs/updateboundingvolumejob_p.h
index 52dca97c1..349ce1c13 100644
--- a/src/render/backend/jobs/updateboundingvolumejob_p.h
+++ b/src/render/backend/jobs/updateboundingvolumejob_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_UPDATEBOUNDINGVOLUMEJOB_H
-#define QT3D_RENDER_UPDATEBOUNDINGVOLUMEJOB_H
+#ifndef QT3DRENDER_RENDER_UPDATEBOUNDINGVOLUMEJOB_H
+#define QT3DRENDER_RENDER_UPDATEBOUNDINGVOLUMEJOB_H
 
 #include <Qt3DCore/qaspectjob.h>
 
@@ -43,7 +43,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 namespace Render {
 
 class RenderEntity;
@@ -63,8 +63,8 @@ private:
 typedef QSharedPointer<UpdateBoundingVolumeJob> UpdateBoundingVolumeJobPtr;
 
 } // namespace Render
-} // namespace Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_UPDATEBOUNDINGVOLUMEJOB_H
+#endif // QT3DRENDER_RENDER_UPDATEBOUNDINGVOLUMEJOB_H
diff --git a/src/render/backend/jobs/updateworldtransformjob.cpp b/src/render/backend/jobs/updateworldtransformjob.cpp
index d019bb7d6..42ead834c 100644
--- a/src/render/backend/jobs/updateworldtransformjob.cpp
+++ b/src/render/backend/jobs/updateworldtransformjob.cpp
@@ -45,12 +45,12 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 namespace Render {
 
 namespace {
 
-void updateWorldTransformAndBounds(Qt3D::Render::RenderEntity *node, const QMatrix4x4 &parentTransform)
+void updateWorldTransformAndBounds(Qt3DRender::Render::RenderEntity *node, const QMatrix4x4 &parentTransform)
 {
     QMatrix4x4 worldTransform(parentTransform);
     RenderTransform *nodeTransform = node->renderComponent<RenderTransform>();
@@ -60,7 +60,7 @@ void updateWorldTransformAndBounds(Qt3D::Render::RenderEntity *node, const QMatr
     *(node->worldTransform()) = worldTransform;
     *(node->worldBoundingVolume()) = node->localBoundingVolume()->transformed(worldTransform);
 
-    Q_FOREACH (Qt3D::Render::RenderEntity *child, node->children())
+    Q_FOREACH (Qt3DRender::Render::RenderEntity *child, node->children())
         updateWorldTransformAndBounds(child, worldTransform);
 }
 
@@ -93,6 +93,6 @@ void UpdateWorldTransformJob::run()
 }
 
 } // namespace Render
-} // namespace Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/backend/jobs/updateworldtransformjob_p.h b/src/render/backend/jobs/updateworldtransformjob_p.h
index d863ef79c..168792dfc 100644
--- a/src/render/backend/jobs/updateworldtransformjob_p.h
+++ b/src/render/backend/jobs/updateworldtransformjob_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_UPDATEWORLDTRANSFORMJOB_H
-#define QT3D_RENDER_UPDATEWORLDTRANSFORMJOB_H
+#ifndef QT3DRENDER_RENDER_UPDATEWORLDTRANSFORMJOB_H
+#define QT3DRENDER_RENDER_UPDATEWORLDTRANSFORMJOB_H
 
 #include <Qt3DCore/qaspectjob.h>
 
@@ -43,12 +43,12 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 namespace Render {
 
 class RenderEntity;
 
-class UpdateWorldTransformJob : public QAspectJob
+class UpdateWorldTransformJob : public Qt3D::QAspectJob
 {
 public:
     explicit UpdateWorldTransformJob(RenderEntity *node);
@@ -63,8 +63,8 @@ private:
 typedef QSharedPointer<UpdateWorldTransformJob> UpdateWorldTransformJobPtr;
 
 } // namespace Render
-} // namespace Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_UPDATEWORLDTRANSFORMJOB_H
+#endif // QT3DRENDER_RENDER_UPDATEWORLDTRANSFORMJOB_H