Move core/io content to render/geometry and io

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

2 files changed, 11 insertions, 11 deletions

diff --git a/tests/auto/render/attribute/tst_attribute.cpp b/tests/auto/render/attribute/tst_attribute.cpp
index 6d09414e9..a22a142ff 100644
--- a/tests/auto/render/attribute/tst_attribute.cpp
+++ b/tests/auto/render/attribute/tst_attribute.cpp
@@ -56,7 +56,7 @@ private Q_SLOTS:
         attribute.setCount(427);
         attribute.setDivisor(305);
         attribute.setName(QStringLiteral("C3"));
-        attribute.setDataType(Qt3DCore::QAbstractAttribute::UnsignedShort);
+        attribute.setDataType(Qt3DRender::QAbstractAttribute::UnsignedShort);
         attribute.setDataSize(3);
 
         Qt3DRender::QBuffer buffer(Qt3DRender::QBuffer::IndexBuffer);
@@ -91,7 +91,7 @@ private Q_SLOTS:
         QVERIFY(renderAttribute.bufferId().isNull());
         QVERIFY(renderAttribute.name().isEmpty());
         QCOMPARE(renderAttribute.isDirty(), false);
-        QCOMPARE(renderAttribute.dataType(), Qt3DCore::QAbstractAttribute::Float);
+        QCOMPARE(renderAttribute.dataType(), Qt3DRender::QAbstractAttribute::Float);
         QCOMPARE(renderAttribute.dataSize(), 1U);
         QCOMPARE(renderAttribute.attributeType(), Qt3DRender::QAttribute::VertexAttribute);
         QCOMPARE(renderAttribute.byteOffset(), 0U);
@@ -107,7 +107,7 @@ private Q_SLOTS:
         attribute.setCount(427);
         attribute.setDivisor(305);
         attribute.setName(QStringLiteral("C3"));
-        attribute.setDataType(Qt3DCore::QAbstractAttribute::Double);
+        attribute.setDataType(Qt3DRender::QAbstractAttribute::Double);
         attribute.setDataSize(4);
         Qt3DRender::QBuffer buffer(Qt3DRender::QBuffer::IndexBuffer);
         buffer.setUsage(Qt3DRender::QBuffer::DynamicCopy);
@@ -123,7 +123,7 @@ private Q_SLOTS:
         QVERIFY(renderAttribute.bufferId().isNull());
         QVERIFY(renderAttribute.name().isEmpty());
         QCOMPARE(renderAttribute.isDirty(), false);
-        QCOMPARE(renderAttribute.dataType(), Qt3DCore::QAbstractAttribute::Float);
+        QCOMPARE(renderAttribute.dataType(), Qt3DRender::QAbstractAttribute::Float);
         QCOMPARE(renderAttribute.dataSize(), 1U);
         QCOMPARE(renderAttribute.attributeType(), Qt3DRender::QAttribute::VertexAttribute);
         QCOMPARE(renderAttribute.byteOffset(), 0U);
@@ -141,12 +141,12 @@ private Q_SLOTS:
 
         // WHEN
         Qt3DCore::QScenePropertyChangePtr updateChange(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId()));
-        updateChange->setValue(static_cast<int>(Qt3DCore::QAbstractAttribute::Int));
+        updateChange->setValue(static_cast<int>(Qt3DRender::QAbstractAttribute::Int));
         updateChange->setPropertyName("dataType");
         renderAttribute.sceneChangeEvent(updateChange);
 
         // THEN
-        QCOMPARE(renderAttribute.dataType(), Qt3DCore::QAbstractAttribute::Int);
+        QCOMPARE(renderAttribute.dataType(), Qt3DRender::QAbstractAttribute::Int);
         QVERIFY(renderAttribute.isDirty());
 
         renderAttribute.unsetDirty();
diff --git a/tests/auto/render/qattribute/tst_qattribute.cpp b/tests/auto/render/qattribute/tst_qattribute.cpp
index 1880e5091..acc3f8cbb 100644
--- a/tests/auto/render/qattribute/tst_qattribute.cpp
+++ b/tests/auto/render/qattribute/tst_qattribute.cpp
@@ -51,7 +51,7 @@ class tst_QAttribute: public Qt3DCore::QNode
 public:
     tst_QAttribute()
     {
-        qRegisterMetaType<Qt3DCore::QAbstractBuffer*>("Qt3DCore::QAbstractBuffer*");
+        qRegisterMetaType<Qt3DRender::QAbstractBuffer*>("Qt3DCore::QAbstractBuffer*");
     }
 
     ~tst_QAttribute()
@@ -71,7 +71,7 @@ private Q_SLOTS:
         Qt3DRender::QAttribute *customVertex = new Qt3DRender::QAttribute();
         Qt3DRender::QBuffer *buffer = new Qt3DRender::QBuffer(Qt3DRender::QBuffer::VertexBuffer);
         customVertex->setBuffer(buffer);
-        customVertex->setAttributeType(Qt3DCore::QAbstractAttribute::VertexAttribute);
+        customVertex->setAttributeType(Qt3DRender::QAbstractAttribute::VertexAttribute);
         customVertex->setCount(454);
         customVertex->setByteStride(427);
         customVertex->setByteOffset(305);
@@ -84,7 +84,7 @@ private Q_SLOTS:
         Qt3DRender::QAttribute *customIndex = new Qt3DRender::QAttribute();
         Qt3DRender::QBuffer *indexBuffer = new Qt3DRender::QBuffer(Qt3DRender::QBuffer::IndexBuffer);
         customIndex->setBuffer(indexBuffer);
-        customIndex->setAttributeType(Qt3DCore::QAbstractAttribute::IndexAttribute);
+        customIndex->setAttributeType(Qt3DRender::QAbstractAttribute::IndexAttribute);
         customIndex->setCount(383);
         customIndex->setByteStride(350);
         customIndex->setByteOffset(327);
@@ -222,14 +222,14 @@ private Q_SLOTS:
         arbiter.events.clear();
 
         // WHEN
-        attribute->setAttributeType(Qt3DCore::QAbstractAttribute::IndexAttribute);
+        attribute->setAttributeType(Qt3DRender::QAbstractAttribute::IndexAttribute);
         QCoreApplication::processEvents();
 
         // THEN
         QCOMPARE(arbiter.events.size(), 1);
         change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>();
         QCOMPARE(change->propertyName(), "attributeType");
-        QCOMPARE(change->value().value<int>(), static_cast<int>(Qt3DCore::QAbstractAttribute::IndexAttribute));
+        QCOMPARE(change->value().value<int>(), static_cast<int>(Qt3DRender::QAbstractAttribute::IndexAttribute));
         QCOMPARE(change->type(), Qt3DCore::NodeUpdated);
 
         arbiter.events.clear();