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 e6bd761cc47ebe52899f3f8cf414c078d4051456..4f0122e0f1db1431391dbca0e85c88bc19dcf74c 100644 (file)
--- a/src/views/versioncontrol/updateitemstatesthread.cpp
+++ b/src/views/versioncontrol/updateitemstatesthread.cpp
@@ -19,15 +19,17 @@
 
 #include "updateitemstatesthread.h"
 
 
 #include "updateitemstatesthread.h"
 

+#include <kversioncontrolplugin2.h>
+#include <QVector>
+

 #include <QMutexLocker>
 
 #include <QMutexLocker>
 

-UpdateItemStatesThread::UpdateItemStatesThread() :
+UpdateItemStatesThread::UpdateItemStatesThread(KVersionControlPlugin* plugin,
+                                               const QMap<QString, QVector<VersionControlObserver::ItemState> >& itemStates) :

     QThread(),
     m_globalPluginMutex(0),
     QThread(),
     m_globalPluginMutex(0),

-    m_plugin(0),
-    m_itemMutex(),
-    m_retrievedItems(false),
-    m_itemStates()
+    m_plugin(plugin),
+    m_itemStates(itemStates)

 {
     // Several threads may share one instance of a plugin. A global
     // mutex is required to serialize the retrieval of version control
 {
     // Several threads may share one instance of a plugin. A global
     // mutex is required to serialize the retrieval of version control


@@ -40,62 +42,40 @@ 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);
 
 void UpdateItemStatesThread::run()
 {
     Q_ASSERT(!m_itemStates.isEmpty());
     Q_ASSERT(m_plugin);
 

-    // The items from m_itemStates may be located in different directory levels. The version
-    // plugin requires the root directory for KVersionControlPlugin::beginRetrieval(). Instead
-    // of doing an expensive search, we utilize the knowledge of the implementation of
-    // VersionControlObserver::addDirectory() to be sure that the last item contains the root.
-    QMutexLocker itemLocker(&m_itemMutex);
-    const QString directory = m_itemStates.last().item.url().directory(KUrl::AppendTrailingSlash);
-    itemLocker.unlock();
-

     QMutexLocker pluginLocker(m_globalPluginMutex);
     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);
+    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 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 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();

-        m_retrievedItems = true;

     }
 }
 
     }
 }
 

-bool UpdateItemStatesThread::lockPlugin()
+QMap<QString, QVector<VersionControlObserver::ItemState> > UpdateItemStatesThread::itemStates() const

 {
 {

-    return m_globalPluginMutex->tryLock(300);
-}
-
-void UpdateItemStatesThread::unlockPlugin()
-{
-    m_globalPluginMutex->unlock();
-}
-
-QList<VersionControlObserver::ItemState> UpdateItemStatesThread::itemStates() const
-{
-    QMutexLocker locker(&m_itemMutex);

     return m_itemStates;
 }
 
     return m_itemStates;
 }
 

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