KFileItemListWidget: wrong selection when renamed file ends with a dot

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

diff --git a/src/settings/applyviewpropsjob.cpp b/src/settings/applyviewpropsjob.cpp
index c6468792fde73f5beeca60d9f3f315556a2cfcec..2a2b4bfe4f5ef0c30a7fe6e4a3f374b1af65c027 100644 (file)
--- a/src/settings/applyviewpropsjob.cpp
+++ b/src/settings/applyviewpropsjob.cpp
@@ -10,13 +10,13 @@
 #include "applyviewpropsjob.h"
 
 #include "views/viewproperties.h"
 #include "applyviewpropsjob.h"
 
 #include "views/viewproperties.h"

+#include <KIO/ListJob>

 
 

-ApplyViewPropsJob::ApplyViewPropsJob(const QUrl& dir,
-                                     const ViewProperties& viewProps) :
-    KIO::Job(),
-    m_viewProps(nullptr),
-    m_progress(0),
-    m_dir(dir)
+ApplyViewPropsJob::ApplyViewPropsJob(const QUrl &dir, const ViewProperties &viewProps)
+    : KIO::Job()
+    , m_viewProps(nullptr)
+    , m_progress(0)
+    , m_dir(dir)

 {
     m_viewProps = new ViewProperties(dir);
     m_viewProps->setViewMode(viewProps.viewMode());
 {
     m_viewProps = new ViewProperties(dir);
     m_viewProps->setViewMode(viewProps.viewMode());


@@ -25,28 +25,27 @@ ApplyViewPropsJob::ApplyViewPropsJob(const QUrl& dir,
     m_viewProps->setSortRole(viewProps.sortRole());
     m_viewProps->setSortOrder(viewProps.sortOrder());
 
     m_viewProps->setSortRole(viewProps.sortRole());
     m_viewProps->setSortOrder(viewProps.sortOrder());
 

-    KIO::ListJob* listJob = KIO::listRecursive(dir, KIO::HideProgressInfo);
-    connect(listJob, &KIO::ListJob::entries,
-            this, &ApplyViewPropsJob::slotEntries);
+    KIO::ListJob *listJob = KIO::listRecursive(dir, KIO::HideProgressInfo);
+    connect(listJob, &KIO::ListJob::entries, this, &ApplyViewPropsJob::slotEntries);

     addSubjob(listJob);
 }
 
 ApplyViewPropsJob::~ApplyViewPropsJob()
 {
     addSubjob(listJob);
 }
 
 ApplyViewPropsJob::~ApplyViewPropsJob()
 {

-    delete m_viewProps;  // the properties are written by the destructor
+    delete m_viewProps; // the properties are written by the destructor

     m_viewProps = nullptr;
 }
 
     m_viewProps = nullptr;
 }
 

-void ApplyViewPropsJob::slotEntries(KIO::Job*, const KIO::UDSEntryList& list)
+void ApplyViewPropsJob::slotEntries(KIO::Job *, const KIO::UDSEntryList &list)

 {
 {

-    foreach (const KIO::UDSEntry& entry, list) {
+    for (const KIO::UDSEntry &entry : list) {

         const QString name = entry.stringValue(KIO::UDSEntry::UDS_NAME);
         if (name != QLatin1Char('.') && name != QLatin1String("..") && entry.isDir()) {
             ++m_progress;
 
             QUrl url(m_dir);
             url = url.adjusted(QUrl::StripTrailingSlash);
         const QString name = entry.stringValue(KIO::UDSEntry::UDS_NAME);
         if (name != QLatin1Char('.') && name != QLatin1String("..") && entry.isDir()) {
             ++m_progress;
 
             QUrl url(m_dir);
             url = url.adjusted(QUrl::StripTrailingSlash);

-            url.setPath(url.path() + '/' + name);
+            url.setPath(url.path() + QLatin1Char('/') + name);

 
             Q_ASSERT(m_viewProps);
 
 
             Q_ASSERT(m_viewProps);
 


@@ -56,7 +55,7 @@ void ApplyViewPropsJob::slotEntries(KIO::Job*, const KIO::UDSEntryList& list)
     }
 }
 
     }
 }
 

-void ApplyViewPropsJob::slotResult(KJob* job)
+void ApplyViewPropsJob::slotResult(KJob *job)

 {
     if (job->error()) {
         setError(job->error());
 {
     if (job->error()) {
         setError(job->error());


@@ -65,3 +64,4 @@ void ApplyViewPropsJob::slotResult(KJob* job)
     emitResult();
 }
 
     emitResult();
 }
 

+#include "moc_applyviewpropsjob.cpp"