Enable the modernize-loop-convert check on clang-tidy

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>

diff --git a/.clang-tidy b/.clang-tidy
index 59e5956ea3e90f4b1eb7e5c476f84d35f5f9fbf0..b255f3def18e42d480458c66f63d2ea442a3328c 100644 (file)
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -4,6 +4,7 @@ Checks: '-*,
     modernize-concat-nested-namespaces,
     modernize-deprecated-headers,
     modernize-deprecated-ios-base-aliases,
+    modernize-loop-convert,
     modernize-make-*,
     modernize-raw-string-literal,
     modernize-redundant-void-arg,

diff --git a/src/gui/folderstatusmodel.cpp b/src/gui/folderstatusmodel.cpp
index f146fffc715e2ac90653b73f1f8b42df25f02f00..af0a3b9983537063acbb4b98c67f5f96c9694ae7 100644 (file)
--- a/src/gui/folderstatusmodel.cpp
+++ b/src/gui/folderstatusmodel.cpp
@@ -730,8 +730,8 @@ void FolderStatusModel::slotUpdateDirectories(const QStringList &list)
         endInsertRows();
     }
 
-    for (auto it = undecidedIndexes.begin(); it != undecidedIndexes.end(); ++it) {
-        suggestExpand(index(*it, 0, idx));
+    for (int undecidedIndex : qAsConst(undecidedIndexes)) {
+        suggestExpand(index(undecidedIndex, 0, idx));
     }
 
 /* We need lambda function for the following code.

diff --git a/src/gui/tray/UserModel.cpp b/src/gui/tray/UserModel.cpp
index 386c7f76254a12ccaf313df74378c4986c9b8a3c..9d2c3469cdcc0ec03aa3f0119f2b5f62eaefb55d 100644 (file)
--- a/src/gui/tray/UserModel.cpp
+++ b/src/gui/tray/UserModel.cpp
@@ -605,8 +605,8 @@ Q_INVOKABLE QString UserModel::currentUserServer()
 void UserModel::addUser(AccountStatePtr &user, const bool &isCurrent)
 {
     bool containsUser = false;
-    for (int i = 0; i < _users.size(); i++) {
-        if (_users[i]->account() == user->account()) {
+    for (const auto &u : qAsConst(_users)) {
+        if (u->account() == user->account()) {
             containsUser = true;
             continue;
         }

diff --git a/src/libsync/cookiejar.cpp b/src/libsync/cookiejar.cpp
index 5e28c1b627b9f48c01eedea2bb0b0de4a56858ab..ded4eaeedbb8d94e29f4d2120b3ebe8eb290db6d 100644 (file)
--- a/src/libsync/cookiejar.cpp
+++ b/src/libsync/cookiejar.cpp
@@ -34,8 +34,8 @@ QDataStream &operator<<(QDataStream &stream, const QList<QNetworkCookie> &list)
 {
     stream << JAR_VERSION;
     stream << quint32(list.size());
-    for (int i = 0; i < list.size(); ++i)
-        stream << list.at(i).toRawForm();
+    for (const auto &cookie : list)
+        stream << cookie.toRawForm();
     return stream;
 }
 

diff --git a/src/libsync/owncloudpropagator.cpp b/src/libsync/owncloudpropagator.cpp
index 7a1274bd73e5dccb01c09930071a81dfaa7ec35c..88f32f6e8ede2054194703e11575df6948170fce 100644 (file)
--- a/src/libsync/owncloudpropagator.cpp
+++ b/src/libsync/owncloudpropagator.cpp
@@ -796,16 +796,16 @@ bool PropagatorCompositeJob::scheduleSelfOrChild()
     }
 
     // Ask all the running composite jobs if they have something new to schedule.
-    for (int i = 0; i < _runningJobs.size(); ++i) {
-        ASSERT(_runningJobs.at(i)->_state == Running);
+    for (auto runningJob : qAsConst(_runningJobs)) {
+        ASSERT(runningJob->_state == Running);
 
-        if (possiblyRunNextJob(_runningJobs.at(i))) {
+        if (possiblyRunNextJob(runningJob)) {
             return true;
         }
 
         // If any of the running sub jobs is not parallel, we have to cancel the scheduling
         // of the rest of the list and wait for the blocking job to finish and schedule the next one.
-        auto paral = _runningJobs.at(i)->parallelism();
+        auto paral = runningJob->parallelism();
         if (paral == WaitForFinished) {
             return false;
         }

diff --git a/src/libsync/propagateremotemove.cpp b/src/libsync/propagateremotemove.cpp
index 0e106d851cd16ea1d8edf91aeb0481fdc0404cd0..39fb1a0328aff9171e758f206daccd2dbf4ca7cc 100644 (file)
--- a/src/libsync/propagateremotemove.cpp
+++ b/src/libsync/propagateremotemove.cpp
@@ -193,9 +193,9 @@ bool PropagateRemoteMove::adjustSelectiveSync(SyncJournalDb *journal, const QStr
     QString from = from_ + QLatin1String("/");
     QString to = to_ + QLatin1String("/");
 
-    for (auto it = list.begin(); it != list.end(); ++it) {
-        if (it->startsWith(from)) {
-            *it = it->replace(0, from.size(), to);
+    for (auto &s : list) {
+        if (s.startsWith(from)) {
+            s = s.replace(0, from.size(), to);
             changed = true;
         }
     }

diff --git a/src/libsync/propagateuploadng.cpp b/src/libsync/propagateuploadng.cpp
index 78ce820894e795ba7ade2c47d6384c1a1d4f87b9..862ad7d74ff3186dceb7116a87be2001c0943b55 100644 (file)
--- a/src/libsync/propagateuploadng.cpp
+++ b/src/libsync/propagateuploadng.cpp
@@ -157,8 +157,8 @@ void PropagateUploadFileNG::slotPropfindFinished()
         // Make sure that if there is a "hole" and then a few more chunks, on the server
         // we should remove the later chunks. Otherwise when we do dynamic chunk sizing, we may end up
         // with corruptions if there are too many chunks, or if we abort and there are still stale chunks.
-        for (auto it = _serverChunks.begin(); it != _serverChunks.end(); ++it) {
-            auto job = new DeleteJob(propagator()->account(), Utility::concatUrlPath(chunkUrl(), it->originalName), this);
+        for (const auto &serverChunk : qAsConst(_serverChunks)) {
+            auto job = new DeleteJob(propagator()->account(), Utility::concatUrlPath(chunkUrl(), serverChunk.originalName), this);
             QObject::connect(job, &DeleteJob::finishedSignal, this, &PropagateUploadFileNG::slotDeleteJobFinished);
             _jobs.append(job);
             job->start();

diff --git a/src/libsync/syncengine.cpp b/src/libsync/syncengine.cpp
index 7c79272b8ce836d385adb6d8d2ecde85a7101ff1..152d66b29119f113ba058456a3a86eafacfe456c 100644 (file)
--- a/src/libsync/syncengine.cpp
+++ b/src/libsync/syncengine.cpp
@@ -1086,9 +1086,8 @@ void SyncEngine::slotDiscoveryJobFinished(int discoveryResult)
     _syncItemMap.clear(); // free memory
 
     // Adjust the paths for the renames.
-    for (SyncFileItemVector::iterator it = syncItems.begin();
-         it != syncItems.end(); ++it) {
-        (*it)->_file = adjustRenamedPath((*it)->_file);
+    for (const auto &syncItem : qAsConst(syncItems)) {
+        syncItem->_file = adjustRenamedPath(syncItem->_file);
     }
 
     // Check for invalid character in old server version
@@ -1104,12 +1103,12 @@ void SyncEngine::slotDiscoveryJobFinished(int discoveryResult)
     }
     if (!invalidFilenamePattern.isEmpty()) {
         const QRegExp invalidFilenameRx(invalidFilenamePattern);
-        for (auto it = syncItems.begin(); it != syncItems.end(); ++it) {
-            if ((*it)->_direction == SyncFileItem::Up
-                && isFileModifyingInstruction((*it)->_instruction)
-                && (*it)->destination().contains(invalidFilenameRx)) {
-                (*it)->_errorString = tr("File name contains at least one invalid character");
-                (*it)->_instruction = CSYNC_INSTRUCTION_IGNORE;
+        for (const auto &syncItem : qAsConst(syncItems)) {
+            if (syncItem->_direction == SyncFileItem::Up
+                && isFileModifyingInstruction(syncItem->_instruction)
+                && syncItem->destination().contains(invalidFilenameRx)) {
+                syncItem->_errorString = tr("File name contains at least one invalid character");
+                syncItem->_instruction = CSYNC_INSTRUCTION_IGNORE;
             }
         }
     }
@@ -1677,19 +1676,19 @@ void SyncEngine::restoreOldFiles(SyncFileItemVector &syncItems)
        upload the client file. But we still downloaded the old file in a conflict file just in case
     */
 
-    for (auto it = syncItems.begin(); it != syncItems.end(); ++it) {
-        if ((*it)->_direction != SyncFileItem::Down)
+    for (const auto &syncItem : qAsConst(syncItems)) {
+        if (syncItem->_direction != SyncFileItem::Down)
             continue;
 
-        switch ((*it)->_instruction) {
+        switch (syncItem->_instruction) {
         case CSYNC_INSTRUCTION_SYNC:
-            qCWarning(lcEngine) << "restoreOldFiles: RESTORING" << (*it)->_file;
-            (*it)->_instruction = CSYNC_INSTRUCTION_CONFLICT;
+            qCWarning(lcEngine) << "restoreOldFiles: RESTORING" << syncItem->_file;
+            syncItem->_instruction = CSYNC_INSTRUCTION_CONFLICT;
             break;
         case CSYNC_INSTRUCTION_REMOVE:
-            qCWarning(lcEngine) << "restoreOldFiles: RESTORING" << (*it)->_file;
-            (*it)->_instruction = CSYNC_INSTRUCTION_NEW;
-            (*it)->_direction = SyncFileItem::Up;
+            qCWarning(lcEngine) << "restoreOldFiles: RESTORING" << syncItem->_file;
+            syncItem->_instruction = CSYNC_INSTRUCTION_NEW;
+            syncItem->_direction = SyncFileItem::Up;
             break;
         case CSYNC_INSTRUCTION_RENAME:
         case CSYNC_INSTRUCTION_NEW:

diff --git a/src/libsync/syncfilestatustracker.cpp b/src/libsync/syncfilestatustracker.cpp
index 03233e1deb5a4138006f662383f50ffc9e2bb74c..1c69da1718e79e20ecb2d4aa1a6dfedbb26213cf 100644 (file)
--- a/src/libsync/syncfilestatustracker.cpp
+++ b/src/libsync/syncfilestatustracker.cpp
@@ -244,16 +244,16 @@ void SyncFileStatusTracker::slotAboutToPropagate(SyncFileItemVector &items)
     // Swap into a copy since fileStatus() reads _dirtyPaths to determine the status
     QSet<QString> oldDirtyPaths;
     std::swap(_dirtyPaths, oldDirtyPaths);
-    for (auto it = oldDirtyPaths.constBegin(); it != oldDirtyPaths.constEnd(); ++it)
-        emit fileStatusChanged(getSystemDestination(*it), fileStatus(*it));
+    for (const auto &oldDirtyPath : qAsConst(oldDirtyPaths))
+        emit fileStatusChanged(getSystemDestination(oldDirtyPath), fileStatus(oldDirtyPath));
 
     // Make sure to push any status that might have been resolved indirectly since the last sync
     // (like an error file being deleted from disk)
-    for (auto it = _syncProblems.begin(); it != _syncProblems.end(); ++it)
-        oldProblems.erase(it->first);
-    for (auto it = oldProblems.begin(); it != oldProblems.end(); ++it) {
-        const QString &path = it->first;
-        SyncFileStatus::SyncFileStatusTag severity = it->second;
+    for (const auto &syncProblem : _syncProblems)
+        oldProblems.erase(syncProblem.first);
+    for (const auto &oldProblem : oldProblems) {
+        const QString &path = oldProblem.first;
+        SyncFileStatus::SyncFileStatusTag severity = oldProblem.second;
         if (severity == SyncFileStatus::StatusError)
             invalidateParentPaths(path);
         emit fileStatusChanged(getSystemDestination(path), fileStatus(path));

diff --git a/src/libsync/wordlist.cpp b/src/libsync/wordlist.cpp
index 69134ac3ef0d2b7f98a15977e3d0d18129914349..01b7b53280047ab5431c0f54f25f9092433c8168 100644 (file)
--- a/src/libsync/wordlist.cpp
+++ b/src/libsync/wordlist.cpp
@@ -13,9 +13,9 @@ int getRandomNumber(int max) {
 
     unsigned int num = 0;
 
-    for (int i = 0; i < 8; i++) {
+    for (unsigned char c : d) {
         num = num << 8;
-        num += d[i];
+        num += c;
     }
 
     return num % max;

diff --git a/test/testallfilesdeleted.cpp b/test/testallfilesdeleted.cpp
index 513fdb65dfb41d281317e1c4c5e6152df488f6fe..026aa7a60964cdea3693262bc373874952a8ee75 100644 (file)
--- a/test/testallfilesdeleted.cpp
+++ b/test/testallfilesdeleted.cpp
@@ -18,8 +18,8 @@ static void changeAllFileId(FileInfo &info) {
     if (!info.isDir)
         return;
     info.etag = generateEtag();
-    for (auto it = info.children.begin(); it != info.children.end(); ++it) {
-        changeAllFileId(*it);
+    for (auto &child : info.children) {
+        changeAllFileId(child);
     }
 }