Fix issues in merge operation.wip/visuallistmodel

Provide a way for internal items to be merged if possible, and
correctly remove the from item from the composite list.

1 files changed, 3 insertions, 2 deletions

diff --git a/src/declarative/util/qdeclarativelistcompositor_p.h b/src/declarative/util/qdeclarativelistcompositor_p.h
index 2d2123ad8c..e3220f1466 100644
--- a/src/declarative/util/qdeclarativelistcompositor_p.h
+++ b/src/declarative/util/qdeclarativelistcompositor_p.h
@@ -106,7 +106,7 @@ public:
     void removeAt(int index, int count);
     void removeList(void *list, QVector<QDeclarativeChangeSet::Remove> *changes);
     void move(int from, int to, int count);
-    bool merge(int from, int to);
+    int merge(int from, int to);
     void clear();
     void clearData(int internalIndex, int count);
 
@@ -128,7 +128,8 @@ protected:
     virtual void replaceInternalData(int index, const void *data) = 0;
     virtual void removeInternalData(int index, int count) = 0;
     virtual void moveInternalData(int from, int to, int count) = 0;
-
+    virtual bool mergeInternalData(int from, int to);
+    virtual bool mergeInternalData(int internalIndex, void *list, int range);
 
 private:
     int absoluteCount;