BareMetal: Make toMap signature more aspect friendly

Change-Id: I03b91db90e07c7ad6f6b59cd2d63f13b6961e268
Reviewed-by: Jarek Kobus <[email protected]>

22 files changed, 41 insertions, 51 deletions

diff --git a/src/plugins/baremetal/debugserverprovidermanager.cpp b/src/plugins/baremetal/debugserverprovidermanager.cpp
index be4ed0ab06f..d56d81b2d9c 100644
--- a/src/plugins/baremetal/debugserverprovidermanager.cpp
+++ b/src/plugins/baremetal/debugserverprovidermanager.cpp
@@ -126,7 +126,8 @@ void DebugServerProviderManager::saveProviders()
     int count = 0;
     for (const IDebugServerProvider *p : std::as_const(m_providers)) {
         if (p->isValid()) {
-            const QVariantMap tmp = p->toMap();
+            QVariantMap tmp;
+            p->toMap(tmp);
             if (tmp.isEmpty())
                 continue;
             const QString key = QString::fromLatin1(dataKeyC) + QString::number(count);
diff --git a/src/plugins/baremetal/debugserverproviderssettingspage.cpp b/src/plugins/baremetal/debugserverproviderssettingspage.cpp
index 9fa9db95418..bcb108f0ee8 100644
--- a/src/plugins/baremetal/debugserverproviderssettingspage.cpp
+++ b/src/plugins/baremetal/debugserverproviderssettingspage.cpp
@@ -347,7 +347,9 @@ DebugServerProvidersSettingsWidget::DebugServerProvidersSettingsWidget()
             for (const auto f : DebugServerProviderManager::factories()) {
                 if (id.startsWith(f->id())) {
                     IDebugServerProvider *p = f->create();
-                    p->fromMap(old->toMap());
+                    QVariantMap map;
+                    old->toMap(map);
+                    p->fromMap(map);
                     p->setDisplayName(Tr::tr("Clone of %1").arg(old->displayName()));
                     p->resetId();
                     addProviderToModel(p);
diff --git a/src/plugins/baremetal/debugservers/gdb/eblinkgdbserverprovider.cpp b/src/plugins/baremetal/debugservers/gdb/eblinkgdbserverprovider.cpp
index d307eefb0ec..e955aa3ff21 100644
--- a/src/plugins/baremetal/debugservers/gdb/eblinkgdbserverprovider.cpp
+++ b/src/plugins/baremetal/debugservers/gdb/eblinkgdbserverprovider.cpp
@@ -142,9 +142,9 @@ bool EBlinkGdbServerProvider::isValid() const
     }
 }
 
-QVariantMap EBlinkGdbServerProvider::toMap() const
+void EBlinkGdbServerProvider::toMap(QVariantMap &data) const
 {
-    QVariantMap data = GdbServerProvider::toMap();
+    GdbServerProvider::toMap(data);
     data.insert(executableFileKeyC, m_executableFile.toSettings());
     data.insert(verboseLevelKeyC, m_verboseLevel);
     data.insert(interfaceTypeC, m_interfaceType);
@@ -156,8 +156,6 @@ QVariantMap EBlinkGdbServerProvider::toMap() const
     data.insert(targetDisableStackC, m_targetDisableStack);
     data.insert(gdbShutDownAfterDisconnectC, m_gdbShutDownAfterDisconnect);
     data.insert(gdbNotUseCacheC, m_gdbNotUseCache);
-
-    return data;
 }
 
 bool EBlinkGdbServerProvider::fromMap(const QVariantMap &data)
diff --git a/src/plugins/baremetal/debugservers/gdb/eblinkgdbserverprovider.h b/src/plugins/baremetal/debugservers/gdb/eblinkgdbserverprovider.h
index 9f74ba52f48..5ee074bbcc7 100644
--- a/src/plugins/baremetal/debugservers/gdb/eblinkgdbserverprovider.h
+++ b/src/plugins/baremetal/debugservers/gdb/eblinkgdbserverprovider.h
@@ -21,7 +21,7 @@ class EBlinkGdbServerProvider final : public GdbServerProvider
 public:
     enum InterfaceType { SWD, JTAG };
 
-    QVariantMap toMap() const final;
+    void toMap(QVariantMap &data) const final;
     bool fromMap(const QVariantMap &data) final;
 
     bool operator==(const IDebugServerProvider &other) const final;
diff --git a/src/plugins/baremetal/debugservers/gdb/gdbserverprovider.cpp b/src/plugins/baremetal/debugservers/gdb/gdbserverprovider.cpp
index 222d22ade98..10f8842ae7f 100644
--- a/src/plugins/baremetal/debugservers/gdb/gdbserverprovider.cpp
+++ b/src/plugins/baremetal/debugservers/gdb/gdbserverprovider.cpp
@@ -120,15 +120,14 @@ bool GdbServerProvider::operator==(const IDebugServerProvider &other) const
             && m_useExtendedRemote == p->m_useExtendedRemote;
 }
 
-QVariantMap GdbServerProvider::toMap() const
+void GdbServerProvider::toMap(QVariantMap &data) const
 {
-    QVariantMap data = IDebugServerProvider::toMap();
+    IDebugServerProvider::toMap(data);
     data.insert(startupModeKeyC, m_startupMode);
     data.insert(peripheralDescriptionFileKeyC, m_peripheralDescriptionFile.toSettings());
     data.insert(initCommandsKeyC, m_initCommands);
     data.insert(resetCommandsKeyC, m_resetCommands);
     data.insert(useExtendedRemoteKeyC, m_useExtendedRemote);
-    return data;
 }
 
 bool GdbServerProvider::isValid() const
@@ -136,8 +135,7 @@ bool GdbServerProvider::isValid() const
     return !channelString().isEmpty();
 }
 
-bool GdbServerProvider::aboutToRun(DebuggerRunTool *runTool,
-                                   QString &errorMessage) const
+bool GdbServerProvider::aboutToRun(DebuggerRunTool *runTool, QString &errorMessage) const
 {
     QTC_ASSERT(runTool, return false);
     const RunControl *runControl = runTool->runControl();
diff --git a/src/plugins/baremetal/debugservers/gdb/gdbserverprovider.h b/src/plugins/baremetal/debugservers/gdb/gdbserverprovider.h
index 1c23d499957..6b3c91f2947 100644
--- a/src/plugins/baremetal/debugservers/gdb/gdbserverprovider.h
+++ b/src/plugins/baremetal/debugservers/gdb/gdbserverprovider.h
@@ -33,7 +33,7 @@ public:
 
     bool operator==(const IDebugServerProvider &other) const override;
 
-    QVariantMap toMap() const override;
+    void toMap(QVariantMap &data) const override;
 
     virtual Utils::CommandLine command() const;
 
diff --git a/src/plugins/baremetal/debugservers/gdb/jlinkgdbserverprovider.cpp b/src/plugins/baremetal/debugservers/gdb/jlinkgdbserverprovider.cpp
index c1ee31b7109..f923d79f75a 100644
--- a/src/plugins/baremetal/debugservers/gdb/jlinkgdbserverprovider.cpp
+++ b/src/plugins/baremetal/debugservers/gdb/jlinkgdbserverprovider.cpp
@@ -118,9 +118,9 @@ bool JLinkGdbServerProvider::isValid() const
     return true;
 }
 
-QVariantMap JLinkGdbServerProvider::toMap() const
+void JLinkGdbServerProvider::toMap(QVariantMap &data) const
 {
-    QVariantMap data = GdbServerProvider::toMap();
+    GdbServerProvider::toMap(data);
     data.insert(executableFileKeyC, m_executableFile.toSettings());
     data.insert(jlinkDeviceKeyC, m_jlinkDevice);
     data.insert(jlinkHostInterfaceKeyC, m_jlinkHost);
@@ -128,7 +128,6 @@ QVariantMap JLinkGdbServerProvider::toMap() const
     data.insert(jlinkTargetInterfaceKeyC, m_jlinkTargetIface);
     data.insert(jlinkTargetInterfaceSpeedKeyC, m_jlinkTargetIfaceSpeed);
     data.insert(additionalArgumentsKeyC, m_additionalArguments);
-    return data;
 }
 
 bool JLinkGdbServerProvider::fromMap(const QVariantMap &data)
diff --git a/src/plugins/baremetal/debugservers/gdb/jlinkgdbserverprovider.h b/src/plugins/baremetal/debugservers/gdb/jlinkgdbserverprovider.h
index aacb781b045..3e490bfb852 100644
--- a/src/plugins/baremetal/debugservers/gdb/jlinkgdbserverprovider.h
+++ b/src/plugins/baremetal/debugservers/gdb/jlinkgdbserverprovider.h
@@ -18,7 +18,7 @@ namespace BareMetal::Internal {
 class JLinkGdbServerProvider final : public GdbServerProvider
 {
 public:
-    QVariantMap toMap() const final;
+    void toMap(QVariantMap &data) const final;
     bool fromMap(const QVariantMap &data) final;
 
     bool operator==(const IDebugServerProvider &other) const final;
diff --git a/src/plugins/baremetal/debugservers/gdb/openocdgdbserverprovider.cpp b/src/plugins/baremetal/debugservers/gdb/openocdgdbserverprovider.cpp
index ca7f25e56f3..5d746a29b4f 100644
--- a/src/plugins/baremetal/debugservers/gdb/openocdgdbserverprovider.cpp
+++ b/src/plugins/baremetal/debugservers/gdb/openocdgdbserverprovider.cpp
@@ -125,14 +125,13 @@ bool OpenOcdGdbServerProvider::isValid() const
     return true;
 }
 
-QVariantMap OpenOcdGdbServerProvider::toMap() const
+void OpenOcdGdbServerProvider::toMap(QVariantMap &data) const
 {
-    QVariantMap data = GdbServerProvider::toMap();
+    GdbServerProvider::toMap(data);
     data.insert(executableFileKeyC, m_executableFile.toSettings());
     data.insert(rootScriptsDirKeyC, m_rootScriptsDir.toSettings());
     data.insert(configurationFileKeyC, m_configurationFile.toSettings());
     data.insert(additionalArgumentsKeyC, m_additionalArguments);
-    return data;
 }
 
 bool OpenOcdGdbServerProvider::fromMap(const QVariantMap &data)
diff --git a/src/plugins/baremetal/debugservers/gdb/openocdgdbserverprovider.h b/src/plugins/baremetal/debugservers/gdb/openocdgdbserverprovider.h
index e21972a9ab5..e45aa5aef7b 100644
--- a/src/plugins/baremetal/debugservers/gdb/openocdgdbserverprovider.h
+++ b/src/plugins/baremetal/debugservers/gdb/openocdgdbserverprovider.h
@@ -18,7 +18,7 @@ namespace BareMetal::Internal {
 class OpenOcdGdbServerProvider final : public GdbServerProvider
 {
 public:
-    QVariantMap toMap() const final;
+    void toMap(QVariantMap &data) const final;
     bool fromMap(const QVariantMap &data) final;
 
     bool operator==(const IDebugServerProvider &other) const final;
diff --git a/src/plugins/baremetal/debugservers/gdb/stlinkutilgdbserverprovider.cpp b/src/plugins/baremetal/debugservers/gdb/stlinkutilgdbserverprovider.cpp
index 78d0e6fedbe..4941c7732b7 100644
--- a/src/plugins/baremetal/debugservers/gdb/stlinkutilgdbserverprovider.cpp
+++ b/src/plugins/baremetal/debugservers/gdb/stlinkutilgdbserverprovider.cpp
@@ -113,16 +113,15 @@ bool StLinkUtilGdbServerProvider::isValid() const
     return true;
 }
 
-QVariantMap StLinkUtilGdbServerProvider::toMap() const
+void StLinkUtilGdbServerProvider::toMap(QVariantMap &data) const
 {
-    QVariantMap data = GdbServerProvider::toMap();
+    GdbServerProvider::toMap(data);
     data.insert(executableFileKeyC, m_executableFile.toSettings());
     data.insert(verboseLevelKeyC, m_verboseLevel);
     data.insert(extendedModeKeyC, m_extendedMode);
     data.insert(resetBoardKeyC, m_resetBoard);
     data.insert(transportLayerKeyC, m_transport);
     data.insert(connectUnderResetKeyC, m_connectUnderReset);
-    return data;
 }
 
 bool StLinkUtilGdbServerProvider::fromMap(const QVariantMap &data)
diff --git a/src/plugins/baremetal/debugservers/gdb/stlinkutilgdbserverprovider.h b/src/plugins/baremetal/debugservers/gdb/stlinkutilgdbserverprovider.h
index 66a3930676f..52b2642c19c 100644
--- a/src/plugins/baremetal/debugservers/gdb/stlinkutilgdbserverprovider.h
+++ b/src/plugins/baremetal/debugservers/gdb/stlinkutilgdbserverprovider.h
@@ -21,7 +21,7 @@ class StLinkUtilGdbServerProvider final : public GdbServerProvider
 public:
     enum TransportLayer { ScsiOverUsb = 1, RawUsb = 2, UnspecifiedTransport };
 
-    QVariantMap toMap() const final;
+    void toMap(QVariantMap &data) const final;
     bool fromMap(const QVariantMap &data) final;
 
     bool operator==(const IDebugServerProvider &other) const final;
diff --git a/src/plugins/baremetal/debugservers/uvsc/jlinkuvscserverprovider.cpp b/src/plugins/baremetal/debugservers/uvsc/jlinkuvscserverprovider.cpp
index 7bb0bec353c..22d0244cd78 100644
--- a/src/plugins/baremetal/debugservers/uvsc/jlinkuvscserverprovider.cpp
+++ b/src/plugins/baremetal/debugservers/uvsc/jlinkuvscserverprovider.cpp
@@ -158,11 +158,10 @@ JLinkUvscServerProvider::JLinkUvscServerProvider()
     setSupportedDrivers({"Segger\\JL2CM3.dll"});
 }
 
-QVariantMap JLinkUvscServerProvider::toMap() const
+void JLinkUvscServerProvider::toMap(QVariantMap &data) const
 {
-    QVariantMap data = UvscServerProvider::toMap();
+    UvscServerProvider::toMap(data);
     data.insert(adapterOptionsKeyC, m_adapterOpts.toMap());
-    return data;
 }
 
 bool JLinkUvscServerProvider::fromMap(const QVariantMap &data)
diff --git a/src/plugins/baremetal/debugservers/uvsc/jlinkuvscserverprovider.h b/src/plugins/baremetal/debugservers/uvsc/jlinkuvscserverprovider.h
index bf2c5f295d3..19df028dd7f 100644
--- a/src/plugins/baremetal/debugservers/uvsc/jlinkuvscserverprovider.h
+++ b/src/plugins/baremetal/debugservers/uvsc/jlinkuvscserverprovider.h
@@ -36,7 +36,7 @@ public:
 class JLinkUvscServerProvider final : public UvscServerProvider
 {
 public:
-    QVariantMap toMap() const final;
+    void toMap(QVariantMap &data) const final;
     bool fromMap(const QVariantMap &data) final;
 
     bool operator==(const IDebugServerProvider &other) const final;
diff --git a/src/plugins/baremetal/debugservers/uvsc/simulatoruvscserverprovider.cpp b/src/plugins/baremetal/debugservers/uvsc/simulatoruvscserverprovider.cpp
index d7eba5ebfd1..188df6e9165 100644
--- a/src/plugins/baremetal/debugservers/uvsc/simulatoruvscserverprovider.cpp
+++ b/src/plugins/baremetal/debugservers/uvsc/simulatoruvscserverprovider.cpp
@@ -63,11 +63,10 @@ SimulatorUvscServerProvider::SimulatorUvscServerProvider()
     setDriverSelection(defaultSimulatorDriverSelection());
 }
 
-QVariantMap SimulatorUvscServerProvider::toMap() const
+void SimulatorUvscServerProvider::toMap(QVariantMap &data) const
 {
-    QVariantMap data = UvscServerProvider::toMap();
+    UvscServerProvider::toMap(data);
     data.insert(limitSpeedKeyC, m_limitSpeed);
-    return data;
 }
 
 bool SimulatorUvscServerProvider::fromMap(const QVariantMap &data)
diff --git a/src/plugins/baremetal/debugservers/uvsc/simulatoruvscserverprovider.h b/src/plugins/baremetal/debugservers/uvsc/simulatoruvscserverprovider.h
index e08a02d741a..b80da20b1ec 100644
--- a/src/plugins/baremetal/debugservers/uvsc/simulatoruvscserverprovider.h
+++ b/src/plugins/baremetal/debugservers/uvsc/simulatoruvscserverprovider.h
@@ -16,7 +16,7 @@ namespace BareMetal::Internal {
 class SimulatorUvscServerProvider final : public UvscServerProvider
 {
 public:
-    QVariantMap toMap() const final;
+    void toMap(QVariantMap &data) const final;
     bool fromMap(const QVariantMap &data) final;
 
     bool operator==(const IDebugServerProvider &other) const final;
diff --git a/src/plugins/baremetal/debugservers/uvsc/stlinkuvscserverprovider.cpp b/src/plugins/baremetal/debugservers/uvsc/stlinkuvscserverprovider.cpp
index 17fcd7f0e77..e2330e68ac2 100644
--- a/src/plugins/baremetal/debugservers/uvsc/stlinkuvscserverprovider.cpp
+++ b/src/plugins/baremetal/debugservers/uvsc/stlinkuvscserverprovider.cpp
@@ -114,11 +114,10 @@ StLinkUvscServerProvider::StLinkUvscServerProvider()
     setSupportedDrivers({"STLink\\ST-LINKIII-KEIL_SWO.dll"});
 }
 
-QVariantMap StLinkUvscServerProvider::toMap() const
+void StLinkUvscServerProvider::toMap(QVariantMap &data) const
 {
-    QVariantMap data = UvscServerProvider::toMap();
+    UvscServerProvider::toMap(data);
     data.insert(adapterOptionsKeyC, m_adapterOpts.toMap());
-    return data;
 }
 
 bool StLinkUvscServerProvider::fromMap(const QVariantMap &data)
diff --git a/src/plugins/baremetal/debugservers/uvsc/stlinkuvscserverprovider.h b/src/plugins/baremetal/debugservers/uvsc/stlinkuvscserverprovider.h
index 26614c29bfb..ccfa675d47b 100644
--- a/src/plugins/baremetal/debugservers/uvsc/stlinkuvscserverprovider.h
+++ b/src/plugins/baremetal/debugservers/uvsc/stlinkuvscserverprovider.h
@@ -39,7 +39,7 @@ public:
 class StLinkUvscServerProvider final : public UvscServerProvider
 {
 public:
-    QVariantMap toMap() const final;
+    void toMap(QVariantMap &data) const final;
     bool fromMap(const QVariantMap &data) final;
 
     bool operator==(const IDebugServerProvider &other) const final;
diff --git a/src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.cpp b/src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.cpp
index a266ed7bfdc..e2df93596aa 100644
--- a/src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.cpp
+++ b/src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.cpp
@@ -147,13 +147,12 @@ FilePath UvscServerProvider::buildOptionsFilePath(DebuggerRunTool *runTool) cons
     return path;
 }
 
-QVariantMap UvscServerProvider::toMap() const
+void UvscServerProvider::toMap(QVariantMap &data) const
 {
-    QVariantMap data = IDebugServerProvider::toMap();
+    IDebugServerProvider::toMap(data);
     data.insert(toolsIniKeyC, m_toolsIniFile.toSettings());
     data.insert(deviceSelectionKeyC, m_deviceSelection.toMap());
     data.insert(driverSelectionKeyC, m_driverSelection.toMap());
-    return data;
 }
 
 bool UvscServerProvider::isValid() const
diff --git a/src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.h b/src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.h
index 4c14ee7b7c1..512a0412668 100644
--- a/src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.h
+++ b/src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.h
@@ -48,7 +48,7 @@ public:
 
     bool operator==(const IDebugServerProvider &other) const override;
 
-    QVariantMap toMap() const override;
+    void toMap(QVariantMap &map) const override;
 
     bool aboutToRun(Debugger::DebuggerRunTool *runTool, QString &errorMessage) const final;
     ProjectExplorer::RunWorker *targetRunner(ProjectExplorer::RunControl *runControl) const final;
diff --git a/src/plugins/baremetal/idebugserverprovider.cpp b/src/plugins/baremetal/idebugserverprovider.cpp
index 80a733c1115..c3c82dedcf3 100644
--- a/src/plugins/baremetal/idebugserverprovider.cpp
+++ b/src/plugins/baremetal/idebugserverprovider.cpp
@@ -137,15 +137,13 @@ IDebugServerProviderConfigWidget *IDebugServerProvider::configurationWidget() co
     return m_configurationWidgetCreator();
 }
 
-QVariantMap IDebugServerProvider::toMap() const
-{
-    return {
-        {idKeyC, m_id},
-        {displayNameKeyC, m_displayName},
-        {engineTypeKeyC, m_engineType},
-        {hostKeyC, m_channel.host()},
-        {portKeyC, m_channel.port()},
-    };
+void IDebugServerProvider::toMap(QVariantMap &data) const
+{
+    data.insert(idKeyC, m_id);
+    data.insert(displayNameKeyC, m_displayName);
+    data.insert(engineTypeKeyC, m_engineType);
+    data.insert(hostKeyC, m_channel.host());
+    data.insert(portKeyC, m_channel.port());
 }
 
 void IDebugServerProvider::registerDevice(BareMetalDevice *device)
diff --git a/src/plugins/baremetal/idebugserverprovider.h b/src/plugins/baremetal/idebugserverprovider.h
index a936ad61421..c219b31e822 100644
--- a/src/plugins/baremetal/idebugserverprovider.h
+++ b/src/plugins/baremetal/idebugserverprovider.h
@@ -65,7 +65,7 @@ public:
     void setConfigurationWidgetCreator
         (const std::function<IDebugServerProviderConfigWidget *()> &configurationWidgetCreator);
 
-    virtual QVariantMap toMap() const;
+    virtual void toMap(QVariantMap &data) const;
     virtual bool fromMap(const QVariantMap &data);
 
     virtual bool aboutToRun(Debugger::DebuggerRunTool *runTool,