X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/7042c6c2899a4e46a095a38ee1481b63ca4b96d8..099da00df66e097d635783b359e4e186f46e4c08:/src/dbusinterface.cpp

diff --git a/src/dbusinterface.cpp b/src/dbusinterface.cpp
index b12347607..e5192f207 100644
--- a/src/dbusinterface.cpp
+++ b/src/dbusinterface.cpp
@@ -20,17 +20,15 @@
 #include "dbusinterface.h"
 #include "global.h"
 
-#include <QDBusConnection>
-#include <QList>
-#include <QUrl>
 #include <KPropertiesDialog>
-#include <KRun>
+
+#include <QDBusConnection>
 
 DBusInterface::DBusInterface() :
     QObject()
 {
-    QDBusConnection::sessionBus().registerService("org.freedesktop.FileManager1");
-    QDBusConnection::sessionBus().registerObject("/org/freedesktop/FileManager1", this,
+    QDBusConnection::sessionBus().registerService(QStringLiteral("org.freedesktop.FileManager1"));
+    QDBusConnection::sessionBus().registerObject(QStringLiteral("/org/freedesktop/FileManager1"), this,
             QDBusConnection::ExportScriptableContents | QDBusConnection::ExportAdaptors);
 }
 
@@ -41,7 +39,7 @@ void DBusInterface::ShowFolders(const QStringList& uriList, const QString& start
     if (urls.isEmpty()) {
         return;
     }
-    KRun::run("dolphin %u", urls, nullptr);
+    Dolphin::openNewWindow(urls);
 }
 
 void DBusInterface::ShowItems(const QStringList& uriList, const QString& startUpId)
@@ -51,14 +49,14 @@ void DBusInterface::ShowItems(const QStringList& uriList, const QString& startUp
     if (urls.isEmpty()) {
         return;
     }
-    KRun::run("dolphin --select %u", urls, nullptr);
+    Dolphin::openNewWindow(urls, nullptr, Dolphin::OpenNewWindowFlag::Select);
 }
 
 void DBusInterface::ShowItemProperties(const QStringList& uriList, const QString& startUpId)
 {
     Q_UNUSED(startUpId);
     const QList<QUrl> urls = Dolphin::validateUris(uriList);
-    foreach (const QUrl& url, urls) {
-        KPropertiesDialog::showDialog(url);
+    if (!urls.isEmpty()) {
+        KPropertiesDialog::showDialog(urls);
     }
 }