summaryrefslogtreecommitdiffstats
path: root/src/quick3d/quick3drenderer/items/quick3dgeometry.cpp
diff options
context:
space:
mode:
authorSean Harmer <sean.harmer@kdab.com>2015-10-12 20:45:19 +0100
committerPaul Lemire <paul.lemire@kdab.com>2015-10-13 13:19:50 +0000
commit7c971e0e7791ab38d7d3d8ebc25468c44cbe49c5 (patch)
tree53197a9e5eb7501d6f5b497f70c25dad9c265a6f /src/quick3d/quick3drenderer/items/quick3dgeometry.cpp
parent0bfd20ad3b8eb3edec8d6317af9eb5504f8c0871 (diff)
Move Qt3DCore into Qt3DCore namespace
Update other aspects, tests and examples accordingly. Change-Id: Ib1bcf0bdf4f5aec4422dc0c80bfc32b27fb1a317 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/quick3d/quick3drenderer/items/quick3dgeometry.cpp')
-rw-r--r--src/quick3d/quick3drenderer/items/quick3dgeometry.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/quick3d/quick3drenderer/items/quick3dgeometry.cpp b/src/quick3d/quick3drenderer/items/quick3dgeometry.cpp
index c0961ab6c..b2af9763b 100644
--- a/src/quick3d/quick3drenderer/items/quick3dgeometry.cpp
+++ b/src/quick3d/quick3drenderer/items/quick3dgeometry.cpp
@@ -47,45 +47,45 @@ Quick3DGeometry::Quick3DGeometry(QObject *parent)
{
}
-QQmlListProperty<Qt3D::QAbstractAttribute> Quick3DGeometry::attributeList()
+QQmlListProperty<Qt3DCore::QAbstractAttribute> Quick3DGeometry::attributeList()
{
- return QQmlListProperty<Qt3D::QAbstractAttribute>(this, 0,
+ return QQmlListProperty<Qt3DCore::QAbstractAttribute>(this, 0,
&Quick3DGeometry::appendAttribute,
&Quick3DGeometry::attributesCount,
&Quick3DGeometry::attributeAt,
&Quick3DGeometry::clearAttributes);
}
-void Quick3DGeometry::appendAttribute(QQmlListProperty<Qt3D::QAbstractAttribute> *list, Qt3D::QAbstractAttribute *attribute)
+void Quick3DGeometry::appendAttribute(QQmlListProperty<Qt3DCore::QAbstractAttribute> *list, Qt3DCore::QAbstractAttribute *attribute)
{
Quick3DGeometry *geometry = static_cast<Quick3DGeometry *>(list->object);
geometry->m_managedAttributes.append(attribute);
geometry->parentGeometry()->addAttribute(attribute);
}
-Qt3D::QAbstractAttribute *Quick3DGeometry::attributeAt(QQmlListProperty<Qt3D::QAbstractAttribute> *list, int index)
+Qt3DCore::QAbstractAttribute *Quick3DGeometry::attributeAt(QQmlListProperty<Qt3DCore::QAbstractAttribute> *list, int index)
{
Quick3DGeometry *geometry = static_cast<Quick3DGeometry *>(list->object);
return geometry->parentGeometry()->attributes().at(index);
}
-int Quick3DGeometry::attributesCount(QQmlListProperty<Qt3D::QAbstractAttribute> *list)
+int Quick3DGeometry::attributesCount(QQmlListProperty<Qt3DCore::QAbstractAttribute> *list)
{
Quick3DGeometry *geometry = static_cast<Quick3DGeometry *>(list->object);
return geometry->parentGeometry()->attributes().count();
}
-void Quick3DGeometry::clearAttributes(QQmlListProperty<Qt3D::QAbstractAttribute> *list)
+void Quick3DGeometry::clearAttributes(QQmlListProperty<Qt3DCore::QAbstractAttribute> *list)
{
Quick3DGeometry *geometry = static_cast<Quick3DGeometry *>(list->object);
- QVector<Qt3D::QAbstractAttribute *> &managedAttributes = geometry->m_managedAttributes;
- Q_FOREACH (Qt3D::QAbstractAttribute *attribute, managedAttributes)
+ QVector<Qt3DCore::QAbstractAttribute *> &managedAttributes = geometry->m_managedAttributes;
+ Q_FOREACH (Qt3DCore::QAbstractAttribute *attribute, managedAttributes)
geometry->parentGeometry()->removeAttribute(attribute);
managedAttributes.clear();
}
} // namespace Quick
} // namespace Render
-} // namespace Qt3D
+} // namespace Qt3DRender
QT_END_NAMESPACE