Clazy: Fix some warnigns

diff --git a/src/gui/accountsettings.cpp b/src/gui/accountsettings.cpp
index 69440018661f0c10faf81abc9d20f6ed78a89b2e..79c44d2056a77b1fe2531448dbdc63171ea73ca0 100644 (file)
--- a/src/gui/accountsettings.cpp
+++ b/src/gui/accountsettings.cpp
@@ -684,7 +684,7 @@ void AccountSettings::slotEnableVfsCurrentFolder()
 
             // Wipe selective sync blacklist
             bool ok = false;
-            auto oldBlacklist = folder->journalDb()->getSelectiveSyncList(SyncJournalDb::SelectiveSyncBlackList, &ok);
+            const auto oldBlacklist = folder->journalDb()->getSelectiveSyncList(SyncJournalDb::SelectiveSyncBlackList, &ok);
             folder->journalDb()->setSelectiveSyncList(SyncJournalDb::SelectiveSyncBlackList, {});
 
             // Change the folder vfs mode and load the plugin
@@ -1171,7 +1171,6 @@ void AccountSettings::refreshSelectiveSyncStatus()
 
         bool ok = false;
         const auto undecidedList = folder->journalDb()->getSelectiveSyncList(SyncJournalDb::SelectiveSyncUndecidedList, &ok);
-        QString p;
         for (const auto &it : undecidedList) {
             // FIXME: add the folder alias in a hoover hint.
             // folder->alias() + QLatin1String("/")

diff --git a/src/gui/folderman.cpp b/src/gui/folderman.cpp
index aaf303c4199f6d7359969427ae6bbfbd2506dac4..3ee51b9554af27a6cd409ce30e9c35ac5a9de5fe 100644 (file)
--- a/src/gui/folderman.cpp
+++ b/src/gui/folderman.cpp
@@ -90,7 +90,7 @@ FolderMan::~FolderMan()
     _instance = nullptr;
 }
 
-OCC::Folder::Map FolderMan::map()
+const OCC::Folder::Map &FolderMan::map() const
 {
     return _folderMap;
 }

diff --git a/src/gui/folderman.h b/src/gui/folderman.h
index 75cbd2307cf58f82cb79a119b5b809831a0b8979..7c72eb95344b0be3ccb3495aa98fcd082b26e483 100644 (file)
--- a/src/gui/folderman.h
+++ b/src/gui/folderman.h
@@ -74,7 +74,7 @@ public:
      */
     static void backwardMigrationSettingsKeys(QStringList *deleteKeys, QStringList *ignoreKeys);
 
-    OCC::Folder::Map map();
+    const Folder::Map &map() const;
 
     /** Adds a folder for an account, ensures the journal is gone and saves it in the settings.
       */

diff --git a/src/gui/folderstatusmodel.cpp b/src/gui/folderstatusmodel.cpp
index 5f853cd8afe825139cac8410235a549673f1b832..e6cf4de3d6045f23b8b525f30148cb1ef5c07305 100644 (file)
--- a/src/gui/folderstatusmodel.cpp
+++ b/src/gui/folderstatusmodel.cpp
@@ -828,12 +828,12 @@ void FolderStatusModel::slotUpdateFolderState(Folder *folder)
 
 void FolderStatusModel::slotApplySelectiveSync()
 {
-    for (int i = 0; i < _folders.count(); ++i) {
-        if (!_folders[i]._fetched) {
-            _folders[i]._folder->journalDb()->setSelectiveSyncList(SyncJournalDb::SelectiveSyncUndecidedList, QStringList());
+    for (const auto &folderInfo : qAsConst(_folders)) {
+        if (!folderInfo._fetched) {
+            folderInfo._folder->journalDb()->setSelectiveSyncList(SyncJournalDb::SelectiveSyncUndecidedList, QStringList());
             continue;
         }
-        auto folder = _folders.at(i)._folder;
+        const auto folder = folderInfo._folder;
 
         bool ok = false;
         auto oldBlackList = folder->journalDb()->getSelectiveSyncList(SyncJournalDb::SelectiveSyncBlackList, &ok);
@@ -841,7 +841,7 @@ void FolderStatusModel::slotApplySelectiveSync()
             qCWarning(lcFolderStatus) << "Could not read selective sync list from db.";
             continue;
         }
-        QStringList blackList = createBlackList(_folders.at(i), oldBlackList);
+        QStringList blackList = createBlackList(folderInfo, oldBlackList);
         folder->journalDb()->setSelectiveSyncList(SyncJournalDb::SelectiveSyncBlackList, blackList);
 
         auto blackListSet = blackList.toSet();

diff --git a/test/stubremotewipe.cpp b/test/stubremotewipe.cpp
index e434424fdf42121e66ae3a5f8e72a63c596d0ced..545e6a56ee8a1ad91fd199c54c5fa321540e98d2 100644 (file)
--- a/test/stubremotewipe.cpp
+++ b/test/stubremotewipe.cpp
@@ -21,7 +21,7 @@ QString OCC::FolderMan::unescapeAlias(QString const&){ return QString(); }
 QString OCC::FolderMan::escapeAlias(QString const&){ return QString(); }
 void OCC::FolderMan::scheduleFolder(OCC::Folder*){ }
 OCC::SocketApi *OCC::FolderMan::socketApi(){ return new SocketApi;  }
-OCC::Folder::Map OCC::FolderMan::map() { return OCC::Folder::Map(); }
+const OCC::Folder::Map &OCC::FolderMan::map() const { return OCC::Folder::Map(); }
 void OCC::FolderMan::setSyncEnabled(bool) { }
 void OCC::FolderMan::slotSyncOnceFileUnlocks(QString const&) { }
 void OCC::FolderMan::slotScheduleETagJob(QString const&, OCC::RequestEtagJob*){ }