diff options
Diffstat (limited to 'src/quick3d/quick3drenderer')
10 files changed, 31 insertions, 31 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 diff --git a/src/quick3d/quick3drenderer/items/quick3dgeometry.h b/src/quick3d/quick3drenderer/items/quick3dgeometry.h index 85b01554e..d9e996b95 100644 --- a/src/quick3d/quick3drenderer/items/quick3dgeometry.h +++ b/src/quick3d/quick3drenderer/items/quick3dgeometry.h @@ -50,27 +50,27 @@ namespace Quick { class QT3DQUICKRENDERERSHARED_EXPORT Quick3DGeometry : public QObject { Q_OBJECT - Q_PROPERTY(QQmlListProperty<Qt3D::QAbstractAttribute> attributes READ attributeList) + Q_PROPERTY(QQmlListProperty<Qt3DCore::QAbstractAttribute> attributes READ attributeList) Q_CLASSINFO("DefaultProperty", "attributeProviders") public: explicit Quick3DGeometry(QObject *parent = 0); inline QGeometry *parentGeometry() const { return qobject_cast<QGeometry *>(parent()); } - QQmlListProperty<Qt3D::QAbstractAttribute> attributeList(); + QQmlListProperty<Qt3DCore::QAbstractAttribute> attributeList(); private: - 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); + 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); - QVector<Qt3D::QAbstractAttribute *> m_managedAttributes; + QVector<Qt3DCore::QAbstractAttribute *> m_managedAttributes; }; } // namespace Quick } // namespace Render -} // namespace Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/quick3d/quick3drenderer/items/quick3drenderpass.h b/src/quick3d/quick3drenderer/items/quick3drenderpass.h index a8354c27d..12f1e829c 100644 --- a/src/quick3d/quick3drenderer/items/quick3drenderpass.h +++ b/src/quick3d/quick3drenderer/items/quick3drenderpass.h @@ -89,7 +89,7 @@ private: } // namespace Quick } // namespace Render -} // namespace Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/quick3d/quick3drenderer/items/quick3dshaderdata.cpp b/src/quick3d/quick3drenderer/items/quick3dshaderdata.cpp index a84e71ac5..ebc99e93e 100644 --- a/src/quick3d/quick3drenderer/items/quick3dshaderdata.cpp +++ b/src/quick3d/quick3drenderer/items/quick3dshaderdata.cpp @@ -81,7 +81,7 @@ public: } return innerValues; } else if (v.userType() == quick3DShaderDataTypeId) { - Qt3D::QNodeId id; + Qt3DCore::QNodeId id; QShaderData *shaderData = v.value<Quick3DShaderData *>(); if (shaderData) id = shaderData->id(); @@ -99,6 +99,6 @@ Quick3DShaderData::Quick3DShaderData(QNode *parent) } // namespace Quick } // namespace Render -} // namespace Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/quick3d/quick3drenderer/items/quick3dshaderdata.h b/src/quick3d/quick3drenderer/items/quick3dshaderdata.h index 31beee39d..4bc40ad98 100644 --- a/src/quick3d/quick3drenderer/items/quick3dshaderdata.h +++ b/src/quick3d/quick3drenderer/items/quick3dshaderdata.h @@ -61,7 +61,7 @@ private: } // namespace Quick } // namespace Render -} // namespace Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/quick3d/quick3drenderer/items/quick3dshaderdataarray.cpp b/src/quick3d/quick3drenderer/items/quick3dshaderdataarray.cpp index c85f6d62e..3b863b35e 100644 --- a/src/quick3d/quick3drenderer/items/quick3dshaderdataarray.cpp +++ b/src/quick3d/quick3drenderer/items/quick3dshaderdataarray.cpp @@ -43,7 +43,7 @@ namespace Qt3DRender { namespace Render { namespace Quick { -class Quick3DShaderDataArrayPrivate : public Qt3D::QNodePrivate +class Quick3DShaderDataArrayPrivate : public Qt3DCore::QNodePrivate { public: Quick3DShaderDataArrayPrivate() diff --git a/src/quick3d/quick3drenderer/items/quick3dshaderdataarray.h b/src/quick3d/quick3drenderer/items/quick3dshaderdataarray.h index aa0a0da5c..dfe1a2cb0 100644 --- a/src/quick3d/quick3drenderer/items/quick3dshaderdataarray.h +++ b/src/quick3d/quick3drenderer/items/quick3dshaderdataarray.h @@ -54,20 +54,20 @@ namespace Quick { class Quick3DShaderDataArrayPrivate; class Quick3DShaderData; -class QT3DQUICKRENDERERSHARED_EXPORT Quick3DShaderDataArray : public Qt3D::QNode +class QT3DQUICKRENDERERSHARED_EXPORT Quick3DShaderDataArray : public Qt3DCore::QNode { Q_OBJECT Q_PROPERTY(QQmlListProperty<Qt3DRender::QShaderData> values READ valuesList) Q_CLASSINFO("DefaultProperty", "values") public: - explicit Quick3DShaderDataArray(Qt3D::QNode *parent = 0); + explicit Quick3DShaderDataArray(Qt3DCore::QNode *parent = 0); ~Quick3DShaderDataArray(); QQmlListProperty<QShaderData> valuesList(); QList<QShaderData *> values() const; protected: - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: static void appendValue(QQmlListProperty<QShaderData> *list, QShaderData *bar); diff --git a/src/quick3d/quick3drenderer/qt3dquickrenderer_global.cpp b/src/quick3d/quick3drenderer/qt3dquickrenderer_global.cpp index 6fdbf4ea4..bc46386e2 100644 --- a/src/quick3d/quick3drenderer/qt3dquickrenderer_global.cpp +++ b/src/quick3d/quick3drenderer/qt3dquickrenderer_global.cpp @@ -45,7 +45,7 @@ namespace Quick { void Quick3DRenderer_initialize() { - Qt3D::QAbstractNodeFactory::registerNodeFactory(QuickRendererNodeFactory::instance()); + Qt3DCore::QAbstractNodeFactory::registerNodeFactory(QuickRendererNodeFactory::instance()); } void Quick3DRenderer_registerType(const char *className, const char *quickName, int major, int minor) diff --git a/src/quick3d/quick3drenderer/qt3dquickrenderernodefactory.cpp b/src/quick3d/quick3drenderer/qt3dquickrenderernodefactory.cpp index 0694882e2..1123062cc 100644 --- a/src/quick3d/quick3drenderer/qt3dquickrenderernodefactory.cpp +++ b/src/quick3d/quick3drenderer/qt3dquickrenderernodefactory.cpp @@ -53,7 +53,7 @@ void QuickRendererNodeFactory::registerType(const char *className, const char *q m_types.insert(className, Type(quickName, major, minor)); } -Qt3D::QNode *QuickRendererNodeFactory::createNode(const char *type) +Qt3DCore::QNode *QuickRendererNodeFactory::createNode(const char *type) { if (!m_types.contains(type)) return Q_NULLPTR; @@ -65,7 +65,7 @@ Qt3D::QNode *QuickRendererNodeFactory::createNode(const char *type) typeInfo.t = QQmlMetaType::qmlType(QString::fromLatin1(typeInfo.quickName), typeInfo.version.first, typeInfo.version.second); } - return typeInfo.t ? qobject_cast<Qt3D::QNode *>(typeInfo.t->create()) : Q_NULLPTR; + return typeInfo.t ? qobject_cast<Qt3DCore::QNode *>(typeInfo.t->create()) : Q_NULLPTR; } } // namespace Qt3DRender diff --git a/src/quick3d/quick3drenderer/qt3dquickrenderernodefactory_p.h b/src/quick3d/quick3drenderer/qt3dquickrenderernodefactory_p.h index 243019174..7d9f49c7e 100644 --- a/src/quick3d/quick3drenderer/qt3dquickrenderernodefactory_p.h +++ b/src/quick3d/quick3drenderer/qt3dquickrenderernodefactory_p.h @@ -57,10 +57,10 @@ class QQmlType; namespace Qt3DRender { -class QuickRendererNodeFactory : public Qt3D::QAbstractNodeFactory +class QuickRendererNodeFactory : public Qt3DCore::QAbstractNodeFactory { public: - Qt3D::QNode *createNode(const char *type) Q_DECL_OVERRIDE; + Qt3DCore::QNode *createNode(const char *type) Q_DECL_OVERRIDE; void registerType(const char *className, const char *quickName, int major, int minor); @@ -79,7 +79,7 @@ private: QHash<QByteArray, Type> m_types; }; -} // namespace Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE |