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, 11 insertions, 15 deletions

diff --git a/src/quick3d/quick3drenderer/items/quick3dgeometry.h b/src/quick3d/quick3drenderer/items/quick3dgeometry.h
index a5e275f6a..85b01554e 100644
--- a/src/quick3d/quick3drenderer/items/quick3dgeometry.h
+++ b/src/quick3d/quick3drenderer/items/quick3dgeometry.h
@@ -43,38 +43,34 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
-
+namespace Qt3DRender {
 namespace Render {
-
 namespace Quick {
 
 class QT3DQUICKRENDERERSHARED_EXPORT Quick3DGeometry : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(QQmlListProperty<QAbstractAttribute> attributes READ attributeList)
+    Q_PROPERTY(QQmlListProperty<Qt3D::QAbstractAttribute> attributes READ attributeList)
     Q_CLASSINFO("DefaultProperty", "attributeProviders")
 
 public:
     explicit Quick3DGeometry(QObject *parent = 0);
     inline QGeometry *parentGeometry() const { return qobject_cast<QGeometry *>(parent()); }
 
-    QQmlListProperty<QAbstractAttribute> attributeList();
+    QQmlListProperty<Qt3D::QAbstractAttribute> attributeList();
 
 private:
-    static void appendAttribute(QQmlListProperty<QAbstractAttribute> *list, QAbstractAttribute *provider);
-    static QAbstractAttribute *attributeAt(QQmlListProperty<QAbstractAttribute> *list, int index);
-    static int attributesCount(QQmlListProperty<QAbstractAttribute> *list);
-    static void clearAttributes(QQmlListProperty<QAbstractAttribute> *list);
+    static void appendAttribute(QQmlListProperty<Qt3D::QAbstractAttribute> *list, Qt3D::QAbstractAttribute *provider);
+    static Qt3D::QAbstractAttribute *attributeAt(QQmlListProperty<Qt3D::QAbstractAttribute> *list, int index);
+    static int attributesCount(QQmlListProperty<Qt3D::QAbstractAttribute> *list);
+    static void clearAttributes(QQmlListProperty<Qt3D::QAbstractAttribute> *list);
 
-    QVector<QAbstractAttribute *> m_managedAttributes;
+    QVector<Qt3D::QAbstractAttribute *> m_managedAttributes;
 };
 
-} // Quick
-
-} // Render
-
-} // Qt3D
+} // namespace Quick
+} // namespace Render
+} // namespace Qt3D
 
 QT_END_NAMESPACE