X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/be629fe8501941138da849cf1179ad67cd5570cb..e57f6215659ee36877c7c36c9e3fcba0ba5d03a0:/src/views/versioncontrol/updateitemstatesthread.cpp

diff --git a/src/views/versioncontrol/updateitemstatesthread.cpp b/src/views/versioncontrol/updateitemstatesthread.cpp
index 1fa3a6255..c008d1d03 100644
--- a/src/views/versioncontrol/updateitemstatesthread.cpp
+++ b/src/views/versioncontrol/updateitemstatesthread.cpp
@@ -1,33 +1,16 @@
-/***************************************************************************
- *   Copyright (C) 2009 by Peter Penz <peter.penz19@gmail.com>             *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
- ***************************************************************************/
+/*
+ * SPDX-FileCopyrightText: 2009 Peter Penz <peter.penz19@gmail.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
 
 #include "updateitemstatesthread.h"
 
-#include <QMutexLocker>
-
-UpdateItemStatesThread::UpdateItemStatesThread() :
-    QThread(),
-    m_globalPluginMutex(0),
-    m_plugin(0),
-    m_itemMutex(),
-    m_retrievedItems(false),
-    m_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
@@ -40,58 +23,30 @@ 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();
 
     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() && !isInterruptionRequested(); ++it) {
+        if (m_plugin->beginRetrieval(it.key())) {
+            QVector<VersionControlObserver::ItemState> &items = it.value();
+            const int count = items.count();
+            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;
+            }
         }
+
         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;
 }
 
-bool UpdateItemStatesThread::retrievedItems() const
-{
-    QMutexLocker locker(&m_itemMutex);
-    return m_retrievedItems;
-}
-
-#include "updateitemstatesthread.moc"
+#include "moc_updateitemstatesthread.cpp"