Update ListModel's internal indexes when items are inserted/removed.

The changed signals of cached items were being emitted with
incorrect indexes if a previous item in the list was inserted or
removed, resulting in changes not being reflected in views.

Task-number: QTBUG-20286
Change-Id: Id2fb8e2875c6cbd4f2e4d14ef859b7a7a4bac8d9
Reviewed-on: http://codereview.qt.nokia.com/2252
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bea Lam <bea.lam@nokia.com>

1 files changed, 15 insertions, 0 deletions

diff --git a/src/declarative/util/qdeclarativelistmodel.cpp b/src/declarative/util/qdeclarativelistmodel.cpp
index 8659c5b7aa..e35d64b179 100644
--- a/src/declarative/util/qdeclarativelistmodel.cpp
+++ b/src/declarative/util/qdeclarativelistmodel.cpp
@@ -1373,6 +1373,11 @@ void NestedListModel::remove(int index)
         return;
     ModelNode *node = qvariant_cast<ModelNode *>(_root->values.at(index));
     _root->values.removeAt(index);
+    for (int i = 0; i < _root->values.count(); ++i) {
+        ModelNode *node = qvariant_cast<ModelNode *>(_root->values.at(i));
+        if (node)
+            node->listIndex = i;
+    }
     if (node)
         delete node;
 }
@@ -1388,6 +1393,11 @@ bool NestedListModel::insert(int index, v8::Handle<v8::Value> valuemap)
     mn->listIndex = index;
     mn->setObjectValue(valuemap);
     _root->values.insert(index,QVariant::fromValue(mn));
+    for (int i = index + 1; i < _root->values.count(); ++i) {
+        ModelNode *node = qvariant_cast<ModelNode *>(_root->values.at(i));
+        if (node)
+            node->listIndex = i;
+    }
     return true;
 }
 
@@ -1396,6 +1406,11 @@ void NestedListModel::move(int from, int to, int n)
     if (!_root)
         return;
     qdeclarativelistmodel_move<QVariantList>(from, to, n, &_root->values);
+    for (int i = qMin(from, to), end = qMin(_root->values.count(), qMax(from, to) + n); i < end; ++i) {
+        ModelNode *node = qvariant_cast<ModelNode *>(_root->values.at(i));
+        if (node)
+            node->listIndex = i;
+    }
 }
 
 v8::Handle<v8::Value> NestedListModel::get(int index) const