SdkTool: Remove foreach / Q_FOREACH usage

Task-number: QTCREATORBUG-27464
Change-Id: I231597f60c7ddad00f7166e7d09c1c5b2ff48657
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>

src/tools/sdktool/addcmakeoperation.cpp

@@ -229,7 +229,7 @@ QVariantMap AddCMakeData::addCMake(const QVariantMap &map) const
     data << KeyValuePair({cm, AUTODETECTED_KEY}, QVariant(true));
     data << KeyValuePair({cm, PATH_KEY}, Utils::FilePath::fromUserInput(m_path).toVariant());
     KeyValuePairList extraList;
-    foreach (const KeyValuePair &pair, m_extra)
+    for (const KeyValuePair &pair : qAsConst(m_extra))
         extraList << KeyValuePair(QStringList({cm}) << pair.key, pair.value);
     data.append(extraList);
     data << KeyValuePair(COUNT, QVariant(count + 1));
@@ -251,7 +251,7 @@ bool AddCMakeData::exists(const QVariantMap &map, const QString &id)
     // support old settings using QByteArray for id's
     valueKeys.append(FindValueOperation::findValue(map, id.toUtf8()));
 
-    foreach (const QString &k, valueKeys) {
+    for (const QString &k : qAsConst(valueKeys)) {
         if (k.endsWith(QString('/') + ID_KEY)) {
             return true;
         }

src/tools/sdktool/adddebuggeroperation.cpp

@@ -208,9 +208,9 @@ void AddDebuggerOperation::unittest()
 QVariantMap AddDebuggerData::addDebugger(const QVariantMap &map) const
 {
     // Sanity check: Make sure autodetection source is not in use already:
-    QStringList valueKeys = FindValueOperation::findValue(map, QVariant(m_id));
+    const QStringList valueKeys = FindValueOperation::findValue(map, QVariant(m_id));
     bool hasId = false;
-    foreach (const QString &k, valueKeys) {
+    for (const QString &k : valueKeys) {
         if (k.endsWith(QString(QLatin1Char('/')) + QLatin1String(ID))) {
             hasId = true;
             break;
@@ -250,7 +250,7 @@ QVariantMap AddDebuggerData::addDebugger(const QVariantMap &map) const
     data << KeyValuePair(QStringList() << QLatin1String(COUNT), QVariant(count + 1));
 
     KeyValuePairList qtExtraList;
-    foreach (const KeyValuePair &pair, m_extra)
+    for (const KeyValuePair &pair : qAsConst(m_extra))
         qtExtraList << KeyValuePair(QStringList() << debugger << pair.key, pair.value);
     data.append(qtExtraList);
 

src/tools/sdktool/adddeviceoperation.cpp

@@ -412,8 +412,8 @@ bool AddDeviceData::exists(const QVariantMap &map, const QString &id)
     if (id == QLatin1String(INTERNAL_DSEKTOP_DEVICE_ID))
         return true;
     QVariantMap dmMap = map.value(QLatin1String(DEVICEMANAGER_ID)).toMap();
-    QVariantList devList = dmMap.value(QLatin1String(DEVICE_LIST_ID)).toList();
+    const QVariantList devList = dmMap.value(QLatin1String(DEVICE_LIST_ID)).toList();
-    foreach (const QVariant &dev, devList) {
+    for (const QVariant &dev : devList) {
         QVariantMap devData = dev.toMap();
         QString current = devData.value(QLatin1String(DEVICE_ID_ID)).toString();
         if (current == id)

src/tools/sdktool/addkeysoperation.cpp

@@ -229,7 +229,7 @@ QVariantMap AddKeysData::addKeys(const QVariantMap &map) const
     // Insert data:
     QVariantMap result = map;
 
-    foreach (const KeyValuePair &p, m_data) {
+    for (const KeyValuePair &p : m_data) {
         QList<QVariantMap> stack;
 
         // Set up a stack of QVariantMaps along the path we take:

src/tools/sdktool/addkitoperation.cpp

@@ -737,7 +737,7 @@ QVariantMap AddKitData::addKit(const QVariantMap &map,
     data << KeyValuePair(COUNT, QVariant(count + 1));
 
     KeyValuePairList qtExtraList;
-    foreach (const KeyValuePair &pair, m_extra)
+    for (const KeyValuePair &pair : qAsConst(m_extra))
         qtExtraList << KeyValuePair(QStringList() << kit << pair.key, pair.value);
     data.append(qtExtraList);
 

src/tools/sdktool/addqtoperation.cpp

@@ -318,7 +318,7 @@ QVariantMap AddQtData::addQt(const QVariantMap &map) const
     data << KeyValuePair(QStringList() << qt << ABIS, QVariant(m_abis));
 
     KeyValuePairList qtExtraList;
-    foreach (const KeyValuePair &pair, m_extra)
+    for (const KeyValuePair &pair : qAsConst(m_extra))
         qtExtraList << KeyValuePair(QStringList() << qt << pair.key, pair.value);
     data.append(qtExtraList);
 
@@ -343,8 +343,8 @@ bool AddQtData::exists(const QVariantMap &map, const QString &id)
     QString sdkId = extendId(id);
 
     // Sanity check: Make sure autodetection source is not in use already:
-    QStringList valueKeys = FindValueOperation::findValue(map, sdkId);
+    const QStringList valueKeys = FindValueOperation::findValue(map, sdkId);
-    foreach (const QString &k, valueKeys) {
+    for (const QString &k : valueKeys) {
         if (k.endsWith(QString(QLatin1Char('/')) + QLatin1String(AUTODETECTION_SOURCE)))
             return true;
     }

src/tools/sdktool/addtoolchainoperation.cpp

@@ -308,12 +308,12 @@ QVariantMap AddToolChainData::addToolChain(const QVariantMap &map) const
     data << KeyValuePair({tc, PATH}, Utils::FilePath::fromUserInput(m_path).toVariant());
     data << KeyValuePair({tc, TARGET_ABI}, QVariant(m_targetAbi));
     QVariantList abis;
-    QStringList abiStrings = m_supportedAbis.split(',');
+    const QStringList abiStrings = m_supportedAbis.split(',');
-    foreach (const QString &s, abiStrings)
+    for (const QString &s : abiStrings)
         abis << QVariant(s);
     data << KeyValuePair({tc, SUPPORTED_ABIS}, QVariant(abis));
     KeyValuePairList tcExtraList;
-    foreach (const KeyValuePair &pair, m_extra)
+    for (const KeyValuePair &pair : qAsConst(m_extra))
         tcExtraList << KeyValuePair(QStringList({tc}) << pair.key, pair.value);
     data.append(tcExtraList);
     data << KeyValuePair(COUNT, QVariant(count + 1));
@@ -335,7 +335,7 @@ bool AddToolChainData::exists(const QVariantMap &map, const QString &id)
     // support old settings using QByteArray for id's
     valueKeys.append(FindValueOperation::findValue(map, id.toUtf8()));
 
-    foreach (const QString &k, valueKeys) {
+    for (const QString &k : qAsConst(valueKeys)) {
         if (k.endsWith(QString('/') + ID)) {
             return true;
         }

src/tools/sdktool/findvalueoperation.cpp

@@ -82,9 +82,9 @@ int FindValueOperation::execute() const
     Q_ASSERT(!m_values.isEmpty());
     QVariantMap map = load(m_file);
 
-    foreach (const QVariant &v, m_values) {
+    for (const QVariant &v : qAsConst(m_values)) {
         const QStringList result = findValue(map, v);
-        foreach (const QString &r, result)
+        for (const QString &r : result)
             std::cout << qPrintable(r) << std::endl;
     }
 

src/tools/sdktool/getoperation.cpp

@@ -91,10 +91,10 @@ static QString toString(const QVariant &variant, int indentation = 0)
         return res;
     }
     case QVariant::List: {
-        QVariantList list = variant.toList();
+        const QVariantList list = variant.toList();
         QString res;
         int counter = 0;
-        foreach (const QVariant &item, list)
+        for (const QVariant &item : list)
             res += indent + QString::number(counter++) + QLatin1String(":\n") + toString(item, indentation + 1);
         return res;
     }
@@ -108,7 +108,7 @@ int GetOperation::execute() const
     Q_ASSERT(!m_keys.isEmpty());
     QVariantMap map = load(m_file);
 
-    foreach (const QString &key, m_keys) {
+    for (const QString &key : qAsConst(m_keys)) {
         const QVariant result = get(map, key);
         if (!result.isValid())
             std::cout << "<invalid>" << std::endl;

src/tools/sdktool/operation.cpp

@@ -55,7 +55,7 @@ QVariant valueFromString(const QString &v)
     } else if (type == QLatin1String("QVariantList")) {
         QVariantList list;
         const QStringList elements = value.split(QLatin1Char(','));
-        foreach (const QString &e, elements)
+        for (const QString &e : elements)
             list << QVariant(e);
         return QVariant(list);
     }

src/tools/sdktool/rmkeysoperation.cpp

@@ -172,7 +172,7 @@ QVariantMap RmKeysOperation::rmKeys(const QVariantMap &map, const QStringList &r
 {
     QVariantMap result = map;
 
-    foreach (const QString &r, removals) {
+    for (const QString &r : removals) {
         QList<QVariantMap> stack;
 
         const QStringList keys = r.split(QLatin1Char('/'));