fix for the fix for the fix [1]: assure that invoking Dolphin with remote URLs like "dolphin ftp://ftp.kde.org/" works too (thanks to David Faure)

[1] I hope this does not get a neverending story ;-)

svn path=/trunk/KDE/kdebase/apps/; revision=665393

1 files changed, 5 insertions, 5 deletions

diff --git a/src/dolphinapplication.cpp b/src/dolphinapplication.cpp
index 85e27811a..4c3273bff 100644
--- a/src/dolphinapplication.cpp
+++ b/src/dolphinapplication.cpp
@@ -76,10 +76,10 @@ int DolphinApplication::newInstance()
     KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
     if (args->count() > 0) {
         for (int i = 0; i < args->count(); ++i) {
-            openWindow(args->url(i).path());
+            openWindow(args->url(i));
         }
     } else {
-        openWindow(QString());
+        openWindow(KUrl());
     }
 
     args->clear();
@@ -87,11 +87,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->activeView() != 0) && url.isValid()) {
+        win->activeView()->setUrl(url);
     }
     win->show();
     return win->getId();