X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/c8a4f1fd8d3c9b50e51b7234123b3fbe0b979552..ec00f379dc42b00a64ab1af25bb4bb1a06bd7449:/src/dolphinapplication.cpp

diff --git a/src/dolphinapplication.cpp b/src/dolphinapplication.cpp
index ad345dbeb..e0e1c5940 100644
--- a/src/dolphinapplication.cpp
+++ b/src/dolphinapplication.cpp
@@ -20,14 +20,15 @@
 
 #include "dolphinapplication.h"
 #include "dolphinmainwindow.h"
+#include "dolphinviewcontainer.h"
 
 #include <applicationadaptor.h>
 #include <kcmdlineargs.h>
 #include <kurl.h>
-#include <QDBusConnection>
+#include <QtDBus/QDBusConnection>
 
 DolphinApplication::DolphinApplication() :
-        m_lastId(0)
+    m_lastId(0)
 {
     new ApplicationAdaptor(this);
     QDBusConnection::sessionBus().registerObject("/dolphin/Application", this);
@@ -76,10 +77,10 @@ int DolphinApplication::newInstance()
     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());
+        openWindow(KUrl());
     }
 
     args->clear();
@@ -87,11 +88,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();