Alter QChannelMapping to accept QAbstractChannelMapping pointers

In preparation for the new mapping subclasses.

Change-Id: I3d659b350da72cca9f5ad195f7aa7fea3d943810
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

2 files changed, 18 insertions, 18 deletions

diff --git a/src/quick3d/quick3danimation/items/quick3dchannelmapper.cpp b/src/quick3d/quick3danimation/items/quick3dchannelmapper.cpp
index 55eb04be1..66ee7faef 100644
--- a/src/quick3d/quick3danimation/items/quick3dchannelmapper.cpp
+++ b/src/quick3d/quick3danimation/items/quick3dchannelmapper.cpp
@@ -50,38 +50,38 @@ Quick3DChannelMapper::Quick3DChannelMapper(QObject *parent)
 {
 }
 
-QQmlListProperty<QChannelMapping> Quick3DChannelMapper::qmlMappings()
+QQmlListProperty<QAbstractChannelMapping> Quick3DChannelMapper::qmlMappings()
 {
-    return QQmlListProperty<QChannelMapping>(this, 0,
-                                             &Quick3DChannelMapper::appendMapping,
-                                             &Quick3DChannelMapper::mappingCount,
-                                             &Quick3DChannelMapper::mappingAt,
-                                             &Quick3DChannelMapper::clearMappings);
+    return QQmlListProperty<QAbstractChannelMapping>(this, 0,
+                                                     &Quick3DChannelMapper::appendMapping,
+                                                     &Quick3DChannelMapper::mappingCount,
+                                                     &Quick3DChannelMapper::mappingAt,
+                                                     &Quick3DChannelMapper::clearMappings);
 }
 
-void Quick3DChannelMapper::appendMapping(QQmlListProperty<QChannelMapping> *list, QChannelMapping *mapping)
+void Quick3DChannelMapper::appendMapping(QQmlListProperty<QAbstractChannelMapping> *list, QAbstractChannelMapping *mapping)
 {
     Quick3DChannelMapper *extension = qobject_cast<Quick3DChannelMapper *>(list->object);
     extension->parentMapper()->addMapping(mapping);
 }
 
-QChannelMapping *Quick3DChannelMapper::mappingAt(QQmlListProperty<QChannelMapping> *list, int index)
+QAbstractChannelMapping *Quick3DChannelMapper::mappingAt(QQmlListProperty<QAbstractChannelMapping> *list, int index)
 {
     Quick3DChannelMapper *extension = qobject_cast<Quick3DChannelMapper *>(list->object);
     return extension->parentMapper()->mappings().at(index);
 }
 
-int Quick3DChannelMapper::mappingCount(QQmlListProperty<QChannelMapping> *list)
+int Quick3DChannelMapper::mappingCount(QQmlListProperty<QAbstractChannelMapping> *list)
 {
     Quick3DChannelMapper *extension = qobject_cast<Quick3DChannelMapper *>(list->object);
     return extension->parentMapper()->mappings().count();
 }
 
-void Quick3DChannelMapper::clearMappings(QQmlListProperty<QChannelMapping> *list)
+void Quick3DChannelMapper::clearMappings(QQmlListProperty<QAbstractChannelMapping> *list)
 {
     Quick3DChannelMapper *extension = qobject_cast<Quick3DChannelMapper *>(list->object);
     const auto mappings = extension->parentMapper()->mappings();
-    for (QChannelMapping *mapping : mappings)
+    for (QAbstractChannelMapping *mapping : mappings)
         extension->parentMapper()->removeMapping(mapping);
 }
 
diff --git a/src/quick3d/quick3danimation/items/quick3dchannelmapper_p.h b/src/quick3d/quick3danimation/items/quick3dchannelmapper_p.h
index e44efad68..c3ec577a2 100644
--- a/src/quick3d/quick3danimation/items/quick3dchannelmapper_p.h
+++ b/src/quick3d/quick3danimation/items/quick3dchannelmapper_p.h
@@ -52,7 +52,7 @@
 //
 
 #include <Qt3DQuickAnimation/private/qt3dquickanimation_global_p.h>
-#include <Qt3DAnimation/qchannelmapping.h>
+#include <Qt3DAnimation/qabstractchannelmapping.h>
 #include <Qt3DAnimation/qchannelmapper.h>
 #include <QQmlListProperty>
 
@@ -65,20 +65,20 @@ namespace Quick {
 class QT3DQUICKANIMATIONSHARED_PRIVATE_EXPORT Quick3DChannelMapper  : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(QQmlListProperty<Qt3DAnimation::QChannelMapping> mappings READ qmlMappings CONSTANT)
+    Q_PROPERTY(QQmlListProperty<Qt3DAnimation::QAbstractChannelMapping> mappings READ qmlMappings CONSTANT)
     Q_CLASSINFO("DefaultProperty", "mappings")
 
 public:
     explicit Quick3DChannelMapper(QObject *parent = nullptr);
 
     inline QChannelMapper *parentMapper() const { return qobject_cast<QChannelMapper *>(parent()); }
-    QQmlListProperty<QChannelMapping> qmlMappings();
+    QQmlListProperty<QAbstractChannelMapping> qmlMappings();
 
 private:
-    static void appendMapping(QQmlListProperty<QChannelMapping> *list, QChannelMapping *mapping);
-    static QChannelMapping *mappingAt(QQmlListProperty<QChannelMapping> *list, int index);
-    static int mappingCount(QQmlListProperty<QChannelMapping> *list);
-    static void clearMappings(QQmlListProperty<QChannelMapping> *list);
+    static void appendMapping(QQmlListProperty<QAbstractChannelMapping> *list, QAbstractChannelMapping *mapping);
+    static QAbstractChannelMapping *mappingAt(QQmlListProperty<QAbstractChannelMapping> *list, int index);
+    static int mappingCount(QQmlListProperty<QAbstractChannelMapping> *list);
+    static void clearMappings(QQmlListProperty<QAbstractChannelMapping> *list);
 };
 
 } // namespace Quick