port Dolphin from KUrl to QUrl

REVIEW: 120688

14 files changed, 38 insertions, 39 deletions

diff --git a/src/settings/applyviewpropsjob.cpp b/src/settings/applyviewpropsjob.cpp
index d33d4430f..591966759 100644
--- a/src/settings/applyviewpropsjob.cpp
+++ b/src/settings/applyviewpropsjob.cpp
@@ -23,7 +23,7 @@
 #include "applyviewpropsjob.h"
 #include <views/viewproperties.h>
 
-ApplyViewPropsJob::ApplyViewPropsJob(const KUrl& dir,
+ApplyViewPropsJob::ApplyViewPropsJob(const QUrl& dir,
                                      const ViewProperties& viewProps) :
     KIO::Job(),
     m_viewProps(0),
@@ -56,8 +56,9 @@ void ApplyViewPropsJob::slotEntries(KIO::Job*, const KIO::UDSEntryList& list)
         if (name != QLatin1String(".") && name != QLatin1String("..") && entry.isDir()) {
             ++m_progress;
 
-            KUrl url(m_dir);
-            url.addPath(name);
+            QUrl url(m_dir);
+            url = url.adjusted(QUrl::StripTrailingSlash);
+            url.setPath(url.path() + '/' + name);
 
             Q_ASSERT(m_viewProps);
 
diff --git a/src/settings/applyviewpropsjob.h b/src/settings/applyviewpropsjob.h
index 1d817fe56..297adb823 100644
--- a/src/settings/applyviewpropsjob.h
+++ b/src/settings/applyviewpropsjob.h
@@ -24,7 +24,7 @@
 #define APPLYVIEWPROPSJOB_H
 
 #include <KIO/Job>
-#include <KUrl>
+#include <QUrl>
 
 class ViewProperties;
 
@@ -59,7 +59,7 @@ public:
      * @param viewProps View properties for the directory \a dir including its
      *                  sub directories.
      */
-    ApplyViewPropsJob(const KUrl& dir, const ViewProperties& viewProps);
+    ApplyViewPropsJob(const QUrl& dir, const ViewProperties& viewProps);
     virtual ~ApplyViewPropsJob();
     int progress() const;
 
@@ -71,7 +71,7 @@ private:
     ViewProperties* m_viewProps;
     int m_currentItem;
     int m_progress;
-    KUrl m_dir;
+    QUrl m_dir;
 };
 
 inline int ApplyViewPropsJob::progress() const
diff --git a/src/settings/dolphin_generalsettings.kcfg b/src/settings/dolphin_generalsettings.kcfg
index 849a9c75c..de7bbf878 100644
--- a/src/settings/dolphin_generalsettings.kcfg
+++ b/src/settings/dolphin_generalsettings.kcfg
@@ -5,7 +5,7 @@
       xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
       http://www.kde.org/standards/kcfg/1.0/kcfg.xsd">
     <include>QDir</include>
-    <include>KUrl</include>
+    <include>QUrl</include>
     <include>kglobalsettings.h</include>
     <kcfgfile name="dolphinrc"/>
     <group name="General">
@@ -31,7 +31,7 @@
         </entry>
         <entry name="HomeUrl" type="String">
             <label>Home URL</label>
-            <default code="true">KUrl(QDir::homePath()).prettyUrl()</default>
+            <default code="true">QUrl::fromLocalFile(QDir::homePath()).toDisplayString(QUrl::PreferLocalFile)</default>
         </entry>
         <entry name="SplitView" type="Bool">
             <label>Split the view into two panes</label>
diff --git a/src/settings/dolphinsettingsdialog.cpp b/src/settings/dolphinsettingsdialog.cpp
index 678ef7b8e..d9240d97c 100644
--- a/src/settings/dolphinsettingsdialog.cpp
+++ b/src/settings/dolphinsettingsdialog.cpp
@@ -36,7 +36,7 @@
 #include <QPushButton>
 #include <QDialogButtonBox>
 
-DolphinSettingsDialog::DolphinSettingsDialog(const KUrl& url, QWidget* parent) :
+DolphinSettingsDialog::DolphinSettingsDialog(const QUrl& url, QWidget* parent) :
     KPageDialog(parent),
     m_pages()
 
diff --git a/src/settings/dolphinsettingsdialog.h b/src/settings/dolphinsettingsdialog.h
index 56d924c7d..93f714799 100644
--- a/src/settings/dolphinsettingsdialog.h
+++ b/src/settings/dolphinsettingsdialog.h
@@ -23,7 +23,7 @@
 
 #include <kpagedialog.h>
 
-class KUrl;
+class QUrl;
 class SettingsPageBase;
 
 /**
@@ -36,7 +36,7 @@ class DolphinSettingsDialog : public KPageDialog
     Q_OBJECT
 
 public:
-    explicit DolphinSettingsDialog(const KUrl& url, QWidget* parent = 0);
+    explicit DolphinSettingsDialog(const QUrl& url, QWidget* parent = 0);
     virtual ~DolphinSettingsDialog();
 
 signals:
diff --git a/src/settings/general/behaviorsettingspage.cpp b/src/settings/general/behaviorsettingspage.cpp
index 8d3e0ffb5..f311b1a3c 100644
--- a/src/settings/general/behaviorsettingspage.cpp
+++ b/src/settings/general/behaviorsettingspage.cpp
@@ -31,7 +31,7 @@
 
 #include <views/viewproperties.h>
 
-BehaviorSettingsPage::BehaviorSettingsPage(const KUrl& url, QWidget* parent) :
+BehaviorSettingsPage::BehaviorSettingsPage(const QUrl& url, QWidget* parent) :
     SettingsPageBase(parent),
     m_url(url),
     m_localViewProps(0),
diff --git a/src/settings/general/behaviorsettingspage.h b/src/settings/general/behaviorsettingspage.h
index 2221862e0..71ee2849a 100644
--- a/src/settings/general/behaviorsettingspage.h
+++ b/src/settings/general/behaviorsettingspage.h
@@ -21,7 +21,7 @@
 #define BEHAVIORSETTINGSPAGE_H
 
 #include <settings/settingspagebase.h>
-#include <KUrl>
+#include <QUrl>
 
 class QCheckBox;
 class QLabel;
@@ -35,7 +35,7 @@ class BehaviorSettingsPage : public SettingsPageBase
     Q_OBJECT
 
 public:
-    BehaviorSettingsPage(const KUrl& url, QWidget* parent);
+    BehaviorSettingsPage(const QUrl &url, QWidget* parent);
     virtual ~BehaviorSettingsPage();
 
     /** @see SettingsPageBase::applySettings() */
@@ -48,7 +48,7 @@ private:
     void loadSettings();
 
 private:
-    KUrl m_url;
+    QUrl m_url;
 
     QRadioButton* m_localViewProps;
     QRadioButton* m_globalViewProps;
diff --git a/src/settings/general/generalsettingspage.cpp b/src/settings/general/generalsettingspage.cpp
index f749c33ce..f24b1bf22 100644
--- a/src/settings/general/generalsettingspage.cpp
+++ b/src/settings/general/generalsettingspage.cpp
@@ -32,7 +32,7 @@
 
 #include <QVBoxLayout>
 
-GeneralSettingsPage::GeneralSettingsPage(const KUrl& url, QWidget* parent) :
+GeneralSettingsPage::GeneralSettingsPage(const QUrl& url, QWidget* parent) :
     SettingsPageBase(parent),
     m_pages()
 {
diff --git a/src/settings/general/generalsettingspage.h b/src/settings/general/generalsettingspage.h
index 0d28664f5..245773aee 100644
--- a/src/settings/general/generalsettingspage.h
+++ b/src/settings/general/generalsettingspage.h
@@ -23,7 +23,7 @@
 #include <QWidget>
 #include <settings/settingspagebase.h>
 
-class KUrl;
+class QUrl;
 class SettingsPageBase;
 
 /**
@@ -40,7 +40,7 @@ class GeneralSettingsPage : public SettingsPageBase
     Q_OBJECT
 
 public:
-    GeneralSettingsPage(const KUrl& url, QWidget* parent);
+    GeneralSettingsPage(const QUrl& url, QWidget* parent);
     virtual ~GeneralSettingsPage();
 
     /** @see SettingsPageBase::applySettings() */
diff --git a/src/settings/startup/startupsettingspage.cpp b/src/settings/startup/startupsettingspage.cpp
index 2c436b541..b4ca9ac2c 100644
--- a/src/settings/startup/startupsettingspage.cpp
+++ b/src/settings/startup/startupsettingspage.cpp
@@ -39,7 +39,7 @@
 
 #include "views/dolphinview.h"
 
-StartupSettingsPage::StartupSettingsPage(const KUrl& url, QWidget* parent) :
+StartupSettingsPage::StartupSettingsPage(const QUrl& url, QWidget* parent) :
     SettingsPageBase(parent),
     m_url(url),
     m_homeUrl(0),
@@ -117,10 +117,10 @@ void StartupSettingsPage::applySettings()
 {
     GeneralSettings* settings = GeneralSettings::self();
 
-    const KUrl url(m_homeUrl->text());
+    const QUrl url(QUrl::fromLocalFile(m_homeUrl->text()));
     KFileItem fileItem(KFileItem::Unknown, KFileItem::Unknown, url);
-    if ((url.isValid() && fileItem.isDir()) || (url.protocol() == QLatin1String("timeline"))) {
-        settings->setHomeUrl(url.prettyUrl());
+    if ((url.isValid() && fileItem.isDir()) || (url.scheme() == QLatin1String("timeline"))) {
+        settings->setHomeUrl(url.toDisplayString(QUrl::PreferLocalFile));
     } else {
         KMessageBox::error(this, i18nc("@info", "The location for the home folder is invalid or does not exist, it will not be applied."));
     }
@@ -153,31 +153,29 @@ void StartupSettingsPage::slotSettingsChanged()
 void StartupSettingsPage::selectHomeUrl()
 {
     const QString homeUrl = m_homeUrl->text();
-    KUrl url = KFileDialog::getExistingDirectoryUrl(homeUrl, this);
+    QUrl url = KFileDialog::getExistingDirectoryUrl(QUrl::fromLocalFile(homeUrl), this);
     if (!url.isEmpty()) {
-        m_homeUrl->setText(url.prettyUrl());
+        m_homeUrl->setText(url.toDisplayString(QUrl::PreferLocalFile));
         slotSettingsChanged();
     }
 }
 
 void StartupSettingsPage::useCurrentLocation()
 {
-    m_homeUrl->setText(m_url.prettyUrl());
+    m_homeUrl->setText(m_url.toDisplayString(QUrl::PreferLocalFile));
 }
 
 void StartupSettingsPage::useDefaultLocation()
 {
-    KUrl url(QDir::homePath());
-    m_homeUrl->setText(url.prettyUrl());
+    m_homeUrl->setText(QDir::homePath());
 }
 
 void StartupSettingsPage::loadSettings()
 {
-    const KUrl url(GeneralSettings::homeUrl());
-    m_homeUrl->setText(url.prettyUrl());
+    const QUrl url(QUrl::fromLocalFile(GeneralSettings::homeUrl()));
+    m_homeUrl->setText(url.toDisplayString(QUrl::PreferLocalFile));
     m_splitView->setChecked(GeneralSettings::splitView());
     m_editableUrl->setChecked(GeneralSettings::editableUrl());
     m_showFullPath->setChecked(GeneralSettings::showFullPath());
     m_filterBar->setChecked(GeneralSettings::filterBar());
 }
-
diff --git a/src/settings/startup/startupsettingspage.h b/src/settings/startup/startupsettingspage.h
index 29cdc6300..d8b15cf5b 100644
--- a/src/settings/startup/startupsettingspage.h
+++ b/src/settings/startup/startupsettingspage.h
@@ -20,7 +20,7 @@
 #define STARTUPSETTINGSPAGE_H
 
 #include <settings/settingspagebase.h>
-#include <KUrl>
+#include <QUrl>
 
 class KLineEdit;
 class QCheckBox;
@@ -36,7 +36,7 @@ class StartupSettingsPage : public SettingsPageBase
     Q_OBJECT
 
 public:
-    StartupSettingsPage(const KUrl& url, QWidget* parent);
+    StartupSettingsPage(const QUrl& url, QWidget* parent);
     virtual ~StartupSettingsPage();
 
     /** @see SettingsPageBase::applySettings() */
@@ -55,7 +55,7 @@ private:
     void loadSettings();
 
 private:
-    KUrl m_url;
+    QUrl m_url;
     KLineEdit* m_homeUrl;
 
     QCheckBox* m_splitView;
diff --git a/src/settings/viewpropertiesdialog.cpp b/src/settings/viewpropertiesdialog.cpp
index 2e0b172b9..338a14277 100644
--- a/src/settings/viewpropertiesdialog.cpp
+++ b/src/settings/viewpropertiesdialog.cpp
@@ -32,7 +32,7 @@
 #include <KLocalizedString>
 #include <KIO/NetAccess>
 #include <KMessageBox>
-#include <KUrl>
+#include <QUrl>
 #include <KComboBox>
 
 #include <QButtonGroup>
@@ -69,7 +69,7 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
     setCaption(i18nc("@title:window", "View Properties"));
     setButtons(KDialog::Ok | KDialog::Cancel | KDialog::Apply);
 
-    const KUrl& url = dolphinView->url();
+    const QUrl& url = dolphinView->url();
     m_viewProps = new ViewProperties(url);
     m_viewProps->setAutoSaveEnabled(false);
 
diff --git a/src/settings/viewpropsprogressinfo.cpp b/src/settings/viewpropsprogressinfo.cpp
index 091003416..9ce3d2de4 100644
--- a/src/settings/viewpropsprogressinfo.cpp
+++ b/src/settings/viewpropsprogressinfo.cpp
@@ -32,7 +32,7 @@
 #include <views/viewproperties.h>
 
 ViewPropsProgressInfo::ViewPropsProgressInfo(QWidget* parent,
-                                             const KUrl& dir,
+                                             const QUrl& dir,
                                              const ViewProperties& viewProps) :
     KDialog(parent),
     m_dir(dir),
diff --git a/src/settings/viewpropsprogressinfo.h b/src/settings/viewpropsprogressinfo.h
index 6f8c763c3..7522cf84c 100644
--- a/src/settings/viewpropsprogressinfo.h
+++ b/src/settings/viewpropsprogressinfo.h
@@ -22,7 +22,7 @@
 
 #include <KDialog>
 #include <kio/directorysizejob.h>
-#include <KUrl>
+#include <QUrl>
 
 class ApplyViewPropsJob;
 class QLabel;
@@ -50,7 +50,7 @@ public:
      *                  sub directories.
      */
     ViewPropsProgressInfo(QWidget* parent,
-                          const KUrl& dir,
+                          const QUrl& dir,
                           const ViewProperties& viewProps);
 
     virtual ~ViewPropsProgressInfo();
@@ -64,7 +64,7 @@ private slots:
     void cancelApplying();
 
 private:
-    KUrl m_dir;
+    QUrl m_dir;
     ViewProperties* m_viewProps;
 
     QLabel* m_label;