Move core/io content to render/geometry and io

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

3 files changed, 20 insertions, 20 deletions

diff --git a/src/quick3d/quick3drender/items/quick3dbuffer.cpp b/src/quick3d/quick3drender/items/quick3dbuffer.cpp
index a80443e6f..1371dd5cb 100644
--- a/src/quick3d/quick3drender/items/quick3dbuffer.cpp
+++ b/src/quick3d/quick3drender/items/quick3dbuffer.cpp
@@ -55,7 +55,7 @@ Quick3DBuffer::Quick3DBuffer(QObject *parent)
     , m_engine(Q_NULLPTR)
     , m_v4engine(Q_NULLPTR)
 {
-    QObject::connect(parentBuffer(), &Qt3DCore::QAbstractBuffer::dataChanged, this, &Quick3DBuffer::bufferDataChanged);
+    QObject::connect(parentBuffer(), &Qt3DRender::QAbstractBuffer::dataChanged, this, &Quick3DBuffer::bufferDataChanged);
 }
 
 QByteArray Quick3DBuffer::convertToRawData(const QJSValue &jsValue)
diff --git a/src/quick3d/quick3drender/items/quick3dgeometry.cpp b/src/quick3d/quick3drender/items/quick3dgeometry.cpp
index 47235c106..5b7e35722 100644
--- a/src/quick3d/quick3drender/items/quick3dgeometry.cpp
+++ b/src/quick3d/quick3drender/items/quick3dgeometry.cpp
@@ -47,39 +47,39 @@ Quick3DGeometry::Quick3DGeometry(QObject *parent)
 {
 }
 
-QQmlListProperty<Qt3DCore::QAbstractAttribute> Quick3DGeometry::attributeList()
+QQmlListProperty<Qt3DRender::QAbstractAttribute> Quick3DGeometry::attributeList()
 {
-    return QQmlListProperty<Qt3DCore::QAbstractAttribute>(this, 0,
-                                                      &Quick3DGeometry::appendAttribute,
-                                                      &Quick3DGeometry::attributesCount,
-                                                      &Quick3DGeometry::attributeAt,
-                                                      &Quick3DGeometry::clearAttributes);
+    return QQmlListProperty<Qt3DRender::QAbstractAttribute>(this, 0,
+                                                            &Quick3DGeometry::appendAttribute,
+                                                            &Quick3DGeometry::attributesCount,
+                                                            &Quick3DGeometry::attributeAt,
+                                                            &Quick3DGeometry::clearAttributes);
 }
 
-void Quick3DGeometry::appendAttribute(QQmlListProperty<Qt3DCore::QAbstractAttribute> *list, Qt3DCore::QAbstractAttribute *attribute)
+void Quick3DGeometry::appendAttribute(QQmlListProperty<Qt3DRender::QAbstractAttribute> *list, Qt3DRender::QAbstractAttribute *attribute)
 {
     Quick3DGeometry *geometry = static_cast<Quick3DGeometry *>(list->object);
     geometry->m_managedAttributes.append(attribute);
     geometry->parentGeometry()->addAttribute(attribute);
 }
 
-Qt3DCore::QAbstractAttribute *Quick3DGeometry::attributeAt(QQmlListProperty<Qt3DCore::QAbstractAttribute> *list, int index)
+Qt3DRender::QAbstractAttribute *Quick3DGeometry::attributeAt(QQmlListProperty<Qt3DRender::QAbstractAttribute> *list, int index)
 {
     Quick3DGeometry *geometry = static_cast<Quick3DGeometry *>(list->object);
     return geometry->parentGeometry()->attributes().at(index);
 }
 
-int Quick3DGeometry::attributesCount(QQmlListProperty<Qt3DCore::QAbstractAttribute> *list)
+int Quick3DGeometry::attributesCount(QQmlListProperty<Qt3DRender::QAbstractAttribute> *list)
 {
     Quick3DGeometry *geometry = static_cast<Quick3DGeometry *>(list->object);
     return geometry->parentGeometry()->attributes().count();
 }
 
-void Quick3DGeometry::clearAttributes(QQmlListProperty<Qt3DCore::QAbstractAttribute> *list)
+void Quick3DGeometry::clearAttributes(QQmlListProperty<Qt3DRender::QAbstractAttribute> *list)
 {
     Quick3DGeometry *geometry = static_cast<Quick3DGeometry *>(list->object);
-    QVector<Qt3DCore::QAbstractAttribute *> &managedAttributes = geometry->m_managedAttributes;
-    Q_FOREACH (Qt3DCore::QAbstractAttribute *attribute, managedAttributes)
+    QVector<Qt3DRender::QAbstractAttribute *> &managedAttributes = geometry->m_managedAttributes;
+    Q_FOREACH (Qt3DRender::QAbstractAttribute *attribute, managedAttributes)
         geometry->parentGeometry()->removeAttribute(attribute);
     managedAttributes.clear();
 }
diff --git a/src/quick3d/quick3drender/items/quick3dgeometry_p.h b/src/quick3d/quick3drender/items/quick3dgeometry_p.h
index 0434b34c5..2983fe03e 100644
--- a/src/quick3d/quick3drender/items/quick3dgeometry_p.h
+++ b/src/quick3d/quick3drender/items/quick3dgeometry_p.h
@@ -61,22 +61,22 @@ namespace Quick {
 class QT3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DGeometry : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(QQmlListProperty<Qt3DCore::QAbstractAttribute> attributes READ attributeList)
+    Q_PROPERTY(QQmlListProperty<Qt3DRender::QAbstractAttribute> attributes READ attributeList)
     Q_CLASSINFO("DefaultProperty", "attributes")
 
 public:
     explicit Quick3DGeometry(QObject *parent = 0);
     inline QGeometry *parentGeometry() const { return qobject_cast<QGeometry *>(parent()); }
 
-    QQmlListProperty<Qt3DCore::QAbstractAttribute> attributeList();
+    QQmlListProperty<Qt3DRender::QAbstractAttribute> attributeList();
 
 private:
-    static void appendAttribute(QQmlListProperty<Qt3DCore::QAbstractAttribute> *list, Qt3DCore::QAbstractAttribute *provider);
-    static Qt3DCore::QAbstractAttribute *attributeAt(QQmlListProperty<Qt3DCore::QAbstractAttribute> *list, int index);
-    static int attributesCount(QQmlListProperty<Qt3DCore::QAbstractAttribute> *list);
-    static void clearAttributes(QQmlListProperty<Qt3DCore::QAbstractAttribute> *list);
+    static void appendAttribute(QQmlListProperty<Qt3DRender::QAbstractAttribute> *list, Qt3DRender::QAbstractAttribute *provider);
+    static Qt3DRender::QAbstractAttribute *attributeAt(QQmlListProperty<Qt3DRender::QAbstractAttribute> *list, int index);
+    static int attributesCount(QQmlListProperty<Qt3DRender::QAbstractAttribute> *list);
+    static void clearAttributes(QQmlListProperty<Qt3DRender::QAbstractAttribute> *list);
 
-    QVector<Qt3DCore::QAbstractAttribute *> m_managedAttributes;
+    QVector<Qt3DRender::QAbstractAttribute *> m_managedAttributes;
 };
 
 } // namespace Quick