Move Render aspect into the Qt3DRender namespace

Updated examples and tests accordingly.

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

1 files changed, 10 insertions, 11 deletions

diff --git a/src/render/backend/renderview_p.h b/src/render/backend/renderview_p.h
index 366030af9..127cea5e4 100644
--- a/src/render/backend/renderview_p.h
+++ b/src/render/backend/renderview_p.h
@@ -35,8 +35,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_RENDERVIEW_H
-#define QT3D_RENDER_RENDERVIEW_H
+#ifndef QT3DRENDER_RENDER_RENDERVIEW_H
+#define QT3DRENDER_RENDER_RENDERVIEW_H
 
 #include <Qt3DRenderer/qparameter.h>
 #include <Qt3DRenderer/qclearbuffer.h>
@@ -57,10 +57,9 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QRenderPass;
-class QFrameAllocator;
 
 namespace Render {
 
@@ -94,7 +93,7 @@ public:
     inline void setSurfaceSize(const QSize &size) { m_surfaceSize = size; }
     inline Renderer *renderer() const { return m_renderer; }
 
-    inline void setAllocator(QFrameAllocator *allocator)
+    inline void setAllocator(Qt3D::QFrameAllocator *allocator)
     {
         m_allocator = allocator;
         m_data = m_allocator->allocate<InnerData>();
@@ -106,7 +105,7 @@ public:
         // help cache performance during iteration
         m_data->m_viewMatrix = m_allocator->allocate<QMatrix4x4>();
     }
-    inline QFrameAllocator *allocator() const { return m_allocator; }
+    inline Qt3D::QFrameAllocator *allocator() const { return m_allocator; }
 
     inline void setRenderCamera(RenderCameraLens *renderCamera) { m_data->m_renderCamera = renderCamera; }
     inline RenderCameraLens *renderCamera() const { return m_data->m_renderCamera; }
@@ -186,7 +185,7 @@ public:
     void setRenderTargetHandle(HTarget renderTargetHandle) { m_renderTarget = renderTargetHandle; }
     HTarget renderTargetHandle() const { return m_renderTarget; }
 
-    void addSortCriteria(const QList<QNodeId> &sortMethodUid) { m_data->m_sortingCriteria.append(sortMethodUid); }
+    void addSortCriteria(const QList<Qt3D::QNodeId> &sortMethodUid) { m_data->m_sortingCriteria.append(sortMethodUid); }
 
     // Helps making the size of RenderView smaller
     // Contains all the data needed for the actual building of the RenderView
@@ -204,7 +203,7 @@ public:
         const RenderPassFilter *m_passFilter;
         QMatrix4x4 *m_viewMatrix;
         QStringList m_layers;
-        QList<QNodeId> m_sortingCriteria;
+        QList<Qt3D::QNodeId> m_sortingCriteria;
         QVector3D m_eyePos;
         UniformBlockValueBuilder m_uniformBlockBuilder;
     };
@@ -214,7 +213,7 @@ private:
 
     Renderer *m_renderer;
     QSize m_surfaceSize;
-    QFrameAllocator *m_allocator;
+    Qt3D::QFrameAllocator *m_allocator;
 
     InnerData *m_data;
 
@@ -267,8 +266,8 @@ private:
 };
 
 } // namespace Render
-} // namespace Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_RENDERVIEW_H
+#endif // QT3DRENDER_RENDER_RENDERVIEW_H