Fix QQmlDelegateModelChangeArray

The class had a vtable, clashing with assumptions about Managed
objects. The derived classes where actually only cosmetic sugar
on top of the basic change class. Clean this up and unify the
functionality in the base class.

In addition adjust the class to the new data layout.

Change-Id: I8677f6c71465381f7ebdf82eb6025fda6d137ec3
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

1 files changed, 5 insertions, 5 deletions

diff --git a/src/qml/util/qqmllistcompositor_p.h b/src/qml/util/qqmllistcompositor_p.h
index 5d87051582..c26b62a38c 100644
--- a/src/qml/util/qqmllistcompositor_p.h
+++ b/src/qml/util/qqmllistcompositor_p.h
@@ -263,8 +263,8 @@ public:
     void transition(
             Group from,
             Group to,
-            QVector<QQmlChangeSet::Remove> *removes,
-            QVector<QQmlChangeSet::Insert> *inserts);
+            QVector<QQmlChangeSet::Change> *removes,
+            QVector<QQmlChangeSet::Change> *inserts);
 
 private:
     Range m_ranges;
@@ -290,13 +290,13 @@ private:
     void listItemsRemoved(
             QVector<Remove> *translatedRemovals,
             void *list,
-            QVector<QQmlChangeSet::Remove> *removals,
-            QVector<QQmlChangeSet::Insert> *insertions = 0,
+            QVector<QQmlChangeSet::Change> *removals,
+            QVector<QQmlChangeSet::Change> *insertions = 0,
             QVector<MovedFlags> *movedFlags = 0);
     void listItemsInserted(
             QVector<Insert> *translatedInsertions,
             void *list,
-            const QVector<QQmlChangeSet::Insert> &insertions,
+            const QVector<QQmlChangeSet::Change> &insertions,
             const QVector<MovedFlags> *movedFlags = 0);
     void listItemsChanged(
             QVector<Change> *translatedChanges,