diff options
| author | David Faure <[email protected]> | 2020-04-05 13:44:12 +0200 |
|---|---|---|
| committer | David Faure <[email protected]> | 2020-04-05 20:33:30 +0200 |
| commit | 40035fe5bf4d146ba1d480493ddb1da2779180af (patch) | |
| tree | 1d48751e807b303dcd3a5f7c963732e23dfe4213 /src | |
| parent | 924499a27933895b690036360c5e05f9e592fd79 (diff) | |
Dolphin: port to CommandLauncherJob
Summary: git master already requires 5.69 anyway, due to KBookmarkMenu API change
Test Plan: Builds, Tools / Compare Files works.
Reviewers: broulik, elvisangelaccio, meven
Reviewed By: elvisangelaccio, meven
Subscribers: kfm-devel
Tags: #dolphin
Differential Revision: https://phabricator.kde.org/D28589
Diffstat (limited to 'src')
| -rw-r--r-- | src/dolphinmainwindow.cpp | 6 | ||||
| -rw-r--r-- | src/dolphintabwidget.cpp | 7 |
2 files changed, 9 insertions, 4 deletions
diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp index f88bc3f44..9fe870044 100644 --- a/src/dolphinmainwindow.cpp +++ b/src/dolphinmainwindow.cpp @@ -53,6 +53,7 @@ #include <KDualAction> #include <KFileItemListProperties> #include <KHelpMenu> +#include <KIO/CommandLauncherJob> #include <KIO/JobUiDelegate> #include <KIO/OpenFileManagerWindowJob> #include <KJobWidgets> @@ -926,7 +927,10 @@ void DolphinMainWindow::compareFiles() command.append("\" \""); command.append(urlB.toDisplayString(QUrl::PreferLocalFile)); command.append('\"'); - KRun::runCommand(command, QStringLiteral("Kompare"), QStringLiteral("kompare"), this); + + KIO::CommandLauncherJob *job = new KIO::CommandLauncherJob(command, this); + job->setDesktopName(QStringLiteral("org.kde.kompare")); + job->start(); } void DolphinMainWindow::toggleShowMenuBar() diff --git a/src/dolphintabwidget.cpp b/src/dolphintabwidget.cpp index 89c54baf5..fba6fe084 100644 --- a/src/dolphintabwidget.cpp +++ b/src/dolphintabwidget.cpp @@ -25,9 +25,9 @@ #include "dolphinviewcontainer.h" #include <KConfigGroup> -#include <KRun> #include <KShell> #include <kio/global.h> +#include <KIO/CommandLauncherJob> #include <KAcceleratorManager> #include <QApplication> @@ -334,8 +334,9 @@ void DolphinTabWidget::detachTab(int index) } args << QStringLiteral("--new-window"); - const QString command = QStringLiteral("dolphin %1").arg(KShell::joinArgs(args)); - KRun::runCommand(command, this); + KIO::CommandLauncherJob *job = new KIO::CommandLauncherJob("dolphin", args, this); + job->setDesktopName(QStringLiteral("org.kde.dolphin")); + job->start(); closeTab(index); } |