Move Render aspect into the Qt3DRender namespace

Updated examples and tests accordingly.

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

16 files changed, 78 insertions, 74 deletions

diff --git a/src/render/io/abstractsceneparser.cpp b/src/render/io/abstractsceneparser.cpp
index 3019e0b77..b7756f6cd 100644
--- a/src/render/io/abstractsceneparser.cpp
+++ b/src/render/io/abstractsceneparser.cpp
@@ -40,7 +40,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 AbstractSceneParser::AbstractSceneParser() : QObject(),
     m_parserStatus(Empty)
@@ -80,6 +80,6 @@ void AbstractSceneParser::logInfo(const QString &info)
     qCDebug(Render::Io) << info;
 }
 
-} // namespace Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/io/abstractsceneparser_p.h b/src/render/io/abstractsceneparser_p.h
index 7577cb738..1d12c81ff 100644
--- a/src/render/io/abstractsceneparser_p.h
+++ b/src/render/io/abstractsceneparser_p.h
@@ -46,8 +46,10 @@
 QT_BEGIN_NAMESPACE
 
 namespace Qt3D {
-
 class QEntity;
+}
+
+namespace Qt3DRender {
 
 Q_DECLARE_LOGGING_CATEGORY(SceneParsers)
 
@@ -71,8 +73,8 @@ public:
 
     virtual void setSource(const QUrl &source) = 0;
     virtual bool isExtensionSupported(const QUrl &source) const = 0;
-    virtual QEntity *scene(const QString &id = QString()) = 0;
-    virtual QEntity *node(const QString &id) = 0;
+    virtual Qt3D::QEntity *scene(const QString &id = QString()) = 0;
+    virtual Qt3D::QEntity *node(const QString &id) = 0;
 
     ParserStatus parserStatus() const;
     QStringList errors() const;
@@ -91,7 +93,7 @@ private:
     QStringList m_errors;
 };
 
-} // namespace Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
diff --git a/src/render/io/objloader.cpp b/src/render/io/objloader.cpp
index 0e7d58ea4..89c5ee672 100644
--- a/src/render/io/objloader.cpp
+++ b/src/render/io/objloader.cpp
@@ -54,9 +54,9 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
-inline uint qHash(const Qt3D::FaceIndices &faceIndices)
+inline uint qHash(const FaceIndices &faceIndices)
 {
     return faceIndices.positionIndex
             + 10 * faceIndices.texCoordIndex
@@ -429,7 +429,7 @@ void ObjLoader::center( QVector<QVector3D>& points )
     if ( points.isEmpty() )
         return;
 
-    QAxisAlignedBoundingBox bb(points);
+    Qt3D::QAxisAlignedBoundingBox bb(points);
     QVector3D center = bb.center();
 
     // Translate center of the AABB to the origin
diff --git a/src/render/io/objloader_p.h b/src/render/io/objloader_p.h
index ab9f57d43..1a2ba3d3c 100644
--- a/src/render/io/objloader_p.h
+++ b/src/render/io/objloader_p.h
@@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE
 class QString;
 class QIODevice;
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QGeometry;
 
diff --git a/src/render/io/qattribute.cpp b/src/render/io/qattribute.cpp
index 80fa9dd49..09b858128 100644
--- a/src/render/io/qattribute.cpp
+++ b/src/render/io/qattribute.cpp
@@ -45,7 +45,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 /*!
     class Qt3D::AttributePrivate
@@ -259,6 +259,6 @@ QString QAttribute::defaultTangentAttributeName()
     return QStringLiteral("vertexTangent");
 }
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/io/qattribute.h b/src/render/io/qattribute.h
index ec281973f..9106cbda9 100644
--- a/src/render/io/qattribute.h
+++ b/src/render/io/qattribute.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QATTRIBUTE_H
-#define QT3D_QATTRIBUTE_H
+#ifndef QT3DRENDER_QATTRIBUTE_H
+#define QT3DRENDER_QATTRIBUTE_H
 
 #include <Qt3DCore/qabstractattribute.h>
 #include <Qt3DRenderer/qt3drenderer_global.h>
@@ -43,17 +43,17 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QAttributePrivate;
 class QBuffer;
 
-class QT3DRENDERERSHARED_EXPORT QAttribute : public QAbstractAttribute
+class QT3DRENDERERSHARED_EXPORT QAttribute : public Qt3D::QAbstractAttribute
 {
     Q_OBJECT
 
 public:
-    explicit QAttribute(QNode *parent = 0);
+    explicit QAttribute(Qt3D::QNode *parent = 0);
     QAttribute(QBuffer *buf, DataType type, uint dataSize, int count, int offset=0, int stride = 0);
     QAttribute(QBuffer *buf, const QString &name, DataType type, uint dataSize, int count, int offset=0, int stride = 0);
     ~QAttribute();
@@ -73,15 +73,15 @@ public:
     static QString defaultTangentAttributeName();
 
 protected:
-    void copy(const QNode *ref) Q_DECL_OVERRIDE;
+    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
     QT3D_CLONEABLE(QAttribute)
     Q_DECLARE_PRIVATE(QAttribute)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QATTRIBUTE_H
+#endif // QT3DRENDER_QATTRIBUTE_H
diff --git a/src/render/io/qattribute_p.h b/src/render/io/qattribute_p.h
index bd660b1eb..0e7ef390f 100644
--- a/src/render/io/qattribute_p.h
+++ b/src/render/io/qattribute_p.h
@@ -34,26 +34,26 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QATTRIBUTE_P_H
-#define QT3D_QATTRIBUTE_P_H
+#ifndef QT3DRENDER_QATTRIBUTE_P_H
+#define QT3DRENDER_QATTRIBUTE_P_H
 
 #include <private/qabstractattribute_p.h>
 #include <Qt3DRenderer/qt3drenderer_global.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QAttribute;
 
-class QT3DRENDERERSHARED_EXPORT QAttributePrivate : public QAbstractAttributePrivate
+class QT3DRENDERERSHARED_EXPORT QAttributePrivate : public Qt3D::QAbstractAttributePrivate
 {
 public:
     QAttributePrivate();
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QATTRIBUTE_P_H
+#endif // QT3DRENDER_QATTRIBUTE_P_H
diff --git a/src/render/io/qbuffer.cpp b/src/render/io/qbuffer.cpp
index 7f28151ec..6a86f74f7 100644
--- a/src/render/io/qbuffer.cpp
+++ b/src/render/io/qbuffer.cpp
@@ -41,7 +41,9 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+using namespace Qt3D;
+
+namespace Qt3DRender {
 
 /*!
     \class Qt3D::BufferPrivate
@@ -133,6 +135,6 @@ void QBuffer::setType(QBuffer::BufferType type)
     }
 }
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/io/qbuffer.h b/src/render/io/qbuffer.h
index aad1ebcaa..d1d9f9929 100644
--- a/src/render/io/qbuffer.h
+++ b/src/render/io/qbuffer.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QBUFFER_H
-#define QT3D_QBUFFER_H
+#ifndef QT3DRENDER_QBUFFER_H
+#define QT3DRENDER_QBUFFER_H
 
 #include <Qt3DCore/qabstractbuffer.h>
 #include <Qt3DRenderer/qt3drenderer_global.h>
@@ -44,7 +44,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 GLint elementType(GLint type);
 GLint tupleSizeFromType(GLint type);
@@ -54,7 +54,7 @@ class QBufferPrivate;
 class QBufferFunctor;
 typedef QSharedPointer<QBufferFunctor> QBufferFunctorPtr;
 
-class QT3DRENDERERSHARED_EXPORT QBuffer : public QAbstractBuffer
+class QT3DRENDERERSHARED_EXPORT QBuffer : public Qt3D::QAbstractBuffer
 {
     Q_OBJECT
     Q_PROPERTY(BufferType type READ type WRITE setType NOTIFY typeChanged)
@@ -84,7 +84,7 @@ public:
     };
     Q_ENUM(UsageType)
 
-    QBuffer(BufferType ty = QBuffer::VertexBuffer, QNode *parent = 0);
+    QBuffer(BufferType ty = QBuffer::VertexBuffer, Qt3D::QNode *parent = 0);
     ~QBuffer();
 
     void setUsage(UsageType usage);
@@ -97,8 +97,8 @@ public:
     QBufferFunctorPtr bufferFunctor() const;
 
 protected:
-    QBuffer(QBufferPrivate &dd, QBuffer::BufferType ty, QNode *parent = 0);
-    void copy(const QNode *ref) Q_DECL_OVERRIDE;
+    QBuffer(QBufferPrivate &dd, QBuffer::BufferType ty, Qt3D::QNode *parent = 0);
+    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
 
 Q_SIGNALS:
     void typeChanged();
@@ -109,8 +109,8 @@ private:
     QT3D_CLONEABLE(QBuffer)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QBUFFER_H
+#endif // QT3DRENDER_QBUFFER_H
diff --git a/src/render/io/qbuffer_p.h b/src/render/io/qbuffer_p.h
index bab9e95f9..53bea6359 100644
--- a/src/render/io/qbuffer_p.h
+++ b/src/render/io/qbuffer_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QBUFFER_P_H
-#define QT3D_QBUFFER_P_H
+#ifndef QT3DRENDER_QBUFFER_P_H
+#define QT3DRENDER_QBUFFER_P_H
 
 #include <private/qabstractbuffer_p.h>
 #include <Qt3DRenderer/qbuffer.h>
@@ -45,9 +45,9 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
-class QT3DRENDERERSHARED_EXPORT QBufferPrivate : public QAbstractBufferPrivate
+class QT3DRENDERERSHARED_EXPORT QBufferPrivate : public Qt3D::QAbstractBufferPrivate
 {
 public:
     QBufferPrivate();
@@ -57,8 +57,8 @@ public:
     QBufferFunctorPtr m_functor;
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QBUFFER_P_H
+#endif // QT3DRENDER_QBUFFER_P_H
diff --git a/src/render/io/qbufferfunctor.h b/src/render/io/qbufferfunctor.h
index 550905042..4a508b975 100644
--- a/src/render/io/qbufferfunctor.h
+++ b/src/render/io/qbufferfunctor.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QBUFFERFUNCTOR
-#define QT3D_QBUFFERFUNCTOR
+#ifndef QT3DRENDER_QBUFFERFUNCTOR
+#define QT3DRENDER_QBUFFERFUNCTOR
 
 #include <Qt3DRenderer/qt3drenderer_global.h>
 #include <Qt3DCore/qabstractfunctor.h>
@@ -43,9 +43,9 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
-class QT3DRENDERERSHARED_EXPORT QBufferFunctor : public QAbstractFunctor
+class QT3DRENDERERSHARED_EXPORT QBufferFunctor : public Qt3D::QAbstractFunctor
 {
 public:
     virtual ~QBufferFunctor() {}
@@ -55,11 +55,11 @@ public:
 
 typedef QSharedPointer<QBufferFunctor> QBufferFunctorPtr;
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(Qt3D::QBufferFunctorPtr)
+Q_DECLARE_METATYPE(Qt3DRender::QBufferFunctorPtr)
 
-#endif // QT3D_QBUFFERFUNCTOR
+#endif // QT3DRENDER_QBUFFERFUNCTOR
 
diff --git a/src/render/io/qgeometryfunctor.h b/src/render/io/qgeometryfunctor.h
index e64a6ef80..4290fbe7b 100644
--- a/src/render/io/qgeometryfunctor.h
+++ b/src/render/io/qgeometryfunctor.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QGEOMETRYFUNCTOR
-#define QT3D_QGEOMETRYFUNCTOR
+#ifndef QT3DRENDER_QGEOMETRYFUNCTOR
+#define QT3DRENDER_QGEOMETRYFUNCTOR
 
 #include <Qt3DRenderer/qt3drenderer_global.h>
 #include <Qt3DCore/qabstractfunctor.h>
@@ -43,11 +43,11 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QGeometry;
 
-class QT3DRENDERERSHARED_EXPORT QGeometryFunctor : public QAbstractFunctor
+class QT3DRENDERERSHARED_EXPORT QGeometryFunctor : public Qt3D::QAbstractFunctor
 {
 public:
     virtual ~QGeometryFunctor() {}
@@ -57,11 +57,11 @@ public:
 
 typedef QSharedPointer<QGeometryFunctor> QGeometryFunctorPtr;
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(Qt3D::QGeometryFunctorPtr)
+Q_DECLARE_METATYPE(Qt3DRender::QGeometryFunctorPtr)
 
-#endif // QT3D_QGEOMETRYFUNCTOR
+#endif // QT3DRENDER_QGEOMETRYFUNCTOR
 
diff --git a/src/render/io/texturedata.cpp b/src/render/io/texturedata.cpp
index c0aafff02..b54c526f9 100644
--- a/src/render/io/texturedata.cpp
+++ b/src/render/io/texturedata.cpp
@@ -44,7 +44,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 TexImageData::TexImageData()
     : m_width(-1)
@@ -122,6 +122,6 @@ bool TexImageData::setCompressedFile(const QString &source)
     return false;
 }
 
-} // namespace Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/io/texturedata.h b/src/render/io/texturedata.h
index 427453d6e..2f3fdb9a9 100644
--- a/src/render/io/texturedata.h
+++ b/src/render/io/texturedata.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_TEXTUREDATA_H
-#define QT3D_TEXTUREDATA_H
+#ifndef QT3DRENDER_TEXTUREDATA_H
+#define QT3DRENDER_TEXTUREDATA_H
 
 #include <QOpenGLTexture>
 #include <QImage>
@@ -44,7 +44,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QT3DRENDERERSHARED_EXPORT TexImageData
 {
@@ -91,9 +91,9 @@ private:
 
 typedef QSharedPointer<TexImageData> TexImageDataPtr;
 
-} // namespace Qt3D
+} // namespace Qt3DRender
 
 
 QT_END_NAMESPACE
 
-#endif // QT3D_TEXTUREDATA_H
+#endif // QT3DRENDER_TEXTUREDATA_H
diff --git a/src/render/io/uniformbuffer.cpp b/src/render/io/uniformbuffer.cpp
index b07715ebf..00ba26657 100644
--- a/src/render/io/uniformbuffer.cpp
+++ b/src/render/io/uniformbuffer.cpp
@@ -43,7 +43,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 namespace Render {
 
@@ -89,8 +89,8 @@ void UniformBuffer::bindToUniformBlock(QGraphicsContext *ctx, int bindingPoint)
     ctx->bindBufferBase(GL_UNIFORM_BUFFER, bindingPoint, m_bufferId);
 }
 
-} // Render
+} // namespace Render
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/io/uniformbuffer_p.h b/src/render/io/uniformbuffer_p.h
index b759dd364..6d489c248 100644
--- a/src/render/io/uniformbuffer_p.h
+++ b/src/render/io/uniformbuffer_p.h
@@ -34,21 +34,21 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_UNIFORMBUFFER_P_H
-#define QT3D_RENDER_UNIFORMBUFFER_P_H
+#ifndef QT3DRENDER_RENDER_UNIFORMBUFFER_P_H
+#define QT3DRENDER_RENDER_UNIFORMBUFFER_P_H
 
 #include <QOpenGLContext>
 #include <Qt3DCore/qnodeid.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 namespace Render {
 
 class QGraphicsContext;
 
-typedef QPair<QNodeId, QNodeId> ShaderDataShaderUboKey;
+typedef QPair<Qt3D::QNodeId, Qt3D::QNodeId> ShaderDataShaderUboKey;
 
 class UniformBuffer
 {
@@ -70,10 +70,10 @@ private:
     bool m_isCreated;
 };
 
-} // Render
+} // namespace Render
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_UNIFORMBUFFER_P_H
+#endif // QT3DRENDER_RENDER_UNIFORMBUFFER_P_H