Merge branch 'master' of git.kde.org:dolphin

[dolphin.git] / src / global.cpp

diff --git a/src/global.cpp b/src/global.cpp
index 2f23ae4d4c36cee336bc8cf6d4e193fd3a086d5f..3d6d7dd5e7b7d4ec6c0f3af89aa9bb967820f59f 100644 (file)
--- a/src/global.cpp
+++ b/src/global.cpp
@@ -20,11 +20,14 @@
 #include "global.h"
 #include "dolphindebug.h"
 
+#include "dolphin_generalsettings.h"
+
 QList<QUrl> Dolphin::validateUris(const QStringList& uriList)
 {
+    const QString currentDir = QDir::currentPath();
     QList<QUrl> urls;
     foreach (const QString& str, uriList) {
-        const QUrl url = QUrl::fromUserInput(str, QString(), QUrl::AssumeLocalFile);
+        const QUrl url = QUrl::fromUserInput(str, currentDir, QUrl::AssumeLocalFile);
         if (url.isValid()) {
             urls.append(url);
         } else {
@@ -33,3 +36,8 @@ QList<QUrl> Dolphin::validateUris(const QStringList& uriList)
     }
     return urls;
 }
+
+QUrl Dolphin::homeUrl()
+{
+    return QUrl::fromUserInput(GeneralSettings::homeUrl(), QString(), QUrl::AssumeLocalFile);
+}