QBackendNodeFunctor -> QBackendNodeMapper

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

3 files changed, 11 insertions, 11 deletions

diff --git a/src/core/aspects/qabstractaspect.cpp b/src/core/aspects/qabstractaspect.cpp
index d7b44ff54..c83eb3c76 100644
--- a/src/core/aspects/qabstractaspect.cpp
+++ b/src/core/aspects/qabstractaspect.cpp
@@ -82,10 +82,10 @@ QAbstractAspect::QAbstractAspect(QObject *parent)
 */
 
 /*!
-    \typedef Qt3DCore::QBackendNodeFunctorPtr
+    \typedef Qt3DCore::QBackendNodeMapperPtr
     \relates Qt3DCore::QAbstractAspect
 
-    A shared pointer for QBackendNodeFunctor.
+    A shared pointer for QBackendNodeMapper.
 */
 
 /*!
@@ -98,7 +98,7 @@ QAbstractAspect::QAbstractAspect(QAbstractAspectPrivate &dd, QObject *parent)
 /*!
     Registers backend.
 */
-void QAbstractAspect::registerBackendType(const QMetaObject &obj, const QBackendNodeFunctorPtr &functor)
+void QAbstractAspect::registerBackendType(const QMetaObject &obj, const QBackendNodeMapperPtr &functor)
 {
     Q_D(QAbstractAspect);
     d->m_backendCreatorFunctors.insert(&obj, functor);
@@ -130,7 +130,7 @@ QVariant QAbstractAspect::executeCommand(const QStringList &args)
 QBackendNode *QAbstractAspectPrivate::createBackendNode(QNode *frontend) const
 {
     const QMetaObject *metaObj = frontend->metaObject();
-    QBackendNodeFunctorPtr functor;
+    QBackendNodeMapperPtr functor;
     while (metaObj != Q_NULLPTR && functor.isNull()) {
         functor = m_backendCreatorFunctors.value(metaObj);
         metaObj = metaObj->superClass();
@@ -161,7 +161,7 @@ QBackendNode *QAbstractAspectPrivate::createBackendNode(QNode *frontend) const
 void QAbstractAspectPrivate::clearBackendNode(QNode *frontend) const
 {
     const QMetaObject *metaObj = frontend->metaObject();
-    QBackendNodeFunctorPtr functor;
+    QBackendNodeMapperPtr functor;
 
     while (metaObj != Q_NULLPTR && functor.isNull()) {
         functor = m_backendCreatorFunctors.value(metaObj);
diff --git a/src/core/aspects/qabstractaspect.h b/src/core/aspects/qabstractaspect.h
index 0a09ffb6e..2246b68d9 100644
--- a/src/core/aspects/qabstractaspect.h
+++ b/src/core/aspects/qabstractaspect.h
@@ -54,10 +54,10 @@ class QAspectManager;
 class QNode;
 class QEntity;
 class QAbstractAspectPrivate;
-class QBackendNodeFunctor;
+class QBackendNodeMapper;
 
 typedef QSharedPointer<QAspectJob> QAspectJobPtr;
-typedef QSharedPointer<QBackendNodeFunctor> QBackendNodeFunctorPtr;
+typedef QSharedPointer<QBackendNodeMapper> QBackendNodeMapperPtr;
 
 class QT3DCORESHARED_EXPORT QAbstractAspect : public QObject
 {
@@ -70,8 +70,8 @@ protected:
     QAbstractAspect(QAbstractAspectPrivate &dd, QObject *parent = 0);
 
     template<class Frontend>
-    void registerBackendType(const QBackendNodeFunctorPtr &functor);
-    void registerBackendType(const QMetaObject &, const QBackendNodeFunctorPtr &functor);
+    void registerBackendType(const QBackendNodeMapperPtr &functor);
+    void registerBackendType(const QMetaObject &, const QBackendNodeMapperPtr &functor);
 
 private:
     virtual QVariant executeCommand(const QStringList &args);
@@ -92,7 +92,7 @@ private:
 };
 
 template<class Frontend>
-void QAbstractAspect::registerBackendType(const QBackendNodeFunctorPtr &functor)
+void QAbstractAspect::registerBackendType(const QBackendNodeMapperPtr &functor)
 {
     registerBackendType(Frontend::staticMetaObject, functor);
 }
diff --git a/src/core/aspects/qabstractaspect_p.h b/src/core/aspects/qabstractaspect_p.h
index 7b25d4419..5b3d376b7 100644
--- a/src/core/aspects/qabstractaspect_p.h
+++ b/src/core/aspects/qabstractaspect_p.h
@@ -99,7 +99,7 @@ public:
     QAspectManager *m_aspectManager;
     QAbstractAspectJobManager *m_jobManager;
     QChangeArbiter *m_arbiter;
-    QHash<const QMetaObject*, QBackendNodeFunctorPtr> m_backendCreatorFunctors;
+    QHash<const QMetaObject*, QBackendNodeMapperPtr> m_backendCreatorFunctors;
 
     static QAbstractAspectPrivate *get(QAbstractAspect *aspect);
 };