[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kde-baseapps] dolphin/src/views/versioncontrol: Don't store the index of the file item in the Versi
From:       Emmanuel Pescosta <emmanuelpescosta099 () gmail ! com>
Date:       2014-01-31 19:59:19
Message-ID: E1W9KFD-0005hj-HE () scm ! kde ! org
[Download RAW message or body]

Git commit 47c8eebe96d548497dc6b46517c6f14534e8ab8c by Emmanuel Pescosta.
Committed on 31/01/2014 at 19:56.
Pushed by emmanuelp into branch 'master'.

Don't store the index of the file item in the VersionControlObserver::ItemState, get \
the index of the file item on demand instead.

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

M  +1    -2    dolphin/src/views/versioncontrol/versioncontrolobserver.cpp
M  +0    -1    dolphin/src/views/versioncontrol/versioncontrolobserver.h

http://commits.kde.org/kde-baseapps/47c8eebe96d548497dc6b46517c6f14534e8ab8c

diff --git a/dolphin/src/views/versioncontrol/versioncontrolobserver.cpp \
b/dolphin/src/views/versioncontrol/versioncontrolobserver.cpp index 888d934..36345d9 \
                100644
--- a/dolphin/src/views/versioncontrol/versioncontrolobserver.cpp
+++ b/dolphin/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/dolphin/src/views/versioncontrol/versioncontrolobserver.h \
b/dolphin/src/views/versioncontrol/versioncontrolobserver.h index 980374a..d12d2cf \
                100644
--- a/dolphin/src/views/versioncontrol/versioncontrolobserver.h
+++ b/dolphin/src/views/versioncontrol/versioncontrolobserver.h
@@ -102,7 +102,6 @@ private slots:
 private:
     struct ItemState
     {
-        int index;
         KFileItem item;
         KVersionControlPlugin2::ItemVersion version;
     };


[prev in list] [next in list] [prev in thread] [next in thread]