SVN_SILENT made messages (.desktop file) - always resolve ours

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

diff --git a/src/views/versioncontrol/updateitemstatesthread.cpp b/src/views/versioncontrol/updateitemstatesthread.cpp
index 6457f607dadd553c48b0944213a75ff62e80a461..0a183b4a58e1391978660f892890307b5823c86e 100644 (file)
--- a/src/views/versioncontrol/updateitemstatesthread.cpp
+++ b/src/views/versioncontrol/updateitemstatesthread.cpp
@@ -19,14 +19,11 @@
 
 #include "updateitemstatesthread.h"
 
 
 #include "updateitemstatesthread.h"
 

-#include <kversioncontrolplugin2.h>
-
-#include <QMutexLocker>

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

-    m_globalPluginMutex(0),
+    m_globalPluginMutex(nullptr),

     m_plugin(plugin),
     m_itemStates(itemStates)
 {
     m_plugin(plugin),
     m_itemStates(itemStates)
 {


@@ -52,21 +49,14 @@ void UpdateItemStatesThread::run()
         if (m_plugin->beginRetrieval(it.key())) {
             QVector<VersionControlObserver::ItemState>& items = it.value();
             const int count = items.count();
         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) {
-                    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);
-                }
+            for (int i = 0; i < count; ++i) {
+                const KFileItem& item = items.at(i).first;
+                const KVersionControlPlugin::ItemVersion version = m_plugin->itemVersion(item);
+                items[i].second = version;

             }
             }

-
-            m_plugin->endRetrieval();

         }
         }

+
+        m_plugin->endRetrieval();

     }
 }
 
     }
 }
 


@@ -75,4 +65,3 @@ QMap<QString, QVector<VersionControlObserver::ItemState> > UpdateItemStatesThrea
     return m_itemStates;
 }
 
     return m_itemStates;
 }
 

-#include "updateitemstatesthread.moc"