SVN_SILENT made messages (.desktop file) - always resolve ours

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

diff --git a/src/settings/applyviewpropsjob.cpp b/src/settings/applyviewpropsjob.cpp
index 252ac588dfe588b9d732bfb8b8dae49c35bbe9f8..2a2b4bfe4f5ef0c30a7fe6e4a3f374b1af65c027 100644 (file)
--- a/src/settings/applyviewpropsjob.cpp
+++ b/src/settings/applyviewpropsjob.cpp
@@ -1,67 +1,53 @@
-/***************************************************************************
- *   Copyright (C) 2006 by Peter Penz <peter.penz@gmx.at>                  *
- *                                                                         *
- *   The code is based on kdelibs/kio/directorysizejob.*                   *
- *  (C) 2006 by David Faure <faure@kde.org>                                *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
- ***************************************************************************/
+/*
+ * SPDX-FileCopyrightText: 2006 Peter Penz <peter.penz19@gmail.com>
+ *
+ * The code is based on kdelibs/kio/directorysizejob:
+ * SPDX-FileCopyrightText: 2006 David Faure <faure@kde.org>
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
 
 #include "applyviewpropsjob.h"
-#include <views/viewproperties.h>
 
-ApplyViewPropsJob::ApplyViewPropsJob(const KUrl& dir,
-                                     const ViewProperties& viewProps) :
-    KIO::Job(),
-    m_viewProps(0),
-    m_progress(0),
-    m_dir(dir)
+#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)
 {
     m_viewProps = new ViewProperties(dir);
     m_viewProps->setViewMode(viewProps.viewMode());
-    m_viewProps->setShowPreview(viewProps.showPreview());
-    m_viewProps->setShowHiddenFiles(viewProps.showHiddenFiles());
-    m_viewProps->setSorting(viewProps.sorting());
+    m_viewProps->setPreviewsShown(viewProps.previewsShown());
+    m_viewProps->setHiddenFilesShown(viewProps.hiddenFilesShown());
+    m_viewProps->setSortRole(viewProps.sortRole());
     m_viewProps->setSortOrder(viewProps.sortOrder());
 
-    KIO::ListJob* listJob = KIO::listRecursive(dir, KIO::HideProgressInfo);
-    connect(listJob, SIGNAL(entries(KIO::Job*, const KIO::UDSEntryList&)),
-            SLOT(slotEntries(KIO::Job*, const KIO::UDSEntryList&)));
+    KIO::ListJob *listJob = KIO::listRecursive(dir, KIO::HideProgressInfo);
+    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;
+    delete m_viewProps; // the properties are written by the destructor
+    m_viewProps = nullptr;
 }
 
-void ApplyViewPropsJob::slotEntries(KIO::Job*, const KIO::UDSEntryList& list)
+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) {
+    for (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() + QLatin1Char('/') + name);
 
-            Q_ASSERT(m_viewProps != 0);
+            Q_ASSERT(m_viewProps);
 
             ViewProperties props(url);
             props.setDirProperties(*m_viewProps);
@@ -69,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());
@@ -78,4 +64,4 @@ void ApplyViewPropsJob::slotResult(KJob* job)
     emitResult();
 }
 
-#include "applyviewpropsjob.moc"
+#include "moc_applyviewpropsjob.cpp"