Show the right version states for expanded items.

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

diff --git a/src/views/versioncontrol/updateitemstatesthread.cpp b/src/views/versioncontrol/updateitemstatesthread.cpp
index 1fa3a6255c815f7029b9fda4a377af1eea925605..6be07d361a98a865c9f1f00ea8921099653bb5d1 100644 (file)
--- a/src/views/versioncontrol/updateitemstatesthread.cpp
+++ b/src/views/versioncontrol/updateitemstatesthread.cpp
@@ -19,15 +19,17 @@
 
 #include "updateitemstatesthread.h"
 
+#include <kversioncontrolplugin2.h>
+
 #include <QMutexLocker>
 
-UpdateItemStatesThread::UpdateItemStatesThread() :
+UpdateItemStatesThread::UpdateItemStatesThread(KVersionControlPlugin* plugin,
+                                               const QMap<QString, QVector<VersionControlObserver::ItemState> >& itemStates) :
     QThread(),
     m_globalPluginMutex(0),
-    m_plugin(0),
-    m_itemMutex(),
+    m_plugin(plugin),
     m_retrievedItems(false),
-    m_itemStates()
+    m_itemStates(itemStates)
 {
     // Several threads may share one instance of a plugin. A global
     // mutex is required to serialize the retrieval of version control
@@ -40,35 +42,34 @@ UpdateItemStatesThread::~UpdateItemStatesThread()
 {
 }
 
-void UpdateItemStatesThread::setData(KVersionControlPlugin* plugin,
-                                     const QList<VersionControlObserver::ItemState>& itemStates)
-{
-    QMutexLocker itemLocker(&m_itemMutex);
-    m_itemStates = itemStates;
-
-    QMutexLocker pluginLocker(m_globalPluginMutex);
-    m_plugin = plugin;
-}
-
 void UpdateItemStatesThread::run()
 {
     Q_ASSERT(!m_itemStates.isEmpty());
     Q_ASSERT(m_plugin);
 
-    QMutexLocker itemLocker(&m_itemMutex);
-    const QString directory = m_itemStates.first().item.url().directory(KUrl::AppendTrailingSlash);
-    itemLocker.unlock();
+    m_retrievedItems = false;
 
     QMutexLocker pluginLocker(m_globalPluginMutex);
-    m_retrievedItems = false;
-    if (m_plugin->beginRetrieval(directory)) {
-        itemLocker.relock();
-        const int count = m_itemStates.count();
-        for (int i = 0; i < count; ++i) {
-            m_itemStates[i].version = m_plugin->versionState(m_itemStates[i].item);
+    foreach (const QString& directory, m_itemStates.keys()) {
+        if (m_plugin->beginRetrieval(directory)) {
+            QVector<VersionControlObserver::ItemState>& items = m_itemStates[directory];
+            const int count = items.count();
+
+            KVersionControlPlugin2* pluginV2 = qobject_cast<KVersionControlPlugin2*>(m_plugin);
+            if (pluginV2) {
+                for (int i = 0; i < count; ++i) {
+                    items[i].version = pluginV2->itemVersion(items[i].item);
+                }
+            } 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);
+                }
+            }
+
+            m_plugin->endRetrieval();
+            m_retrievedItems = true;
         }
-        m_plugin->endRetrieval();
-        m_retrievedItems = true;
     }
 }
 
@@ -82,15 +83,13 @@ void UpdateItemStatesThread::unlockPlugin()
     m_globalPluginMutex->unlock();
 }
 
-QList<VersionControlObserver::ItemState> UpdateItemStatesThread::itemStates() const
+QMap<QString, QVector<VersionControlObserver::ItemState> > UpdateItemStatesThread::itemStates() const
 {
-    QMutexLocker locker(&m_itemMutex);
     return m_itemStates;
 }
 
 bool UpdateItemStatesThread::retrievedItems() const
 {
-    QMutexLocker locker(&m_itemMutex);
     return m_retrievedItems;
 }