Add only canonical paths to dirWatcher

[dolphin.git] / src / settings / applyviewpropsjob.cpp

diff --git a/src/settings/applyviewpropsjob.cpp b/src/settings/applyviewpropsjob.cpp
index 59f1c0b863eecda317ed7f48df49909c57ea4683..183c85225822af51e25644620c5845f46da98a01 100644 (file)
--- a/src/settings/applyviewpropsjob.cpp
+++ b/src/settings/applyviewpropsjob.cpp
@@ -21,12 +21,13 @@
  ***************************************************************************/
 
 #include "applyviewpropsjob.h"
-#include <views/viewproperties.h>
 
-ApplyViewPropsJob::ApplyViewPropsJob(const KUrl& dir,
+#include "views/viewproperties.h"
+
+ApplyViewPropsJob::ApplyViewPropsJob(const QUrl& dir,
                                      const ViewProperties& viewProps) :
     KIO::Job(),
-    m_viewProps(0),
+    m_viewProps(nullptr),
     m_progress(0),
     m_dir(dir)
 {
@@ -34,32 +35,31 @@ ApplyViewPropsJob::ApplyViewPropsJob(const KUrl& dir,
     m_viewProps->setViewMode(viewProps.viewMode());
     m_viewProps->setPreviewsShown(viewProps.previewsShown());
     m_viewProps->setHiddenFilesShown(viewProps.hiddenFilesShown());
-    m_viewProps->setSorting(viewProps.sorting());
+    m_viewProps->setSortRole(viewProps.sortRole());
     m_viewProps->setSortOrder(viewProps.sortOrder());
 
     KIO::ListJob* listJob = KIO::listRecursive(dir, KIO::HideProgressInfo);
-    connect(listJob, SIGNAL(entries(KIO::Job*,KIO::UDSEntryList)),
-            SLOT(slotEntries(KIO::Job*,KIO::UDSEntryList)));
+    connect(listJob, &KIO::ListJob::entries,
+            this, &ApplyViewPropsJob::slotEntries);
     addSubjob(listJob);
 }
 
 ApplyViewPropsJob::~ApplyViewPropsJob()
 {
     delete m_viewProps;  // the properties are written by the destructor
-    m_viewProps = 0;
+    m_viewProps = nullptr;
 }
 
 void ApplyViewPropsJob::slotEntries(KIO::Job*, const KIO::UDSEntryList& list)
 {
-    KIO::UDSEntryList::ConstIterator it = list.begin();
-    const KIO::UDSEntryList::ConstIterator end = list.end();
-    foreach(const KIO::UDSEntry& entry, list) {
+    foreach (const KIO::UDSEntry& entry, list) {
         const QString name = entry.stringValue(KIO::UDSEntry::UDS_NAME);
-        if ((name != ".") && (name != "..") && entry.isDir()) {
+        if (name != QLatin1Char('.') && 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);
 
@@ -78,4 +78,3 @@ void ApplyViewPropsJob::slotResult(KJob* job)
     emitResult();
 }
 
-#include "applyviewpropsjob.moc"