SdkTool: Use slightly less repetitive approach for operation interface

Change-Id: I4d1d205c610df39be6a810dfda3049ae14a06806
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>

1 files changed, 27 insertions, 27 deletions

diff --git a/src/tools/sdktool/rmkitoperation.cpp b/src/tools/sdktool/rmkitoperation.cpp
index 4e7487f40b..306cfc3bd7 100644
--- a/src/tools/sdktool/rmkitoperation.cpp
+++ b/src/tools/sdktool/rmkitoperation.cpp
@@ -98,40 +98,40 @@ int RmKitOperation::execute() const
 bool RmKitOperation::test() const
 {
     QVariantMap tcMap = AddToolChainOperation::initializeToolChains();
-    tcMap = AddToolChainOperation::addToolChain(tcMap, "{tc-id}", "langId", "TC", "/usr/bin/gcc",
-                                                "x86-linux-generic-elf-32bit",
-                                                "x86-linux-generic-elf-32bit",
-                                                KeyValuePairList());
+    tcMap = AddToolChainData{"{tc-id}", "langId", "TC", "/usr/bin/gcc",
+                             "x86-linux-generic-elf-32bit", "x86-linux-generic-elf-32bit", {}}
+        .addToolChain(tcMap);
 
-    QVariantMap qtMap = AddQtOperation::initializeQtVersions();
-    qtMap = AddQtOperation::addQt(qtMap, "{qt-id}", "Qt", "desktop-qt", "/usr/bin/qmake",
-                                  KeyValuePairList(), QStringList());
+    QVariantMap qtMap = AddQtData::initializeQtVersions();
+    qtMap = AddQtData{"{qt-id}", "Qt", "desktop-qt", "/usr/bin/qmake", {}, {}}.addQt(qtMap);
 
     QVariantMap devMap = AddDeviceOperation::initializeDevices();
-    devMap = AddDeviceOperation::addDevice(devMap, "{dev-id}", "Dev", 0, 0,
-                                           "HWplatform", "SWplatform",
-                                           "localhost", "10000-11000", "localhost", "", 42,
-                                           "desktop", "", 22, 10000, "uname", 1,
-                                           KeyValuePairList());
+    devMap = AddDeviceData{"{dev-id}", "Dev", 0, 0,
+                           "HWplatform", "SWplatform",
+                           "localhost", "10000-11000", "localhost", "", 42,
+                           "desktop", "", 22, 10000, "uname", 1,
+                           KeyValuePairList()}
+            .addDevice(devMap);
 
     QHash<QString, QString> tcs;
     tcs.insert("Cxx", "{tc-id}");
 
     QVariantMap map =
-            AddKitOperation::addKit(AddKitOperation::initializeKits(), tcMap, qtMap, devMap,
-                                    QVariantMap(),
-                                    "testId", "Test Qt Version", "/tmp/icon.png", QString(), 1,
-                                    "/usr/bin/gdb-test", "Desktop", QString(), QString(), tcs,
-                                    "{qt-id}", "unsupported/mkspec",
-                                    QString(), QString(), QString(), QString(), QString(), QStringList(), QStringList(),
-                                    KeyValuePairList() << KeyValuePair("PE.Profile.Data/extraData", QVariant("extraValue")));
-    map =
-            AddKitOperation::addKit(map, tcMap, qtMap, devMap, QVariantMap(), "testId2", "Test Qt Version",
-                                    "/tmp/icon2.png", QString(), 1, "/usr/bin/gdb-test2",
-                                    "Desktop", QString(), QString(), tcs, "{qt-id}",
-                                    "unsupported/mkspec2",
-                                    QString(), QString(), QString(), QString(), QString(), QStringList(), QStringList(),
-                                    KeyValuePairList() << KeyValuePair("PE.Profile.Data/extraData", QVariant("extraValue2")));
+            AddKitData{"testId", "Test Qt Version", "/tmp/icon.png", QString(), 1,
+                       "/usr/bin/gdb-test", "Desktop", QString(), QString(), tcs,
+                       "{qt-id}", "unsupported/mkspec",
+                       QString(), QString(), QString(), QString(), QString(), QStringList(), QStringList(),
+                       {{"PE.Profile.Data/extraData", QVariant("extraValue")}}}
+            .addKit(AddKitData::initializeKits(), tcMap, qtMap, devMap, {});
+
+
+    map =   AddKitData{"testId2", "Test Qt Version",
+                       "/tmp/icon2.png", QString(), 1, "/usr/bin/gdb-test2",
+                       "Desktop", QString(), QString(), tcs, "{qt-id}",
+                       "unsupported/mkspec2",
+                       QString(), QString(), QString(), QString(), QString(), QStringList(), QStringList(),
+                       {{"PE.Profile.Data/extraData", QVariant("extraValue2")}}}
+            .addKit(map, tcMap, qtMap, devMap, {});
 
     QVariantMap result = rmKit(map, "testId");
     if (result.count() != 4
@@ -212,5 +212,5 @@ QVariantMap RmKitOperation::rmKit(const QVariantMap &map, const QString &id)
         data << KeyValuePair(QString::fromLatin1(PREFIX) + QString::number(i),
                              profileList.at(i));
 
-    return AddKeysOperation::addKeys(result, data);
+    return AddKeysData{data}.addKeys(result);
 }