QParameterMapper: renamed to QParameterMapping

Change-Id: I2137a22bdf35979ef300820a613db7d7bdc647e0
Task-number: QTBUG-41535
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

2 files changed, 14 insertions, 14 deletions

diff --git a/src/quick3d/quick3drenderer/items/quick3drenderpass.cpp b/src/quick3d/quick3drenderer/items/quick3drenderpass.cpp
index c4e507c57..91173087e 100644
--- a/src/quick3d/quick3drenderer/items/quick3drenderpass.cpp
+++ b/src/quick3d/quick3drenderer/items/quick3drenderpass.cpp
@@ -41,7 +41,7 @@
 ****************************************************************************/
 
 #include "quick3drenderpass.h"
-#include <Qt3DRenderer/qparametermapper.h>
+#include <Qt3DRenderer/qparametermapping.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -65,9 +65,9 @@ QQmlListProperty<QAnnotation> Quick3DRenderPass::annotationList()
                                               &Quick3DRenderPass::clearAnnotations);
 }
 
-QQmlListProperty<QParameterMapper> Quick3DRenderPass::bindingList()
+QQmlListProperty<QParameterMapping> Quick3DRenderPass::bindingList()
 {
-    return QQmlListProperty<Qt3D::QParameterMapper>(this, 0,
+    return QQmlListProperty<Qt3D::QParameterMapping>(this, 0,
                                                     &Quick3DRenderPass::appendBinding,
                                                     &Quick3DRenderPass::bindingsCount,
                                                     &Quick3DRenderPass::bindingAt,
@@ -108,28 +108,28 @@ void Quick3DRenderPass::clearAnnotations(QQmlListProperty<QAnnotation> *list)
         rPass->parentRenderPass()->removeAnnotation(c);
 }
 
-void Quick3DRenderPass::appendBinding(QQmlListProperty<QParameterMapper> *list, QParameterMapper *binding)
+void Quick3DRenderPass::appendBinding(QQmlListProperty<QParameterMapping> *list, QParameterMapping *binding)
 {
     Quick3DRenderPass *rPass = qobject_cast<Quick3DRenderPass *>(list->object);
     rPass->parentRenderPass()->addBinding(binding);
 }
 
-QParameterMapper *Quick3DRenderPass::bindingAt(QQmlListProperty<QParameterMapper> *list, int index)
+QParameterMapping *Quick3DRenderPass::bindingAt(QQmlListProperty<QParameterMapping> *list, int index)
 {
     Quick3DRenderPass *rPass = qobject_cast<Quick3DRenderPass *>(list->object);
     return rPass->parentRenderPass()->bindings().at(index);
 }
 
-int Quick3DRenderPass::bindingsCount(QQmlListProperty<QParameterMapper> *list)
+int Quick3DRenderPass::bindingsCount(QQmlListProperty<QParameterMapping> *list)
 {
     Quick3DRenderPass *rPass = qobject_cast<Quick3DRenderPass *>(list->object);
     return rPass->parentRenderPass()->bindings().count();
 }
 
-void Quick3DRenderPass::clearBindings(QQmlListProperty<QParameterMapper> *list)
+void Quick3DRenderPass::clearBindings(QQmlListProperty<QParameterMapping> *list)
 {
     Quick3DRenderPass *rPass = qobject_cast<Quick3DRenderPass *>(list->object);
-    Q_FOREACH (QParameterMapper *binding, rPass->parentRenderPass()->bindings())
+    Q_FOREACH (QParameterMapping *binding, rPass->parentRenderPass()->bindings())
         rPass->parentRenderPass()->removeBinding(binding);
 }
 
diff --git a/src/quick3d/quick3drenderer/items/quick3drenderpass.h b/src/quick3d/quick3drenderer/items/quick3drenderpass.h
index 6ffdc281a..9da68267a 100644
--- a/src/quick3d/quick3drenderer/items/quick3drenderpass.h
+++ b/src/quick3d/quick3drenderer/items/quick3drenderpass.h
@@ -59,13 +59,13 @@ class QT3DQUICKRENDERERSHARED_EXPORT Quick3DRenderPass : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QQmlListProperty<Qt3D::QAnnotation> annotations READ annotationList)
-    Q_PROPERTY(QQmlListProperty<Qt3D::QParameterMapper> bindings READ bindingList)
+    Q_PROPERTY(QQmlListProperty<Qt3D::QParameterMapping> bindings READ bindingList)
     Q_PROPERTY(QQmlListProperty<Qt3D::QRenderState> renderStates READ renderStateList)
 public:
     explicit Quick3DRenderPass(QObject *parent = 0);
 
     QQmlListProperty<Qt3D::QAnnotation> annotationList();
-    QQmlListProperty<Qt3D::QParameterMapper> bindingList();
+    QQmlListProperty<Qt3D::QParameterMapping> bindingList();
     QQmlListProperty<Qt3D::QRenderState> renderStateList();
     inline QRenderPass *parentRenderPass() const { return qobject_cast<QRenderPass *>(parent()); }
 
@@ -75,10 +75,10 @@ private:
     static int annotationsCount(QQmlListProperty<Qt3D::QAnnotation> *list);
     static void clearAnnotations(QQmlListProperty<Qt3D::QAnnotation> *list);
 
-    static void appendBinding(QQmlListProperty<Qt3D::QParameterMapper> *list, QParameterMapper *binding);
-    static QParameterMapper *bindingAt(QQmlListProperty<Qt3D::QParameterMapper> *list, int index);
-    static int bindingsCount(QQmlListProperty<Qt3D::QParameterMapper> *list);
-    static void clearBindings(QQmlListProperty<Qt3D::QParameterMapper> *list);
+    static void appendBinding(QQmlListProperty<Qt3D::QParameterMapping> *list, QParameterMapping *binding);
+    static QParameterMapping *bindingAt(QQmlListProperty<Qt3D::QParameterMapping> *list, int index);
+    static int bindingsCount(QQmlListProperty<Qt3D::QParameterMapping> *list);
+    static void clearBindings(QQmlListProperty<Qt3D::QParameterMapping> *list);
 
     static void appendRenderState(QQmlListProperty<Qt3D::QRenderState> *list, QRenderState *state);
     static QRenderState *renderStateAt(QQmlListProperty<Qt3D::QRenderState> *list, int index);