ProjectExplorer: Change ProjectConfiguration::toMap signature

To match better with the rest, especially the base AspectContainer.

Change-Id: Ide0966cab3219800aa6b7b9e6012731a3fbe7a6f
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>

4 files changed, 10 insertions, 11 deletions

diff --git a/src/plugins/mesonprojectmanager/mesonbuildconfiguration.cpp b/src/plugins/mesonprojectmanager/mesonbuildconfiguration.cpp
index b71d28b1072..e4c19e09572 100644
--- a/src/plugins/mesonprojectmanager/mesonbuildconfiguration.cpp
+++ b/src/plugins/mesonprojectmanager/mesonbuildconfiguration.cpp
@@ -137,12 +137,11 @@ void MesonBuildConfiguration::setParameters(const QString &params)
     emit parametersChanged();
 }
 
-QVariantMap MesonBuildConfiguration::toMap() const
+void MesonBuildConfiguration::toMap(QVariantMap &map) const
 {
-    auto data = ProjectExplorer::BuildConfiguration::toMap();
-    data[Constants::BuildConfiguration::BUILD_TYPE_KEY] = mesonBuildTypeName(m_buildType);
-    data[Constants::BuildConfiguration::PARAMETERS_KEY] = m_parameters;
-    return data;
+    ProjectExplorer::BuildConfiguration::toMap(map);
+    map[Constants::BuildConfiguration::BUILD_TYPE_KEY] = mesonBuildTypeName(m_buildType);
+    map[Constants::BuildConfiguration::PARAMETERS_KEY] = m_parameters;
 }
 
 bool MesonBuildConfiguration::fromMap(const QVariantMap &map)
diff --git a/src/plugins/mesonprojectmanager/mesonbuildconfiguration.h b/src/plugins/mesonprojectmanager/mesonbuildconfiguration.h
index d262c837810..c9433dd5b69 100644
--- a/src/plugins/mesonprojectmanager/mesonbuildconfiguration.h
+++ b/src/plugins/mesonprojectmanager/mesonbuildconfiguration.h
@@ -30,7 +30,7 @@ signals:
     void parametersChanged();
 
 private:
-    QVariantMap toMap() const override;
+    void toMap(QVariantMap &map) const override;
     bool fromMap(const QVariantMap &map) override;
     MesonBuildType m_buildType;
     ProjectExplorer::NamedWidget *createConfigWidget() final;
diff --git a/src/plugins/mesonprojectmanager/ninjabuildstep.cpp b/src/plugins/mesonprojectmanager/ninjabuildstep.cpp
index 0cb71186bdd..310d6b12da5 100644
--- a/src/plugins/mesonprojectmanager/ninjabuildstep.cpp
+++ b/src/plugins/mesonprojectmanager/ninjabuildstep.cpp
@@ -189,7 +189,7 @@ MesonBuildStepFactory::MesonBuildStepFactory()
     setDisplayName(Tr::tr("Meson Build"));
 }
 
-void MesonProjectManager::Internal::NinjaBuildStep::setBuildTarget(const QString &targetName)
+void NinjaBuildStep::setBuildTarget(const QString &targetName)
 {
     m_targetName = targetName;
 }
@@ -199,12 +199,11 @@ void NinjaBuildStep::setCommandArgs(const QString &args)
     m_commandArgs = args.trimmed();
 }
 
-QVariantMap NinjaBuildStep::toMap() const
+void NinjaBuildStep::toMap(QVariantMap &map) const
 {
-    QVariantMap map(AbstractProcessStep::toMap());
+    AbstractProcessStep::toMap(map);
     map.insert(TARGETS_KEY, m_targetName);
     map.insert(TOOL_ARGUMENTS_KEY, m_commandArgs);
-    return map;
 }
 
 bool NinjaBuildStep::fromMap(const QVariantMap &map)
diff --git a/src/plugins/mesonprojectmanager/ninjabuildstep.h b/src/plugins/mesonprojectmanager/ninjabuildstep.h
index 1feecadb5f1..8038d36bb60 100644
--- a/src/plugins/mesonprojectmanager/ninjabuildstep.h
+++ b/src/plugins/mesonprojectmanager/ninjabuildstep.h
@@ -25,7 +25,8 @@ public:
     const QString &targetName() const { return m_targetName; }
     Q_SIGNAL void targetListChanged();
     Q_SIGNAL void commandChanged();
-    QVariantMap toMap() const override;
+
+    void toMap(QVariantMap &map) const override;
     bool fromMap(const QVariantMap &map) override;
 
 private: