Make use of the error messages coming from the places model.

[dolphin.git] / src / dolphinapplication.cpp

diff --git a/src/dolphinapplication.cpp b/src/dolphinapplication.cpp
index a3dc80fef6bfa051fcf9b1b454ee84af1b885967..e0e1c594044e3055679a16aa27e5f369678b329e 100644 (file)
--- a/src/dolphinapplication.cpp
+++ b/src/dolphinapplication.cpp
@@ -20,11 +20,11 @@
 
 #include "dolphinapplication.h"
 #include "dolphinmainwindow.h"
+#include "dolphinviewcontainer.h"
 
 #include <applicationadaptor.h>
 #include <kcmdlineargs.h>
 #include <kurl.h>
-#include <QDir>
 #include <QtDBus/QDBusConnection>
 
 DolphinApplication::DolphinApplication() :
@@ -77,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();
@@ -88,16 +88,11 @@ int DolphinApplication::newInstance()
     return exitValue;
 }
 
-int DolphinApplication::openWindow(const QString& url)
+int DolphinApplication::openWindow(const KUrl& url)
 {
-    QString dir = url;
-    if (dir == ".") {
-        dir = QDir::currentPath();
-    }
-
     DolphinMainWindow* win = createMainWindow();
-    if ((win->activeView() != 0) && !dir.isEmpty()) {
-        win->activeView()->setUrl(KUrl(dir));
+    if ((win->activeViewContainer() != 0) && url.isValid()) {
+        win->activeViewContainer()->setUrl(url);
     }
     win->show();
     return win->getId();