Fix for crash which was introduced by commit

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

diff --git a/src/views/versioncontrol/updateitemstatesthread.cpp b/src/views/versioncontrol/updateitemstatesthread.cpp
index 6be07d361a98a865c9f1f00ea8921099653bb5d1..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 "updateitemstatesthread.h"
 
 #include <kversioncontrolplugin2.h>

+#include <QVector>

 
 #include <QMutexLocker>
 
 
 #include <QMutexLocker>
 


@@ -28,7 +29,6 @@ UpdateItemStatesThread::UpdateItemStatesThread(KVersionControlPlugin* plugin,
     QThread(),
     m_globalPluginMutex(0),
     m_plugin(plugin),
     QThread(),
     m_globalPluginMutex(0),
     m_plugin(plugin),

-    m_retrievedItems(false),

     m_itemStates(itemStates)
 {
     // Several threads may share one instance of a plugin. A global
     m_itemStates(itemStates)
 {
     // Several threads may share one instance of a plugin. A global


@@ -47,40 +47,31 @@ void UpdateItemStatesThread::run()
     Q_ASSERT(!m_itemStates.isEmpty());
     Q_ASSERT(m_plugin);
 
     Q_ASSERT(!m_itemStates.isEmpty());
     Q_ASSERT(m_plugin);
 

-    m_retrievedItems = false;
-

     QMutexLocker pluginLocker(m_globalPluginMutex);
     QMutexLocker pluginLocker(m_globalPluginMutex);

-    foreach (const QString& directory, m_itemStates.keys()) {
-        if (m_plugin->beginRetrieval(directory)) {
-            QVector<VersionControlObserver::ItemState>& items = m_itemStates[directory];
+    QMap<QString, QVector<VersionControlObserver::ItemState> >::iterator it = m_itemStates.begin();
+    for (; it != m_itemStates.end(); ++it) {
+        if (m_plugin->beginRetrieval(it.key())) {
+            QVector<VersionControlObserver::ItemState>& items = it.value();

             const int count = items.count();
 
             KVersionControlPlugin2* pluginV2 = qobject_cast<KVersionControlPlugin2*>(m_plugin);
             if (pluginV2) {
                 for (int i = 0; i < count; ++i) {
             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);
+                    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) {
                 }
             } 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_retrievedItems = true;

         }
         }

-    }
-}
-
-bool UpdateItemStatesThread::lockPlugin()
-{
-    return m_globalPluginMutex->tryLock(300);
-}

 
 

-void UpdateItemStatesThread::unlockPlugin()
-{
-    m_globalPluginMutex->unlock();
+        m_plugin->endRetrieval();
+    }

 }
 
 QMap<QString, QVector<VersionControlObserver::ItemState> > UpdateItemStatesThread::itemStates() const
 }
 
 QMap<QString, QVector<VersionControlObserver::ItemState> > UpdateItemStatesThread::itemStates() const


@@ -88,9 +79,3 @@ QMap<QString, QVector<VersionControlObserver::ItemState> > UpdateItemStatesThrea
     return m_itemStates;
 }
 
     return m_itemStates;
 }
 

-bool UpdateItemStatesThread::retrievedItems() const
-{
-    return m_retrievedItems;
-}
-
-#include "updateitemstatesthread.moc"