Fix calls to non-const begin()/end() in range-for loops

This fixes -Wclazy-range-loop

Change-Id: I08a435b700017cdbe27fbfdbda6e26840d9a3568
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>

8 files changed, 31 insertions, 16 deletions

diff --git a/src/lib/corelib/tools/applecodesignutils.cpp b/src/lib/corelib/tools/applecodesignutils.cpp
index 67c4f5238..feae266bf 100644
--- a/src/lib/corelib/tools/applecodesignutils.cpp
+++ b/src/lib/corelib/tools/applecodesignutils.cpp
@@ -80,7 +80,8 @@ QVariantMap certificateInfo(const QByteArray &data)
     // Also potentially useful, but these are for signing pkgs which aren't used here
     // 1.2.840.113635.100.4.9 - 3rd Party Mac Developer Installer: <name>
     // 1.2.840.113635.100.4.13 - Developer ID Installer: <name>
-    for (const auto &extension : cert.extensions()) {
+    const auto extensions = cert.extensions();
+    for (const auto &extension : extensions) {
         if (extension.name() == QStringLiteral("extendedKeyUsage")) {
              if (!extension.value().toStringList().contains(QStringLiteral("Code Signing")))
                  return {};
@@ -89,7 +90,8 @@ QVariantMap certificateInfo(const QByteArray &data)
 
     const auto subjectInfo = [](const QSslCertificate &cert) {
         QVariantMap map;
-        for (const auto &attr : cert.subjectInfoAttributes())
+        const auto attributes = cert.subjectInfoAttributes();
+        for (const auto &attr : attributes)
             map.insert(QString::fromUtf8(attr), cert.subjectInfo(attr).front());
         return map;
     };
diff --git a/src/lib/corelib/tools/fileinfo.cpp b/src/lib/corelib/tools/fileinfo.cpp
index cec6b2660..8b0eedc27 100644
--- a/src/lib/corelib/tools/fileinfo.cpp
+++ b/src/lib/corelib/tools/fileinfo.cpp
@@ -404,8 +404,9 @@ bool removeFileRecursion(const QFileInfo &f, QString *errorMessage)
         const QDir dir(f.absoluteFilePath());
 
         // QDir::System is needed for broken symlinks.
-        for (const QFileInfo &fi : dir.entryInfoList(QDir::AllEntries | QDir::NoDotAndDotDot
-                                                     | QDir::Hidden | QDir::System))
+        const auto fileInfos = dir.entryInfoList(QDir::AllEntries | QDir::NoDotAndDotDot
+                                                 | QDir::Hidden | QDir::System);
+        for (const QFileInfo &fi : fileInfos)
             removeFileRecursion(fi, errorMessage);
         QDir parent = f.absoluteDir();
         if (!parent.rmdir(f.fileName())) {
diff --git a/src/lib/corelib/tools/jsliterals.cpp b/src/lib/corelib/tools/jsliterals.cpp
index bf9720493..74328006c 100644
--- a/src/lib/corelib/tools/jsliterals.cpp
+++ b/src/lib/corelib/tools/jsliterals.cpp
@@ -77,7 +77,8 @@ QString toJSLiteral(const QVariant &val)
         return Internal::StringConstants::undefinedValue();
     if (val.type() == QVariant::List || val.type() == QVariant::StringList) {
         QString res;
-        for (const QVariant &child : val.toList()) {
+        const auto list = val.toList();
+        for (const QVariant &child : list) {
             if (res.length()) res.append(QLatin1String(", "));
             res.append(toJSLiteral(child));
         }
diff --git a/src/lib/corelib/tools/msvcinfo.cpp b/src/lib/corelib/tools/msvcinfo.cpp
index f51ba8ba2..cbec7b457 100644
--- a/src/lib/corelib/tools/msvcinfo.cpp
+++ b/src/lib/corelib/tools/msvcinfo.cpp
@@ -70,7 +70,8 @@ public:
     TemporaryEnvChanger(const QProcessEnvironment &envChanges) : m_locker(envMutex)
     {
         QProcessEnvironment currentEnv = QProcessEnvironment::systemEnvironment();
-        for (const QString &key : envChanges.keys()) {
+        const auto keys = envChanges.keys();
+        for (const QString &key : keys) {
             m_changesToRestore.insert(key, currentEnv.value(key));
             qputenv(qPrintable(key), qPrintable(envChanges.value(key)));
         }
@@ -78,7 +79,8 @@ public:
 
     ~TemporaryEnvChanger()
     {
-        for (const QString &key : m_changesToRestore.keys())
+        const auto keys = m_changesToRestore.keys();
+        for (const QString &key : keys)
             qputenv(qPrintable(key), qPrintable(m_changesToRestore.value(key)));
     }
 
diff --git a/src/lib/corelib/tools/preferences.cpp b/src/lib/corelib/tools/preferences.cpp
index ca3fe8378..644c2722f 100644
--- a/src/lib/corelib/tools/preferences.cpp
+++ b/src/lib/corelib/tools/preferences.cpp
@@ -131,14 +131,16 @@ JobLimits Preferences::jobLimits() const
 {
     const QString prefix = QStringLiteral("preferences.jobLimit");
     JobLimits limits;
-    for (const QString &key : m_settings->allKeysWithPrefix(prefix, Settings::allScopes())) {
+    const auto keys = m_settings->allKeysWithPrefix(prefix, Settings::allScopes());
+    for (const QString &key : keys) {
         limits.setJobLimit(key, m_settings->value(prefix + QLatin1Char('.') + key,
                                                   Settings::allScopes()).toInt());
     }
     const QString fullPrefix = prefix + QLatin1Char('.');
     if (!m_profile.isEmpty()) {
         Profile p(m_profile, m_settings, m_profileContents);
-        for (const QString &key : p.allKeys(Profile::KeySelectionRecursive)) {
+        const auto keys = p.allKeys(Profile::KeySelectionRecursive);
+        for (const QString &key : keys) {
             if (!key.startsWith(fullPrefix))
                 continue;
             const QString jobPool = key.mid(fullPrefix.size());
diff --git a/src/lib/corelib/tools/settingscreator.cpp b/src/lib/corelib/tools/settingscreator.cpp
index 8479a67dc..cddc3b93d 100644
--- a/src/lib/corelib/tools/settingscreator.cpp
+++ b/src/lib/corelib/tools/settingscreator.cpp
@@ -102,7 +102,8 @@ void SettingsCreator::migrate()
     // that's only preferences.qbsSearchPaths as written by libqtprofilesetup, but we don't want
     // to hardcode that here.
     m_settings.reset(new QSettings(m_newSettingsFilePath, format()));
-    for (const QString &key : m_settings->allKeys()) {
+    const auto allKeys = m_settings->allKeys();
+    for (const QString &key : allKeys) {
         QVariant v = m_settings->value(key);
         if (v.type() == QVariant::String) {
             QString s = v.toString();
diff --git a/src/lib/corelib/tools/settingsmodel.cpp b/src/lib/corelib/tools/settingsmodel.cpp
index 4a90773eb..d67f1da5c 100644
--- a/src/lib/corelib/tools/settingsmodel.cpp
+++ b/src/lib/corelib/tools/settingsmodel.cpp
@@ -327,7 +327,8 @@ void SettingsModel::SettingsModelPrivate::readSettings()
 {
     qDeleteAll(rootNode.children);
     rootNode.children.clear();
-    for (const QString &topLevelKey : settings->directChildren(QString(), scope()))
+    const auto topLevelKeys = settings->directChildren(QString(), scope());
+    for (const QString &topLevelKey : topLevelKeys)
         addNodeFromSettings(&rootNode, topLevelKey);
     for (QVariantMap::ConstIterator it = additionalProperties.constBegin();
          it != additionalProperties.constEnd(); ++it) {
@@ -353,7 +354,8 @@ void SettingsModel::SettingsModelPrivate::addNodeFromSettings(Node *parentNode,
             = fullyQualifiedName.mid(fullyQualifiedName.lastIndexOf(QLatin1Char('.')) + 1);
     Node * const node = createNode(parentNode, nodeName);
     node->value = settingsValueToRepresentation(settings->value(fullyQualifiedName, scope()));
-    for (const QString &childKey : settings->directChildren(fullyQualifiedName, scope()))
+    const auto childKeys = settings->directChildren(fullyQualifiedName, scope());
+    for (const QString &childKey : childKeys)
         addNodeFromSettings(node, fullyQualifiedName + QLatin1Char('.') + childKey);
     dirty = true;
 }
diff --git a/src/lib/corelib/tools/vsenvironmentdetector.cpp b/src/lib/corelib/tools/vsenvironmentdetector.cpp
index b91a8ff74..869423950 100644
--- a/src/lib/corelib/tools/vsenvironmentdetector.cpp
+++ b/src/lib/corelib/tools/vsenvironmentdetector.cpp
@@ -201,9 +201,12 @@ static QString vcArchitecture(const MSVC *msvc)
     if (msvc->architecture == StringConstants::x86_64Arch())
         vcArch = StringConstants::amd64Arch();
 
-    for (const QString &hostPrefix :
-         QStringList({StringConstants::x86Arch(), QStringLiteral("amd64_"),
-                     QStringLiteral("x86_")})) {
+    const QString hostPrefixes[] = {
+        StringConstants::x86Arch(),
+        QStringLiteral("amd64_"),
+        QStringLiteral("x86_")
+    };
+    for (const QString &hostPrefix : hostPrefixes) {
         if (QFile::exists(msvc->clPathForArchitecture(hostPrefix + vcArch))) {
             vcArch.prepend(hostPrefix);
             break;
@@ -237,7 +240,8 @@ void VsEnvironmentDetector::parseBatOutput(const QByteArray &output, std::vector
 {
     QString arch;
     QProcessEnvironment *targetEnv = nullptr;
-    for (QByteArray line : output.split('\n')) {
+    const auto lines = output.split('\n');
+    for (QByteArray line : lines) {
         line = line.trimmed();
         if (line.isEmpty())
             continue;