Remove spaces in initializer lists

Format initializer lists code style like.

Change-Id: Ib82c235e4ba7dc75ee96a7abc0c47eff7b0a9013
Reviewed-by: hjk <hjk@qt.io>

6 files changed, 45 insertions, 45 deletions

diff --git a/src/tools/sdktool/addcmakeoperation.cpp b/src/tools/sdktool/addcmakeoperation.cpp
index 33c4b2541a..d6e6146d75 100644
--- a/src/tools/sdktool/addcmakeoperation.cpp
+++ b/src/tools/sdktool/addcmakeoperation.cpp
@@ -210,18 +210,18 @@ QVariantMap AddCMakeOperation::addCMake(const QVariantMap &map, const QString &i
         nameList << GetOperation::get(map, nameKey).toString();
     const QString uniqueName = makeUnique(displayName, nameList);
 
-    QVariantMap result = RmKeysOperation::rmKeys(map, { COUNT });
+    QVariantMap result = RmKeysOperation::rmKeys(map, {COUNT});
 
     const QString cm = QString::fromLatin1(PREFIX) + QString::number(count);
 
     KeyValuePairList data;
-    data << KeyValuePair({ cm, ID_KEY }, QVariant(id));
-    data << KeyValuePair({ cm, DISPLAYNAME_KEY }, QVariant(uniqueName));
-    data << KeyValuePair({ cm, AUTODETECTED_KEY }, QVariant(true));
-    data << KeyValuePair({ cm, PATH_KEY }, QVariant(path));
+    data << KeyValuePair({cm, ID_KEY}, QVariant(id));
+    data << KeyValuePair({cm, DISPLAYNAME_KEY}, QVariant(uniqueName));
+    data << KeyValuePair({cm, AUTODETECTED_KEY}, QVariant(true));
+    data << KeyValuePair({cm, PATH_KEY}, QVariant(path));
     KeyValuePairList extraList;
     foreach (const KeyValuePair &pair, extra)
-        extraList << KeyValuePair(QStringList({ cm }) << pair.key, pair.value);
+        extraList << KeyValuePair(QStringList({cm}) << pair.key, pair.value);
     data.append(extraList);
     data << KeyValuePair(COUNT, QVariant(count + 1));
 
diff --git a/src/tools/sdktool/addkitoperation.cpp b/src/tools/sdktool/addkitoperation.cpp
index ff8ad11b1a..5ae75099d7 100644
--- a/src/tools/sdktool/addkitoperation.cpp
+++ b/src/tools/sdktool/addkitoperation.cpp
@@ -336,7 +336,7 @@ bool AddKitOperation::test() const
                                            "uname", 1,
                                            KeyValuePairList());
 
-    const QStringList env = { "TEST=1", "PATH" };
+    const QStringList env = {"TEST=1", "PATH"};
 
     if (map.count() != 3
             || !map.contains(VERSION) || map.value(VERSION).toInt() != 1
@@ -354,7 +354,7 @@ bool AddKitOperation::test() const
                                tcs, "{qt-id}", "unsupported/mkspec",
                                QString(), QString(), QString(), QString(), QString(), QStringList(),
                                QStringList(),
-                               KeyValuePairList({ KeyValuePair("PE.Profile.Data/extraData", QVariant("extraValue")) }));
+                               KeyValuePairList({KeyValuePair("PE.Profile.Data/extraData", QVariant("extraValue"))}));
     if (!empty.isEmpty())
         return false;
     // Do not fail if TC is an ABI:
@@ -365,7 +365,7 @@ bool AddKitOperation::test() const
                    "/usr/bin/gdb-test", "Desktop", "{dev-id}", QString(),
                    tcs, "{qt-id}", "unsupported/mkspec",
                    QString(), QString(), QString(), QString(), QString(), QStringList(), env,
-                   KeyValuePairList({ KeyValuePair("PE.Profile.Data/extraData", QVariant("extraValue")) }));
+                   KeyValuePairList({KeyValuePair("PE.Profile.Data/extraData", QVariant("extraValue"))}));
     if (empty.isEmpty())
         return false;
     // QTCREATORBUG-11983, mach_o was not covered by the first attempt to fix this.
@@ -375,7 +375,7 @@ bool AddKitOperation::test() const
                    "/usr/bin/gdb-test", "Desktop", "{dev-id}", QString(),
                    tcs, "{qt-id}", "unsupported/mkspec",
                    QString(), QString(), QString(), QString(), QString(), QStringList(), env,
-                   KeyValuePairList({ KeyValuePair("PE.Profile.Data/extraData", QVariant("extraValue")) }));
+                   KeyValuePairList({KeyValuePair("PE.Profile.Data/extraData", QVariant("extraValue"))}));
     if (empty.isEmpty())
         return false;
 
@@ -388,7 +388,7 @@ bool AddKitOperation::test() const
                    "/usr/bin/gdb-test", "Desktop", "{dev-id}", QString(), tcs, "{qtXX-id}",
                    "unsupported/mkspec",
                    QString(), QString(), QString(), QString(), QString(), QStringList(), env,
-                   KeyValuePairList({ KeyValuePair("PE.Profile.Data/extraData", QVariant("extraValue")) }));
+                   KeyValuePairList({KeyValuePair("PE.Profile.Data/extraData", QVariant("extraValue"))}));
     if (!empty.isEmpty())
         return false;
     // Fail if dev is not there:
@@ -397,7 +397,7 @@ bool AddKitOperation::test() const
                    "/usr/bin/gdb-test", "Desktop", "{devXX-id}", QString(), tcs, "{qt-id}",
                    "unsupported/mkspec",
                    QString(), QString(), QString(), QString(), QString(), QStringList(), env,
-                   KeyValuePairList({ KeyValuePair("PE.Profile.Data/extraData", QVariant("extraValue")) }));
+                   KeyValuePairList({KeyValuePair("PE.Profile.Data/extraData", QVariant("extraValue"))}));
     if (!empty.isEmpty())
         return false;
 
@@ -407,7 +407,7 @@ bool AddKitOperation::test() const
                  "/usr/bin/gdb-test", "Desktop", QString(), QString(), tcs, "{qt-id}",
                  "unsupported/mkspec",
                  QString(), QString(), QString(), QString(), QString(), QStringList(), env,
-                 KeyValuePairList({ KeyValuePair("PE.Profile.Data/extraData", QVariant("extraValue")) }));
+                 KeyValuePairList({KeyValuePair("PE.Profile.Data/extraData", QVariant("extraValue"))}));
 
     if (map.count() != 4
             || !map.contains(VERSION) || map.value(VERSION).toInt() != 1
@@ -446,7 +446,7 @@ bool AddKitOperation::test() const
                                 "/tmp/icon3.png", QString(), 1, "/usr/bin/gdb-test3", "Desktop",
                                 QString(), QString(), tcs, "{qt-id}", "unsupported/mkspec",
                                 QString(), QString(), QString(), QString(), QString(), QStringList(), env,
-                                KeyValuePairList({ KeyValuePair("PE.Profile.Data/extraData", QVariant("extraValue")) }));
+                                KeyValuePairList({KeyValuePair("PE.Profile.Data/extraData", QVariant("extraValue"))}));
     if (!result.isEmpty())
         return false;
 
@@ -456,7 +456,7 @@ bool AddKitOperation::test() const
                  "/usr/bin/gdb-test2", "Desktop", "{dev-id}", "/sys/root\\\\", tcs,
                  "{qt-id}", "unsupported/mkspec",
                  QString(), QString(), QString(), QString(), QString(), QStringList(), env,
-                 KeyValuePairList({ KeyValuePair("PE.Profile.Data/extraData", QVariant("extraValue")) }));
+                 KeyValuePairList({KeyValuePair("PE.Profile.Data/extraData", QVariant("extraValue"))}));
     if (map.count() != 5
             || !map.contains(VERSION) || map.value(VERSION).toInt() != 1
             || !map.contains(COUNT) || map.value(COUNT).toInt() != 2
@@ -500,7 +500,7 @@ bool AddKitOperation::test() const
                  "/tmp/icon2.png", "debugger Id", 0, QString(), "Desktop", QString(), QString(),
                  tcs, "{qt-id}", "unsupported/mkspec",
                  QString(), QString(), QString(), QString(), QString(), QStringList(), env,
-                 KeyValuePairList({ KeyValuePair("PE.Profile.Data/extraData", QVariant("extraValue")) }));
+                 KeyValuePairList({KeyValuePair("PE.Profile.Data/extraData", QVariant("extraValue"))}));
     if (map.count() != 6
             || !map.contains(VERSION) || map.value(VERSION).toInt() != 1
             || !map.contains(COUNT) || map.value(COUNT).toInt() != 3
@@ -628,7 +628,7 @@ QVariantMap AddKitOperation::addKit(const QVariantMap &map, const QVariantMap &t
         defaultKit = id;
 
     // remove data:
-    QVariantMap cleaned = RmKeysOperation::rmKeys(map, { COUNT, DEFAULT });
+    QVariantMap cleaned = RmKeysOperation::rmKeys(map, {COUNT, DEFAULT});
 
     // Sanity check: Make sure displayName is unique.
     QStringList nameKeys = FindKeyOperation::findKey(map, DISPLAYNAME);
@@ -638,32 +638,32 @@ QVariantMap AddKitOperation::addKit(const QVariantMap &map, const QVariantMap &t
     const QString uniqueName = makeUnique(displayName, nameList);
 
     // insert data:
-    KeyValuePairList data = { KeyValuePair({ kit, ID }, QVariant(id)),
-                              KeyValuePair({ kit, DISPLAYNAME }, QVariant(uniqueName)),
-                              KeyValuePair({ kit, ICON }, QVariant(icon)),
-                              KeyValuePair({ kit, AUTODETECTED }, QVariant(true)),
-                              KeyValuePair({ kit, SDK }, QVariant(true)) };
+    KeyValuePairList data = { KeyValuePair({kit, ID}, QVariant(id)),
+                              KeyValuePair({kit, DISPLAYNAME}, QVariant(uniqueName)),
+                              KeyValuePair({kit, ICON}, QVariant(icon)),
+                              KeyValuePair({kit, AUTODETECTED}, QVariant(true)),
+                              KeyValuePair({kit, SDK}, QVariant(true))};
 
     if (!debuggerId.isEmpty() || !debugger.isEmpty()) {
         if (debuggerId.isEmpty()) {
-            data << KeyValuePair({ kit, DATA, DEBUGGER, DEBUGGER_ENGINE }, QVariant(debuggerType));
-            data << KeyValuePair({ kit, DATA, DEBUGGER, DEBUGGER_BINARY }, QVariant(debugger));
+            data << KeyValuePair({kit, DATA, DEBUGGER, DEBUGGER_ENGINE}, QVariant(debuggerType));
+            data << KeyValuePair({kit, DATA, DEBUGGER, DEBUGGER_BINARY}, QVariant(debugger));
         } else {
-            data << KeyValuePair({ kit, DATA, DEBUGGER }, QVariant(debuggerId));
+            data << KeyValuePair({kit, DATA, DEBUGGER }, QVariant(debuggerId));
         }
     }
     if (!deviceType.isNull())
-        data << KeyValuePair({ kit, DATA, DEVICE_TYPE }, QVariant(deviceType));
+        data << KeyValuePair({kit, DATA, DEVICE_TYPE}, QVariant(deviceType));
     if (!device.isNull())
-        data << KeyValuePair({ kit, DATA, DEVICE_ID }, QVariant(device));
+        data << KeyValuePair({kit, DATA, DEVICE_ID}, QVariant(device));
     if (!sysRoot.isNull())
-        data << KeyValuePair({ kit, DATA, SYSROOT }, QVariant(sysRoot));
+        data << KeyValuePair({kit, DATA, SYSROOT}, QVariant(sysRoot));
     for (auto i = tcs.constBegin(); i != tcs.constEnd(); ++i)
-        data << KeyValuePair({ kit, DATA, TOOLCHAIN, i.key() }, QVariant(i.value()));
+        data << KeyValuePair({kit, DATA, TOOLCHAIN, i.key()}, QVariant(i.value()));
     if (!qtId.isNull())
-        data << KeyValuePair({ kit, DATA, QT }, QVariant(qtId));
+        data << KeyValuePair({kit, DATA, QT}, QVariant(qtId));
     if (!mkspec.isNull())
-        data << KeyValuePair({ kit, DATA, MKSPEC }, QVariant(mkspec));
+        data << KeyValuePair({kit, DATA, MKSPEC}, QVariant(mkspec));
     if (!cmakeId.isNull())
         data << KeyValuePair({kit, DATA, CMAKE_ID}, QVariant(cmakeId));
     if (!cmakeGenerator.isNull()) {
@@ -675,12 +675,12 @@ QVariantMap AddKitOperation::addKit(const QVariantMap &map, const QVariantMap &t
             generatorMap.insert("Toolset", cmakeGeneratorToolset);
         if (!cmakeGeneratorPlatform.isNull())
             generatorMap.insert("Platform", cmakeGeneratorPlatform);
-        data << KeyValuePair({ kit, DATA, CMAKE_GENERATOR }, generatorMap);
+        data << KeyValuePair({kit, DATA, CMAKE_GENERATOR}, generatorMap);
     }
     if (!cmakeConfiguration.isEmpty())
         data << KeyValuePair({kit, DATA, CMAKE_CONFIGURATION}, QVariant(cmakeConfiguration));
     if (!env.isEmpty())
-        data << KeyValuePair({ kit, DATA, ENV }, QVariant(env));
+        data << KeyValuePair({kit, DATA, ENV}, QVariant(env));
 
     data << KeyValuePair(DEFAULT, QVariant(defaultKit));
     data << KeyValuePair(COUNT, QVariant(count + 1));
diff --git a/src/tools/sdktool/addtoolchainoperation.cpp b/src/tools/sdktool/addtoolchainoperation.cpp
index 8dca1282c3..ee31311dd6 100644
--- a/src/tools/sdktool/addtoolchainoperation.cpp
+++ b/src/tools/sdktool/addtoolchainoperation.cpp
@@ -259,25 +259,25 @@ QVariantMap AddToolChainOperation::addToolChain(const QVariantMap &map, const QS
         nameList << GetOperation::get(map, nameKey).toString();
     const QString uniqueName = makeUnique(displayName, nameList);
 
-    QVariantMap result = RmKeysOperation::rmKeys(map, { COUNT });
+    QVariantMap result = RmKeysOperation::rmKeys(map, {COUNT});
 
     const QString tc = QString::fromLatin1(PREFIX) + QString::number(count);
 
     KeyValuePairList data;
-    data << KeyValuePair({ tc, ID }, QVariant(id));
-    data << KeyValuePair({ tc, LANGUAGE_KEY }, QVariant(lang));
-    data << KeyValuePair({ tc, DISPLAYNAME }, QVariant(uniqueName));
-    data << KeyValuePair({ tc, AUTODETECTED }, QVariant(true));
-    data << KeyValuePair({ tc, PATH }, QVariant(path));
-    data << KeyValuePair({ tc, TARGET_ABI }, QVariant(abi));
+    data << KeyValuePair({tc, ID}, QVariant(id));
+    data << KeyValuePair({tc, LANGUAGE_KEY}, QVariant(lang));
+    data << KeyValuePair({tc, DISPLAYNAME}, QVariant(uniqueName));
+    data << KeyValuePair({tc, AUTODETECTED}, QVariant(true));
+    data << KeyValuePair({tc, PATH}, QVariant(path));
+    data << KeyValuePair({tc, TARGET_ABI}, QVariant(abi));
     QVariantList abis;
     QStringList abiStrings = supportedAbis.split(',');
     foreach (const QString &s, abiStrings)
         abis << QVariant(s);
-    data << KeyValuePair({ tc, SUPPORTED_ABIS }, QVariant(abis));
+    data << KeyValuePair({tc, SUPPORTED_ABIS}, QVariant(abis));
     KeyValuePairList tcExtraList;
     foreach (const KeyValuePair &pair, extra)
-        tcExtraList << KeyValuePair(QStringList({ tc }) << pair.key, pair.value);
+        tcExtraList << KeyValuePair(QStringList({tc}) << pair.key, pair.value);
     data.append(tcExtraList);
     data << KeyValuePair(COUNT, QVariant(count + 1));
 
diff --git a/src/tools/sdktool/rmcmakeoperation.cpp b/src/tools/sdktool/rmcmakeoperation.cpp
index 0da4651ad3..dc41b748c3 100644
--- a/src/tools/sdktool/rmcmakeoperation.cpp
+++ b/src/tools/sdktool/rmcmakeoperation.cpp
@@ -98,7 +98,7 @@ bool RmCMakeOperation::test() const
     // Add cmakes:
     QVariantMap map = AddCMakeOperation::initializeCMake();
     map = AddCMakeOperation::addCMake(map, "testId", "name", "/tmp/test",
-                                      KeyValuePairList({ KeyValuePair("ExtraKey", QVariant("ExtraValue")) }));
+                                      KeyValuePairList({KeyValuePair("ExtraKey", QVariant("ExtraValue"))}));
     map = AddCMakeOperation::addCMake(map, "testId2", "other name", "/tmp/test2", KeyValuePairList());
 
     QVariantMap result = rmCMake(QVariantMap(), "nonexistent");
diff --git a/src/tools/sdktool/rmkitoperation.cpp b/src/tools/sdktool/rmkitoperation.cpp
index 37dc58330e..caa4c2f0e0 100644
--- a/src/tools/sdktool/rmkitoperation.cpp
+++ b/src/tools/sdktool/rmkitoperation.cpp
@@ -201,7 +201,7 @@ QVariantMap RmKitOperation::rmKit(const QVariantMap &map, const QString &id)
         defaultKit = (count > 1) ? 0 : -1;
 
     // remove data:
-    result = RmKeysOperation::rmKeys(result, { COUNT, DEFAULT });
+    result = RmKeysOperation::rmKeys(result, {COUNT, DEFAULT});
 
     // insert data:
     KeyValuePairList data;
diff --git a/src/tools/sdktool/rmtoolchainoperation.cpp b/src/tools/sdktool/rmtoolchainoperation.cpp
index 8bacf95703..bb1e8d1728 100644
--- a/src/tools/sdktool/rmtoolchainoperation.cpp
+++ b/src/tools/sdktool/rmtoolchainoperation.cpp
@@ -99,7 +99,7 @@ bool RmToolChainOperation::test() const
     QVariantMap map = AddToolChainOperation::initializeToolChains();
     map = AddToolChainOperation::addToolChain(map, "testId", "langId", "name", "/tmp/test", "test-abi",
                                               "test-abi,test-abi2",
-                                              KeyValuePairList({ KeyValuePair("ExtraKey", QVariant("ExtraValue")) }));
+                                              KeyValuePairList({KeyValuePair("ExtraKey", QVariant("ExtraValue"))}));
     map = AddToolChainOperation::addToolChain(map, "testId2", "langId", "other name", "/tmp/test2", "test-abi",
                                               "test-abi,test-abi2", KeyValuePairList());