versioncontrol: Prevent a use-after-free in UpdateItemStatesThread

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

diff --git a/src/views/versioncontrol/versioncontrolobserver.cpp b/src/views/versioncontrol/versioncontrolobserver.cpp
index 28fbbef1a485968bf6f1b105581afa47086ab3a7..64f8843d29f22ae5ebdfceda48a854f61a3c4493 100644 (file)
--- a/src/views/versioncontrol/versioncontrolobserver.cpp
+++ b/src/views/versioncontrol/versioncontrolobserver.cpp
@@ -105,7 +105,7 @@ QList<QAction *> VersionControlObserver::actions(const KFileItemList &items) con
         return m_plugin->versionControlActions(items);
     } else {
         QList<QAction *> actions;
-        for (const QPointer<KVersionControlPlugin> &plugin : qAsConst(m_plugins)) {
+        for (const QPointer<KVersionControlPlugin> &plugin : std::as_const(m_plugins)) {
             actions << plugin->outOfVersionControlActions(items);
         }
         return actions;
@@ -218,7 +218,7 @@ void VersionControlObserver::updateItemStates()
 
     if (!itemStates.isEmpty()) {
         if (!m_silentUpdate) {
-            Q_EMIT infoMessage(i18nc("@info:status", "Updating version information..."));
+            Q_EMIT infoMessage(i18nc("@info:status", "Updating version information…"));
         }
         m_updateItemStatesThread = new UpdateItemStatesThread(m_plugin, itemStates);
         connect(m_updateItemStatesThread, &UpdateItemStatesThread::finished, this, &VersionControlObserver::slotThreadFinished);
@@ -283,7 +283,7 @@ void VersionControlObserver::initPlugins()
             }
         }
 
-        for (auto &plugin : qAsConst(m_plugins)) {
+        for (auto &plugin : std::as_const(m_plugins)) {
             connect(plugin, &KVersionControlPlugin::itemVersionsChanged, this, &VersionControlObserver::silentDirectoryVerification);
             connect(plugin, &KVersionControlPlugin::infoMessage, this, &VersionControlObserver::infoMessage);
             connect(plugin, &KVersionControlPlugin::errorMessage, this, &VersionControlObserver::errorMessage);
@@ -299,7 +299,7 @@ KVersionControlPlugin *VersionControlObserver::searchPlugin(const QUrl &director
     initPlugins();
 
     // Verify whether the current directory is under a version system
-    for (const QPointer<KVersionControlPlugin> &plugin : qAsConst(m_plugins)) {
+    for (const QPointer<KVersionControlPlugin> &plugin : std::as_const(m_plugins)) {
         if (!plugin) {
             continue;
         }
@@ -323,3 +323,5 @@ bool VersionControlObserver::isVersionControlled() const
 {
     return m_plugin != nullptr;
 }
+
+#include "moc_versioncontrolobserver.cpp"