Port away from KRun

git/fileviewgitplugin.cpp

@@ -28,7 +28,6 @@
 #include "pulldialog.h"
 
 #include <KLocalizedString>
-#include <KRun>
 #include <KShell>
 #include <KPluginFactory>
 
@@ -438,7 +437,7 @@ void FileViewGitPlugin::showLocalChanges()
 {
     Q_ASSERT(!m_contextDir.isEmpty());
 
-    KRun::runCommand(QLatin1String("git difftool --dir-diff ."), nullptr, m_contextDir);
+    runCommand(QLatin1String("git difftool --dir-diff ."));
 }
 
 void FileViewGitPlugin::showDiff(const QUrl &link)
@@ -446,7 +445,7 @@ void FileViewGitPlugin::showDiff(const QUrl &link)
     if (link.scheme() != QLatin1String("rev")) {
         return;
     }
-    KRun::runCommand(QStringLiteral("git difftool --dir-diff %1^ %1").arg(link.path()), nullptr, m_contextDir);
+    runCommand(QStringLiteral("git difftool --dir-diff %1^ %1").arg(link.path()));
 }
 
 void FileViewGitPlugin::log()
@@ -522,7 +521,7 @@ void FileViewGitPlugin::merge()
 {
     Q_ASSERT(!m_contextDir.isEmpty());
 
-    KRun::runCommand(QStringLiteral("git mergetool"), nullptr, m_contextDir);
+    runCommand(QStringLiteral("git mergetool"));
 }
 
 void FileViewGitPlugin::checkout()

git/fileviewgitplugin.h

@@ -22,6 +22,9 @@
 #define FILEVIEWGITPLUGIN_H
 
 #include <Dolphin/KVersionControlPlugin>
+#include <KIO/CommandLauncherJob>
+#include <KJobUiDelegate>
+#include <KDialogJobUiDelegate>
 
 #include <KFileItem>
 
@@ -129,6 +132,15 @@ private:
     //Current targets. m_contextItems is used if and only if m_contextDir is empty.
     mutable QString m_contextDir;
     mutable KFileItemList m_contextItems;
+
+    // Utility method, because the method call is the same except for the command
+    void runCommand(const QString &command)
+    {
+        auto *job = new KIO::CommandLauncherJob(command);
+        job->setWorkingDirectory(m_currentDir);
+        job->setUiDelegate(new KDialogJobUiDelegate(KJobUiDelegate::AutoHandlingEnabled, nullptr));
+        job->start();
+    }
 };
 #endif // FILEVIEWGITPLUGIN_H
 

svn/fileviewsvnplugin.cpp

@@ -22,7 +22,6 @@
 #include "fileviewsvnpluginsettings.h"
 
 #include <KLocalizedString>
-#include <KRun>
 #include <KShell>
 #include <KPluginFactory>