plugins: Remove foreach usage

Change-Id: Idf60caed3b5f4ec4c6e990a9e3188487bcc824f8
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>

17 files changed, 56 insertions, 46 deletions

diff --git a/src/libs/utils/mimetypes/mimetype.cpp b/src/libs/utils/mimetypes/mimetype.cpp
index e749a569c6..3786d37a79 100644
--- a/src/libs/utils/mimetypes/mimetype.cpp
+++ b/src/libs/utils/mimetypes/mimetype.cpp
@@ -176,7 +176,7 @@ QString MimeType::comment() const
     QStringList languageList;
     languageList << QLocale::system().name();
     languageList << QLocale::system().uiLanguages();
-    Q_FOREACH (const QString &language, languageList) {
+    for (const QString &language : std::as_const(languageList)) {
         const QString lang = language == QLatin1String("C") ? QLatin1String("en_US") : language;
         const QString comm = d->localeComments.value(lang);
         if (!comm.isEmpty())
diff --git a/src/plugins/coreplugin/documentmanager.cpp b/src/plugins/coreplugin/documentmanager.cpp
index f3edb6d612..cc5639d597 100644
--- a/src/plugins/coreplugin/documentmanager.cpp
+++ b/src/plugins/coreplugin/documentmanager.cpp
@@ -439,9 +439,9 @@ static void dump()
         }
     }
     qDebug() << "------- dumping files with watch list";
-    foreach (IDocument *key, d->m_filesWithWatch.keys()) {
+    const QList<IDocument *> keys = d->m_filesWithWatch.keys()
+    for (IDocument *key : keys)
         qDebug() << key->fileName() << d->m_filesWithWatch.value(key);
-    }
     qDebug() << "------- dumping watch list";
     if (d->m_fileWatcher)
         qDebug() << d->m_fileWatcher->files();
diff --git a/src/plugins/cppeditor/cpplocalsymbols_test.cpp b/src/plugins/cppeditor/cpplocalsymbols_test.cpp
index 93cca034a1..e3471399d3 100644
--- a/src/plugins/cppeditor/cpplocalsymbols_test.cpp
+++ b/src/plugins/cppeditor/cpplocalsymbols_test.cpp
@@ -163,7 +163,7 @@ void LocalSymbolsTest::test()
     LocalSymbols localSymbols(document, functionDefinition);
 
     const QList<Result> actualUses = Result::fromLocalUses(localSymbols.uses);
-//    foreach (const Result &result, actualUses)
+//    for (const Result &result : actualUses)
 //        qDebug() << QTest::toString(result);
     QCOMPARE(actualUses, expectedUses);
 }
diff --git a/src/plugins/cppeditor/cppuseselections_test.cpp b/src/plugins/cppeditor/cppuseselections_test.cpp
index 15a2a1d23a..8662a2dc99 100644
--- a/src/plugins/cppeditor/cppuseselections_test.cpp
+++ b/src/plugins/cppeditor/cppuseselections_test.cpp
@@ -89,7 +89,7 @@ UseSelectionsTestCase::UseSelectionsTestCase(CppTestDocument &testFile,
         QEXPECT_FAIL("non-local use as macro argument - argument expanded 1", "TODO", Abort);
     }
     QVERIFY(!hasTimedOut);
-//    foreach (const Selection &selection, selections)
+//    for (const Selection &selection : selections)
 //        qDebug() << QTest::toString(selection);
     if (!clangCodeModel)
         QEXPECT_FAIL("non-local use as macro argument - argument expanded 2", "TODO", Abort);
diff --git a/src/plugins/debugger/cdb/cdbengine.cpp b/src/plugins/debugger/cdb/cdbengine.cpp
index 7f976861da..e56fee8e8f 100644
--- a/src/plugins/debugger/cdb/cdbengine.cpp
+++ b/src/plugins/debugger/cdb/cdbengine.cpp
@@ -2998,7 +2998,7 @@ void CdbEngine::handleBreakPoints(const DebuggerResponse &response)
             }
             QTC_ASSERT(false, qDebug() << "bp not found in either of the pending maps");
         } // not pending reported
-    } // foreach
+    } // for
     if (m_pendingBreakpointMap.empty())
         str << "All breakpoints have been resolved.\n";
     else
diff --git a/src/plugins/glsleditor/glslindenter.cpp b/src/plugins/glsleditor/glslindenter.cpp
index 10caa1e55d..a7135515ef 100644
--- a/src/plugins/glsleditor/glslindenter.cpp
+++ b/src/plugins/glsleditor/glslindenter.cpp
@@ -115,7 +115,7 @@ TextEditor::IndentationForBlock GlslIndenter::indentationForBlocks(
     codeFormatter.updateStateUntil(blocks.last());
 
     TextEditor::IndentationForBlock ret;
-    foreach (QTextBlock block, blocks) {
+    for (const QTextBlock &block : blocks) {
         int indent;
         int padding;
         codeFormatter.indentFor(block, &indent, &padding);
diff --git a/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp b/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp
index d99834188c..3d3cf130ce 100644
--- a/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp
+++ b/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp
@@ -123,7 +123,8 @@ void SubComponentManager::removeImport(int index)
         if (!m_dirToQualifier.contains(canonicalDirPath))
             m_watcher.removePath(canonicalDirPath);
 
-//        foreach (const QFileInfo &monitoredFile, watchedFiles(canonicalDirPath)) { ### todo: proper support for import as
+//        const QList<QFileInfo> files = watchedFiles(canonicalDirPath);
+//        for (const QFileInfo &monitoredFile : files) { ### todo: proper support for import as
 //            if (!m_dirToQualifier.contains(canonicalDirPath))
 //                unregisterQmlFile(monitoredFile, import.qualifier());
 //        }
diff --git a/src/plugins/qmlprojectmanager/qmlproject.cpp b/src/plugins/qmlprojectmanager/qmlproject.cpp
index e3508fea80..01da36d185 100644
--- a/src/plugins/qmlprojectmanager/qmlproject.cpp
+++ b/src/plugins/qmlprojectmanager/qmlproject.cpp
@@ -161,7 +161,8 @@ QmlBuildSystem::QmlBuildSystem(Target *target)
 // FIXME: Check. Probably bogus after the BuildSystem move.
 //    // addedTarget calls updateEnabled on the runconfigurations
 //    // which needs to happen after refresh
-//    foreach (Target *t, targets())
+//    const QLis<Target> targetList = targets();
+//    for (Target *t : targetList)
 //        addedTarget(t);
 
     connect(target->project(), &Project::activeTargetChanged,
diff --git a/src/plugins/qnx/qnxutils.cpp b/src/plugins/qnx/qnxutils.cpp
index 71bc1da09e..c96a294fad 100644
--- a/src/plugins/qnx/qnxutils.cpp
+++ b/src/plugins/qnx/qnxutils.cpp
@@ -130,7 +130,8 @@ FilePath QnxUtils::envFilePath(const FilePath &sdpPath)
 
 QString QnxUtils::defaultTargetVersion(const QString &sdpPath)
 {
-    foreach (const ConfigInstallInformation &sdpInfo, installedConfigs()) {
+    const QList<ConfigInstallInformation> configs = installedConfigs();
+    for (const ConfigInstallInformation &sdpInfo : configs) {
         if (!sdpInfo.path.compare(sdpPath, HostOsInfo::fileNameCaseSensitivity()))
             return sdpInfo.version;
     }
@@ -146,10 +147,9 @@ QList<ConfigInstallInformation> QnxUtils::installedConfigs(const QString &config
     if (!QDir(sdpConfigPath).exists())
         return sdpList;
 
-    QFileInfoList sdpfileList =
-            QDir(sdpConfigPath).entryInfoList(QStringList() << QLatin1String("*.xml"),
-                                              QDir::Files, QDir::Time);
-    foreach (const QFileInfo &sdpFile, sdpfileList) {
+    const QFileInfoList sdpfileList
+        = QDir(sdpConfigPath).entryInfoList(QStringList{"*.xml"}, QDir::Files, QDir::Time);
+    for (const QFileInfo &sdpFile : sdpfileList) {
         QFile xmlFile(sdpFile.absoluteFilePath());
         if (!xmlFile.open(QIODevice::ReadOnly))
             continue;
diff --git a/src/plugins/qtsupport/gettingstartedwelcomepage.cpp b/src/plugins/qtsupport/gettingstartedwelcomepage.cpp
index 6f866a5c16..f3dd64d07f 100644
--- a/src/plugins/qtsupport/gettingstartedwelcomepage.cpp
+++ b/src/plugins/qtsupport/gettingstartedwelcomepage.cpp
@@ -131,7 +131,7 @@ QString ExamplesWelcomePage::copyToAlternativeLocation(const QFileInfo& proFileI
                 for (QStringList::Iterator it = filesToOpen.begin(); it != end; ++it)
                     it->replace(projectDir, targetDir);
 
-                foreach (const QString &dependency, dependencies) {
+                for (const QString &dependency : dependencies) {
                     const FilePath targetFile = FilePath::fromString(targetDir)
                             .pathAppended(QDir(dependency).dirName());
                     if (!FileUtils::copyRecursively(FilePath::fromString(dependency), targetFile,
diff --git a/src/plugins/qtsupport/profilereader.cpp b/src/plugins/qtsupport/profilereader.cpp
index e070d2b254..1c8ac51b54 100644
--- a/src/plugins/qtsupport/profilereader.cpp
+++ b/src/plugins/qtsupport/profilereader.cpp
@@ -86,7 +86,7 @@ ProFileReader::ProFileReader(QMakeGlobals *option, QMakeVfs *vfs)
 
 ProFileReader::~ProFileReader()
 {
-    foreach (ProFile *pf, m_proFiles)
+    for (ProFile *pf : std::as_const(m_proFiles))
         pf->deref();
 }
 
diff --git a/src/plugins/qtsupport/qscxmlcgenerator.cpp b/src/plugins/qtsupport/qscxmlcgenerator.cpp
index 9c94676a6c..c9aea7f6e6 100644
--- a/src/plugins/qtsupport/qscxmlcgenerator.cpp
+++ b/src/plugins/qtsupport/qscxmlcgenerator.cpp
@@ -33,7 +33,8 @@ QScxmlcGenerator::QScxmlcGenerator(const Project *project,
 Tasks QScxmlcGenerator::parseIssues(const QByteArray &processStderr)
 {
     Tasks issues;
-    foreach (const QByteArray &line, processStderr.split('\n')) {
+    const QList<QByteArray> lines = processStderr.split('\n');
+    for (const QByteArray &line : lines) {
         QByteArrayList tokens = line.split(':');
 
         if (tokens.length() > 4) {
diff --git a/src/shared/help/bookmarkmanager.cpp b/src/shared/help/bookmarkmanager.cpp
index 0e50817a15..aebf14ba50 100644
--- a/src/shared/help/bookmarkmanager.cpp
+++ b/src/shared/help/bookmarkmanager.cpp
@@ -459,9 +459,10 @@ void BookmarkWidget::setup()
 void BookmarkWidget::expandItems()
 {
     QStandardItemModel *model = bookmarkManager->treeBookmarkModel();
-    QList<QStandardItem*>list = model->findItems(QLatin1String("*"),
-        Qt::MatchWildcard | Qt::MatchRecursive, 0);
-    foreach (const QStandardItem* item, list) {
+    const QList<QStandardItem *> list = model->findItems(QLatin1String("*"),
+                                                         Qt::MatchWildcard | Qt::MatchRecursive,
+                                                         0);
+    for (const QStandardItem *item : list) {
         const QModelIndex& index = model->indexFromItem(item);
         treeView->setExpanded(filterBookmarkModel->mapFromSource(index),
             item->data(Qt::UserRole + 11).toBool());
@@ -604,11 +605,12 @@ QStringList BookmarkManager::bookmarkFolders() const
 {
     QStringList folders(tr("Bookmarks"));
 
-    QList<QStandardItem*>list = treeModel->findItems(QLatin1String("*"),
-        Qt::MatchWildcard | Qt::MatchRecursive, 0);
+    const QList<QStandardItem *> list = treeModel->findItems(QLatin1String("*"),
+                                                             Qt::MatchWildcard | Qt::MatchRecursive,
+                                                             0);
 
     QString data;
-    foreach (const QStandardItem *item, list) {
+    for (const QStandardItem *item : list) {
         data = item->data(Qt::UserRole + 10).toString();
         if (data == QLatin1String("Folder"))
             folders << item->data(Qt::DisplayRole).toString();
@@ -649,8 +651,8 @@ void BookmarkManager::removeBookmarkItem(QTreeView *treeView,
         }
 
         if (data != QLatin1String("Folder")) {
-            QList<QStandardItem*>itemList = listModel->findItems(item->text());
-            foreach (const QStandardItem *i, itemList) {
+            const QList<QStandardItem *> itemList = listModel->findItems(item->text());
+            for (const QStandardItem *i : itemList) {
                 if (i->data(Qt::UserRole + 10) == data) {
                     listModel->removeRow(i->row());
                     break;
@@ -754,11 +756,12 @@ void BookmarkManager::setupBookmarkModels()
 QString BookmarkManager::uniqueFolderName() const
 {
     QString folderName = tr("New Folder");
-    QList<QStandardItem*> list = treeModel->findItems(folderName,
-        Qt::MatchContains | Qt::MatchRecursive, 0);
+    const QList<QStandardItem *> list = treeModel->findItems(folderName,
+                                                             Qt::MatchContains | Qt::MatchRecursive,
+                                                             0);
     if (!list.isEmpty()) {
         QStringList names;
-        foreach (const QStandardItem *item, list)
+        for (const QStandardItem *item : list)
             names << item->text();
 
         QString folderNameBase = tr("New Folder") + QLatin1String(" %1");
@@ -779,8 +782,8 @@ void BookmarkManager::removeBookmarkFolderItems(QStandardItem *item)
             removeBookmarkFolderItems(child);
 
         QString data = child->data(Qt::UserRole + 10).toString();
-        QList<QStandardItem*>itemList = listModel->findItems(child->text());
-        foreach (const QStandardItem *i, itemList) {
+        const QList<QStandardItem*> itemList = listModel->findItems(child->text());
+        for (const QStandardItem *i : itemList) {
             if (i->data(Qt::UserRole + 10) == data) {
                 listModel->removeRow(i->row());
                 break;
diff --git a/src/shared/proparser/profileevaluator.cpp b/src/shared/proparser/profileevaluator.cpp
index 0e8afe10ab..bd284fb0e5 100644
--- a/src/shared/proparser/profileevaluator.cpp
+++ b/src/shared/proparser/profileevaluator.cpp
@@ -62,7 +62,8 @@ QVector<ProFileEvaluator::SourceFile> ProFileEvaluator::fixifiedValues(
         bool expandWildcards) const
 {
     QVector<SourceFile> result;
-    foreach (const ProString &str, d->values(ProKey(variable))) {
+    const ProStringList values = d->values(ProKey(variable));
+    for (const ProString &str : values) {
         const QString &el = d->m_option->expandEnvVars(str.toQString());
         const QString fn = IoUtils::isAbsolutePath(el)
                 ? QDir::cleanPath(el) : QDir::cleanPath(baseDirectory + QLatin1Char('/') + el);
@@ -115,7 +116,8 @@ QStringList ProFileEvaluator::absolutePathValues(
         const QString &variable, const QString &baseDirectory) const
 {
     QStringList result;
-    foreach (const QString &el, values(variable)) {
+    const QStringList valueList = values(variable);
+    for (const QString &el : valueList) {
         QString absEl = IoUtils::resolvePath(baseDirectory, el);
         if (IoUtils::fileType(absEl) == IoUtils::FileIsDir)
             result << absEl;
@@ -129,7 +131,8 @@ QVector<ProFileEvaluator::SourceFile> ProFileEvaluator::absoluteFileValues(
 {
     QMakeVfs::VfsFlags flags = (d->m_cumulative ? QMakeVfs::VfsCumulative : QMakeVfs::VfsExact);
     QVector<SourceFile> result;
-    foreach (const ProString &str, d->values(ProKey(variable))) {
+    const ProStringList values = d->values(ProKey(variable));
+    for (const ProString &str : values) {
         bool &seen = (*handled)[str];
         if (seen)
             continue;
@@ -144,7 +147,7 @@ QVector<ProFileEvaluator::SourceFile> ProFileEvaluator::absoluteFileValues(
             }
             absEl = fn;
         } else {
-            foreach (const QString &dir, searchDirs) {
+            for (const QString &dir : searchDirs) {
                 QString fn = QDir::cleanPath(dir + QLatin1Char('/') + el);
                 if (m_vfs->exists(fn, flags)) {
                     result << SourceFile{fn, str.sourceFile()};
@@ -169,7 +172,8 @@ QVector<ProFileEvaluator::SourceFile> ProFileEvaluator::absoluteFileValues(
                     wildcard.detach(); // Keep m_tmp out of QRegExp's cache
                     QDir theDir(absDir);
                     theDir.setFilter(theDir.filter() & ~QDir::AllDirs);
-                    foreach (const QString &fn, theDir.entryList(QStringList(wildcard)))
+                    const QStringList list = theDir.entryList(QStringList(wildcard));
+                    for (const QString &fn : list)
                         if (fn != QLatin1String(".") && fn != QLatin1String(".."))
                             result << SourceFile{absDir + QLatin1Char('/') + fn, str.sourceFile()};
                     QString directoryWithWildcard(absDir);
diff --git a/src/shared/proparser/qmakebuiltins.cpp b/src/shared/proparser/qmakebuiltins.cpp
index 15af05865b..7b458ea624 100644
--- a/src/shared/proparser/qmakebuiltins.cpp
+++ b/src/shared/proparser/qmakebuiltins.cpp
@@ -546,7 +546,7 @@ void QMakeEvaluator::populateDeps(
             if (depends.isEmpty()) {
                 rootSet.insert(first(ProKey(prefix + item + priosfx)).toInt(), item);
             } else {
-                foreach (const ProString &dep, depends) {
+                for (const ProString &dep : std::as_const(depends)) {
                     dset.insert(dep.toKey());
                     dependees[dep.toKey()] << item;
                 }
@@ -699,7 +699,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateBuiltinExpand(
             evalError(fL1S("num_add(num, ...) requires at least one argument."));
         } else {
             qlonglong sum = 0;
-            foreach (const ProString &arg, args) {
+            for (const ProString &arg : args) {
                 if (arg.contains(QLatin1Char('.'))) {
                     evalError(fL1S("num_add(): floats are currently not supported."));
                     goto nafail;
@@ -1174,7 +1174,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateBuiltinExpand(
                 rootSet.erase(it);
                 if ((func_t == E_RESOLVE_DEPENDS) || orgList.contains(item))
                     ret.prepend(item);
-                foreach (const ProString &dep, dependees[item.toKey()]) {
+                for (const ProString &dep : std::as_const(dependees[item.toKey()])) {
                     QSet<ProKey> &dset = dependencies[dep.toKey()];
                     dset.remove(item.toKey());
                     if (dset.isEmpty())
@@ -1185,11 +1185,11 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateBuiltinExpand(
         break;
     case E_ENUMERATE_VARS: {
         QSet<ProString> keys;
-        foreach (const ProValueMap &vmap, m_valuemapStack)
+        for (const ProValueMap &vmap : std::as_const(m_valuemapStack))
             for (ProValueMap::ConstIterator it = vmap.constBegin(); it != vmap.constEnd(); ++it)
                 keys.insert(it.key());
         ret.reserve(keys.size());
-        foreach (const ProString &key, keys)
+        for (const ProString &key : std::as_const(keys))
             ret << key;
         break; }
     case E_SHADOWED:
diff --git a/src/shared/proparser/qmakeevaluator.cpp b/src/shared/proparser/qmakeevaluator.cpp
index 1a58ab97c8..04ceb370e5 100644
--- a/src/shared/proparser/qmakeevaluator.cpp
+++ b/src/shared/proparser/qmakeevaluator.cpp
@@ -1231,7 +1231,7 @@ bool QMakeEvaluator::loadSpec()
         qmakespec = m_hostBuild ? QLatin1String("default-host") : QLatin1String("default");
 #endif
     if (IoUtils::isRelativePath(qmakespec)) {
-        foreach (const QString &root, m_mkspecPaths) {
+        for (const QString &root : std::as_const(m_mkspecPaths)) {
             QString mkspec = root + QLatin1Char('/') + qmakespec;
             if (IoUtils::exists(mkspec)) {
                 qmakespec = mkspec;
@@ -1472,7 +1472,7 @@ void QMakeEvaluator::updateMkspecPaths()
     for (const QString &it : paths)
         ret << it + concat;
 
-    foreach (const QString &it, m_qmakepath)
+    for (const QString &it : std::as_const(m_qmakepath))
         ret << it + concat;
 
     if (!m_buildRoot.isEmpty())
@@ -1514,7 +1514,7 @@ void QMakeEvaluator::updateFeaturePaths()
     for (const QString &item : items)
         feature_bases << (item + mkspecs_concat);
 
-    foreach (const QString &item, m_qmakepath)
+    for (const QString &item : std::as_const(m_qmakepath))
         feature_bases << (item + mkspecs_concat);
 
     if (!m_qmakespec.isEmpty()) {
@@ -1536,7 +1536,7 @@ void QMakeEvaluator::updateFeaturePaths()
     feature_bases << (m_option->propertyValue(ProKey("QT_HOST_DATA/get")) + mkspecs_concat);
     feature_bases << (m_option->propertyValue(ProKey("QT_HOST_DATA/src")) + mkspecs_concat);
 
-    foreach (const QString &fb, feature_bases) {
+    for (const QString &fb : std::as_const(feature_bases)) {
         const auto sfxs = values(ProKey("QMAKE_PLATFORM"));
         for (const ProString &sfx : sfxs)
             feature_roots << (fb + features_concat + sfx + QLatin1Char('/'));
@@ -1550,7 +1550,7 @@ void QMakeEvaluator::updateFeaturePaths()
     feature_roots.removeDuplicates();
 
     QStringList ret;
-    foreach (const QString &root, feature_roots)
+    for (const QString &root : std::as_const(feature_roots))
         if (IoUtils::exists(root))
             ret << root;
     m_featureRoots = new QMakeFeatureRoots(ret);
diff --git a/src/shared/proparser/qmakeglobals.cpp b/src/shared/proparser/qmakeglobals.cpp
index 97b28a15ea..e5194b3625 100644
--- a/src/shared/proparser/qmakeglobals.cpp
+++ b/src/shared/proparser/qmakeglobals.cpp
@@ -168,7 +168,7 @@ void QMakeGlobals::commitCommandLineArguments(QMakeCmdLineParserState &state)
 {
     if (!state.extraargs.isEmpty()) {
         QString extra = fL1S("QMAKE_EXTRA_ARGS =");
-        foreach (const QString &ea, state.extraargs)
+        for (const QString &ea  : std::as_const(state.extraargs))
             extra += QLatin1Char(' ') + QMakeEvaluator::quoteValue(ProString(ea));
         state.cmds[QMakeEvalBefore] << extra;
     }