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 d33d4430f36038c8b61545e2e9fa04e6b1b40a1d..183c85225822af51e25644620c5845f46da98a01 100644 (file)
--- a/src/settings/applyviewpropsjob.cpp
+++ b/src/settings/applyviewpropsjob.cpp
@@ -21,12 +21,13 @@
  ***************************************************************************/
 
 #include "applyviewpropsjob.h"
  ***************************************************************************/
 
 #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(),
                                      const ViewProperties& viewProps) :
     KIO::Job(),

-    m_viewProps(0),
+    m_viewProps(nullptr),

     m_progress(0),
     m_dir(dir)
 {
     m_progress(0),
     m_dir(dir)
 {


@@ -46,18 +47,19 @@ ApplyViewPropsJob::ApplyViewPropsJob(const KUrl& dir,
 ApplyViewPropsJob::~ApplyViewPropsJob()
 {
     delete m_viewProps;  // the properties are written by the destructor
 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)
 {
     foreach (const KIO::UDSEntry& entry, list) {
         const QString name = entry.stringValue(KIO::UDSEntry::UDS_NAME);
 }
 
 void ApplyViewPropsJob::slotEntries(KIO::Job*, const KIO::UDSEntryList& list)
 {
     foreach (const KIO::UDSEntry& entry, list) {
         const QString name = entry.stringValue(KIO::UDSEntry::UDS_NAME);

-        if (name != QLatin1String(".") && name != QLatin1String("..") && entry.isDir()) {
+        if (name != QLatin1Char('.') && name != QLatin1String("..") && entry.isDir()) {

             ++m_progress;
 
             ++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);
 
 
             Q_ASSERT(m_viewProps);