diff options
| author | Franck Arrecot <franck.arrecot@kdab.com> | 2016-03-03 16:40:32 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2016-03-09 06:01:18 +0000 |
| commit | 56324985cde49e31f61a96911da2af4d8386356d (patch) | |
| tree | 238e730e3e44b91451dd048fedaa636008254e4d /src/render/geometry/qmesh.cpp | |
| parent | 4578bcc2b8ba4008743201c3a09ba607a860ce40 (diff) | |
Class QGeometryFunctor renamed to QGeometryFactory
Task-number: QTBUG-51475
Change-Id: I4d679b1001df2e8a4d57f0aa5511b3c49812cfa0
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/geometry/qmesh.cpp')
| -rw-r--r-- | src/render/geometry/qmesh.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/render/geometry/qmesh.cpp b/src/render/geometry/qmesh.cpp index 0296cf031..da78eaed3 100644 --- a/src/render/geometry/qmesh.cpp +++ b/src/render/geometry/qmesh.cpp @@ -52,12 +52,12 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { -class MeshFunctor : public QGeometryFunctor +class MeshFunctor : public QGeometryFactory { public : MeshFunctor(const QUrl &sourcePath, const QString &meshName = QString()); QGeometry *operator()() Q_DECL_OVERRIDE; - bool operator ==(const QGeometryFunctor &other) const Q_DECL_OVERRIDE; + bool operator ==(const QGeometryFactory &other) const Q_DECL_OVERRIDE; QT3D_FUNCTOR(MeshFunctor) private: @@ -128,7 +128,7 @@ void QMesh::setSource(const QUrl& source) return; d->m_source = source; // update the functor - QGeometryRenderer::setGeometryFunctor(QGeometryFunctorPtr(new MeshFunctor(d->m_source, d->m_meshName))); + QGeometryRenderer::setGeometryFactory(QGeometryFactoryPtr(new MeshFunctor(d->m_source, d->m_meshName))); emit sourceChanged(source); } @@ -150,7 +150,7 @@ void QMesh::setMeshName(const QString &meshName) return; d->m_meshName = meshName; // update the functor - QGeometryRenderer::setGeometryFunctor(QGeometryFunctorPtr(new MeshFunctor(d->m_source, d->m_meshName))); + QGeometryRenderer::setGeometryFactory(QGeometryFactoryPtr(new MeshFunctor(d->m_source, d->m_meshName))); emit meshNameChanged(meshName); } @@ -169,7 +169,7 @@ QString QMesh::meshName() const * \internal */ MeshFunctor::MeshFunctor(const QUrl &sourcePath, const QString& meshName) - : QGeometryFunctor() + : QGeometryFactory() , m_sourcePath(sourcePath) , m_meshName(meshName) { @@ -205,7 +205,7 @@ QGeometry *MeshFunctor::operator()() /*! * \internal */ -bool MeshFunctor::operator ==(const QGeometryFunctor &other) const +bool MeshFunctor::operator ==(const QGeometryFactory &other) const { const MeshFunctor *otherFunctor = functor_cast<MeshFunctor>(&other); if (otherFunctor != Q_NULLPTR) |