Don't store the index of the file item in the VersionControlObserver::ItemState,...

Fixes some "old"-index problems, esp. when you copy/move around files while the version control thread is still running.

FIXED-IN: 4.13
REVIEW: 115410

diff --git a/src/views/versioncontrol/versioncontrolobserver.cpp b/src/views/versioncontrol/versioncontrolobserver.cpp
index 888d93461134398fcf7ed58d9f9a95f7692c7016..36345d986fa839a758f283a9e4f30242c73f8526 100644 (file)
--- a/src/views/versioncontrol/versioncontrolobserver.cpp
+++ b/src/views/versioncontrol/versioncontrolobserver.cpp
@@ -206,7 +206,7 @@ void VersionControlObserver::slotThreadFinished()
         foreach (const ItemState& item, items) {
             QHash<QByteArray, QVariant> values;
             values.insert("version", QVariant(item.version));
-            m_model->setData(item.index, values);
+            m_model->setData(m_model->index(item.item), values);
         }
     }
 
@@ -265,7 +265,6 @@ int VersionControlObserver::createItemStatesList(QMap<QString, QVector<ItemState
 
         if (expansionLevel == currentExpansionLevel) {
             ItemState itemState;
-            itemState.index = index;
             itemState.item = m_model->fileItem(index);
             itemState.version = KVersionControlPlugin2::UnversionedVersion;
 

diff --git a/src/views/versioncontrol/versioncontrolobserver.h b/src/views/versioncontrol/versioncontrolobserver.h
index 980374af97e7af70d861f276672df88ed93303cd..d12d2cfe07592d1aff3b1b8ef46d7aef3ebd2aca 100644 (file)
--- a/src/views/versioncontrol/versioncontrolobserver.h
+++ b/src/views/versioncontrol/versioncontrolobserver.h
@@ -102,7 +102,6 @@ private slots:
 private:
     struct ItemState
     {
-        int index;
         KFileItem item;
         KVersionControlPlugin2::ItemVersion version;
     };