Change namespace

Change-Id: I53e86f988f14a4e5748c1a13599461effb8d8462
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

5 files changed, 44 insertions, 24 deletions

diff --git a/src/quick3d/quick3drender/scene2d/qscene2d.cpp b/src/quick3d/quick3drender/scene2d/qscene2d.cpp
index 62e766684..5c20db184 100644
--- a/src/quick3d/quick3drender/scene2d/qscene2d.cpp
+++ b/src/quick3d/quick3drender/scene2d/qscene2d.cpp
@@ -47,6 +47,7 @@ using namespace Qt3DCore;
 
 namespace Qt3DRender {
 
+namespace Quick {
 
 /*!
     \class Qt3DRender::QScene2D
@@ -616,6 +617,8 @@ void QScene2D::sourceLoaded()
     emit loadedChanged(true);
 }
 
+} // namespace Quick
+
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/quick3d/quick3drender/scene2d/qscene2d.h b/src/quick3d/quick3drender/scene2d/qscene2d.h
index 18e65a5ca..a00e7b06b 100644
--- a/src/quick3d/quick3drender/scene2d/qscene2d.h
+++ b/src/quick3d/quick3drender/scene2d/qscene2d.h
@@ -34,23 +34,25 @@
 **
 ****************************************************************************/
 
-#ifndef QT3DRENDER_QSCENE2D_H
-#define QT3DRENDER_QSCENE2D_H
+#ifndef QT3DRENDER_QUICK3DRENDER_QSCENE2D_H
+#define QT3DRENDER_QUICK3DRENDER_QSCENE2D_H
 
 #include <QtCore/QUrl>
 #include <QtCore/QEvent>
 
 #include <Qt3DRender/qframegraphnode.h>
 #include <Qt3DRender/qabstracttexture.h>
-#include <Qt3DRender/qt3drender_global.h>
+#include <Qt3DQuickRender/qt3dquickrender_global.h>
 
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
 
+namespace Quick {
+
 class QScene2DPrivate;
 
-class QT3DRENDERSHARED_EXPORT QScene2D : public Qt3DRender::QFrameGraphNode
+class QT3DQUICKRENDERSHARED_EXPORT QScene2D : public Qt3DRender::QFrameGraphNode
 {
     Q_OBJECT
 
@@ -89,8 +91,9 @@ private:
     void sourceLoaded();
 };
 
+} // namespace Quick
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3DRENDER_QSCENE2D_H
+#endif // QT3DRENDER_QUICK3DRENDER_QSCENE2D_H
diff --git a/src/quick3d/quick3drender/scene2d/qscene2d_p.h b/src/quick3d/quick3drender/scene2d/qscene2d_p.h
index 1020c1264..165a54b72 100644
--- a/src/quick3d/quick3drender/scene2d/qscene2d_p.h
+++ b/src/quick3d/quick3drender/scene2d/qscene2d_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3DRENDER_QSCENE2D_P_H
-#define QT3DRENDER_QSCENE2D_P_H
+#ifndef QT3DRENDER_QUICK3DRENDER_QSCENE2D_P_H
+#define QT3DRENDER_QUICK3DRENDER_QSCENE2D_P_H
 
 //
 //  W A R N I N G
@@ -51,7 +51,7 @@
 #include <private/qobject_p.h>
 #include <private/qframegraphnode_p.h>
 
-#include <Qt3DRender/qscene2d.h>
+#include <Qt3DQuickRender/qscene2d.h>
 #include <Qt3DRender/QAbstractTexture>
 
 #include <QtQml/QQmlEngine>
@@ -68,6 +68,8 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
 
+namespace Quick {
+
 class QScene2D;
 class Scene2DManager;
 
@@ -203,9 +205,10 @@ public:
     void cleanup();
 };
 
+} // namespace Quick
 
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3DRENDER_QSCENE2D_P_H
+#endif // QT3DRENDER_QUICK3DRENDER_QSCENE2D_P_H
diff --git a/src/quick3d/quick3drender/scene2d/scene2d.cpp b/src/quick3d/quick3drender/scene2d/scene2d.cpp
index edf4fd643..210cc5f0f 100644
--- a/src/quick3d/quick3drender/scene2d/scene2d.cpp
+++ b/src/quick3d/quick3drender/scene2d/scene2d.cpp
@@ -34,20 +34,26 @@
 **
 ****************************************************************************/
 
-#include <Qt3DRender/qscene2d.h>
-#include <Qt3DRender/private/qscene2d_p.h>
-#include <Qt3DRender/private/scene2d_p.h>
-#include <Qt3DRender/private/graphicscontext_p.h>
-#include <Qt3DRender/private/texture_p.h>
-#include <Qt3DRender/private/nodemanagers_p.h>
 #include <Qt3DCore/qpropertyupdatedchange.h>
+#include <Qt3DQuickRender/qscene2d.h>
+
+#include <private/qscene2d_p.h>
+#include <private/scene2d_p.h>
+#include <private/graphicscontext_p.h>
+#include <private/texture_p.h>
+#include <private/nodemanagers_p.h>
+
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt3DRender::Quick;
+
 namespace Qt3DRender {
 
 namespace Render {
 
+namespace Quick {
+
 RenderQmlEventHandler::RenderQmlEventHandler(Scene2D *node)
     : QObject()
     , m_node(node)
@@ -165,7 +171,7 @@ void Scene2D::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
     FrameGraphNode::sceneChangeEvent(e);
 }
 
-void Scene2D::setSharedObject(Qt3DRender::Scene2DSharedObjectPtr sharedObject)
+void Scene2D::setSharedObject(Qt3DRender::Quick::Scene2DSharedObjectPtr sharedObject)
 {
     m_sharedObject = sharedObject;
 }
@@ -296,6 +302,8 @@ void Scene2D::cleanup()
     }
 }
 
+} // namespace Quick
+
 } // namespace Render
 
 } // namespace Qt3DRender
diff --git a/src/quick3d/quick3drender/scene2d/scene2d_p.h b/src/quick3d/quick3drender/scene2d/scene2d_p.h
index f6e3f8903..950ddaa5b 100644
--- a/src/quick3d/quick3drender/scene2d/scene2d_p.h
+++ b/src/quick3d/quick3drender/scene2d/scene2d_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3DRENDER_RENDER_SCENE2D_P_H
-#define QT3DRENDER_RENDER_SCENE2D_P_H
+#ifndef QT3DRENDER_RENDER_QUICK_SCENE2D_P_H
+#define QT3DRENDER_RENDER_QUICK_SCENE2D_P_H
 
 //
 //  W A R N I N G
@@ -50,8 +50,8 @@
 
 #include <Qt3DCore/qnodeid.h>
 
-#include <Qt3DRender/private/framegraphnode_p.h>
-#include <Qt3DRender/private/qscene2d_p.h>
+#include <private/framegraphnode_p.h>
+#include <private/qscene2d_p.h>
 
 #include <QtCore/QCoreApplication>
 #include <QtCore/QSemaphore>
@@ -63,6 +63,9 @@ namespace Qt3DRender {
 namespace Render {
 
 class GraphicsContext;
+
+namespace Quick {
+
 class Scene2D;
 
 class RenderQmlEventHandler : public QObject
@@ -85,7 +88,7 @@ public:
     void attach();
     void render();
     void initializeRender();
-    void setSharedObject(Scene2DSharedObjectPtr sharedObject);
+    void setSharedObject(Qt3DRender::Quick::Scene2DSharedObjectPtr sharedObject);
     void cleanup();
     void setTexture(Qt3DCore::QNodeId textureId);
     void checkInitialized();
@@ -97,7 +100,7 @@ public:
     GraphicsContext *m_graphicsContext;
     QThread *m_renderThread;
     Qt3DCore::QNodeId m_textureId;
-    QSharedPointer<Scene2DSharedObject> m_sharedObject;
+    QSharedPointer<Qt3DRender::Quick::Scene2DSharedObject> m_sharedObject;
     AttachmentPack m_attachments;
     Texture *m_texture;
 
@@ -106,10 +109,10 @@ public:
     bool m_renderOnce;
 };
 
+} // Quick
 } // Render
-
 } // Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3DRENDER_RENDER_SCENE2D_P_H
+#endif // QT3DRENDER_RENDER_QUICK_SCENE2D_P_H