Replaced the ItemState structure with QPair<KFileItem, KVersionControlPlugin2::ItemVe...

[dolphin.git] / src / views / versioncontrol / updateitemstatesthread.cpp

diff --git a/src/views/versioncontrol/updateitemstatesthread.cpp b/src/views/versioncontrol/updateitemstatesthread.cpp
index 6457f607dadd553c48b0944213a75ff62e80a461..4f0122e0f1db1431391dbca0e85c88bc19dcf74c 100644 (file)
--- a/src/views/versioncontrol/updateitemstatesthread.cpp
+++ b/src/views/versioncontrol/updateitemstatesthread.cpp
@@ -20,6 +20,7 @@
 #include "updateitemstatesthread.h"
 
 #include <kversioncontrolplugin2.h>
+#include <QVector>
 
 #include <QMutexLocker>
 
@@ -56,17 +57,20 @@ void UpdateItemStatesThread::run()
             KVersionControlPlugin2* pluginV2 = qobject_cast<KVersionControlPlugin2*>(m_plugin);
             if (pluginV2) {
                 for (int i = 0; i < count; ++i) {
-                    items[i].version = pluginV2->itemVersion(items[i].item);
+                    const KFileItem& item = items.at(i).first;
+                    const KVersionControlPlugin2::ItemVersion version = pluginV2->itemVersion(item);
+                    items[i].second = version;
                 }
             } else {
                 for (int i = 0; i < count; ++i) {
-                    const KVersionControlPlugin::VersionState state = m_plugin->versionState(items[i].item);
-                    items[i].version = static_cast<KVersionControlPlugin2::ItemVersion>(state);
+                    const KFileItem& item = items.at(i).first;
+                    const KVersionControlPlugin::VersionState state = m_plugin->versionState(item);
+                    items[i].second = static_cast<KVersionControlPlugin2::ItemVersion>(state);
                 }
             }
-
-            m_plugin->endRetrieval();
         }
+
+        m_plugin->endRetrieval();
     }
 }
 
@@ -75,4 +79,3 @@ QMap<QString, QVector<VersionControlObserver::ItemState> > UpdateItemStatesThrea
     return m_itemStates;
 }
 
-#include "updateitemstatesthread.moc"