Merge remote-tracking branch 'fork/work/zakharafoniam/useful-groups'

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

diff --git a/src/settings/applyviewpropsjob.cpp b/src/settings/applyviewpropsjob.cpp
index 250f13c1028b5aed981c55ba790c6e83b34674ed..21c30af022b0b3803e0ad395689ed9be988f0f3f 100644 (file)
--- a/src/settings/applyviewpropsjob.cpp
+++ b/src/settings/applyviewpropsjob.cpp
@@ -10,6 +10,7 @@
 #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()
 
 ApplyViewPropsJob::ApplyViewPropsJob(const QUrl &dir, const ViewProperties &viewProps)
     : KIO::Job()


@@ -23,6 +24,8 @@ ApplyViewPropsJob::ApplyViewPropsJob(const QUrl &dir, const ViewProperties &view
     m_viewProps->setHiddenFilesShown(viewProps.hiddenFilesShown());
     m_viewProps->setSortRole(viewProps.sortRole());
     m_viewProps->setSortOrder(viewProps.sortOrder());
     m_viewProps->setHiddenFilesShown(viewProps.hiddenFilesShown());
     m_viewProps->setSortRole(viewProps.sortRole());
     m_viewProps->setSortOrder(viewProps.sortOrder());

+    m_viewProps->setGroupRole(viewProps.groupRole());
+    m_viewProps->setGroupOrder(viewProps.groupOrder());

 
     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);


@@ -44,7 +47,7 @@ void ApplyViewPropsJob::slotEntries(KIO::Job *, const KIO::UDSEntryList &list)
 
             QUrl url(m_dir);
             url = url.adjusted(QUrl::StripTrailingSlash);
 
             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);