X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/6ee9f08e8fc90cc67cd2ed83ae6f2dd5c1846ba3..6abcaedfb08e0a9f4a11ca4f6a1f29ccc713d974:/src/dolphinapplication.cpp

diff --git a/src/dolphinapplication.cpp b/src/dolphinapplication.cpp
index 9e6d0565f..ea18db132 100644
--- a/src/dolphinapplication.cpp
+++ b/src/dolphinapplication.cpp
@@ -20,11 +20,13 @@
 
 #include "dolphinapplication.h"
 #include "dolphinmainwindow.h"
+#include "dolphinviewcontainer.h"
 
 #include <applicationadaptor.h>
 #include <kcmdlineargs.h>
 #include <kurl.h>
-#include <QDBusConnection>
+#include <QtDBus/QDBusConnection>
+#include <QtCore/QDir>
 
 DolphinApplication::DolphinApplication() :
     m_lastId(0)
@@ -73,14 +75,14 @@ int DolphinApplication::newInstance()
 {
     int exitValue = KUniqueApplication::newInstance();
 
+    KCmdLineArgs::setCwd(QDir::currentPath().toUtf8());
     KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
     if (args->count() > 0) {
         for (int i = 0; i < args->count(); ++i) {
-            openWindow(args->arg(i));
+            openWindow(args->url(i));
         }
-    }
-    else {
-        openWindow(QString());
+    } else {
+        openWindow(KUrl());
     }
 
     args->clear();
@@ -88,11 +90,11 @@ int DolphinApplication::newInstance()
     return exitValue;
 }
 
-int DolphinApplication::openWindow(const QString& url)
+int DolphinApplication::openWindow(const KUrl& url)
 {
     DolphinMainWindow* win = createMainWindow();
-    if ((win->activeView() != 0) && !url.isEmpty()) {
-        win->activeView()->setUrl(KUrl(url));
+    if ((win->activeViewContainer() != 0) && url.isValid()) {
+        win->activeViewContainer()->setUrl(url);
     }
     win->show();
     return win->getId();