Switch to C++20

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

diff --git a/src/views/versioncontrol/updateitemstatesthread.cpp b/src/views/versioncontrol/updateitemstatesthread.cpp
index cf45bbff16325354045abd3702be0440ff741335..c008d1d03e839eca4f46edf907f87a6b32b0bafa 100644 (file)
--- a/src/views/versioncontrol/updateitemstatesthread.cpp
+++ b/src/views/versioncontrol/updateitemstatesthread.cpp
@@ -6,13 +6,11 @@
 
 #include "updateitemstatesthread.h"
 
 
 #include "updateitemstatesthread.h"
 

-
-UpdateItemStatesThread::UpdateItemStatesThread(KVersionControlPlugin* plugin,
-                                               const QMap<QString, QVector<VersionControlObserver::ItemState> >& itemStates) :
-    QThread(),
-    m_globalPluginMutex(nullptr),
-    m_plugin(plugin),
-    m_itemStates(itemStates)
+UpdateItemStatesThread::UpdateItemStatesThread(KVersionControlPlugin *plugin, const QMap<QString, QVector<VersionControlObserver::ItemState>> &itemStates)
+    : QThread()
+    , m_globalPluginMutex(nullptr)
+    , 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


@@ -28,16 +26,15 @@ UpdateItemStatesThread::~UpdateItemStatesThread()
 void UpdateItemStatesThread::run()
 {
     Q_ASSERT(!m_itemStates.isEmpty());
 void UpdateItemStatesThread::run()
 {
     Q_ASSERT(!m_itemStates.isEmpty());

-    Q_ASSERT(m_plugin);

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

-    QMap<QString, QVector<VersionControlObserver::ItemState> >::iterator it = m_itemStates.begin();
-    for (; it != m_itemStates.end(); ++it) {
+    QMap<QString, QVector<VersionControlObserver::ItemState>>::iterator it = m_itemStates.begin();
+    for (; it != m_itemStates.end() && !isInterruptionRequested(); ++it) {

         if (m_plugin->beginRetrieval(it.key())) {
         if (m_plugin->beginRetrieval(it.key())) {

-            QVector<VersionControlObserver::ItemState>& items = it.value();
+            QVector<VersionControlObserver::ItemState> &items = it.value();

             const int count = items.count();
             const int count = items.count();

-            for (int i = 0; i < count; ++i) {
-                const KFileItem& item = items.at(i).first;
+            for (int i = 0; i < count && !isInterruptionRequested(); ++i) {
+                const KFileItem &item = items.at(i).first;

                 const KVersionControlPlugin::ItemVersion version = m_plugin->itemVersion(item);
                 items[i].second = version;
             }
                 const KVersionControlPlugin::ItemVersion version = m_plugin->itemVersion(item);
                 items[i].second = version;
             }


@@ -47,8 +44,9 @@ void UpdateItemStatesThread::run()
     }
 }
 
     }
 }
 

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

 {
     return m_itemStates;
 }
 
 {
     return m_itemStates;
 }
 

+#include "moc_updateitemstatesthread.cpp"