forked from qt-creator/qt-creator
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>
This commit is contained in:
@@ -1562,10 +1562,9 @@ CMakeBuildConfiguration::~CMakeBuildConfiguration()
|
||||
delete m_buildSystem;
|
||||
}
|
||||
|
||||
QVariantMap CMakeBuildConfiguration::toMap() const
|
||||
void CMakeBuildConfiguration::toMap(QVariantMap &map) const
|
||||
{
|
||||
QVariantMap map(BuildConfiguration::toMap());
|
||||
return map;
|
||||
BuildConfiguration::toMap(map);
|
||||
}
|
||||
|
||||
bool CMakeBuildConfiguration::fromMap(const QVariantMap &map)
|
||||
|
||||
@@ -94,7 +94,7 @@ protected:
|
||||
bool fromMap(const QVariantMap &map) override;
|
||||
|
||||
private:
|
||||
QVariantMap toMap() const override;
|
||||
void toMap(QVariantMap &map) const override;
|
||||
BuildType buildType() const override;
|
||||
|
||||
ProjectExplorer::NamedWidget *createConfigWidget() override;
|
||||
|
||||
@@ -272,15 +272,13 @@ CMakeBuildStep::CMakeBuildStep(BuildStepList *bsl, Id id) :
|
||||
this, &CMakeBuildStep::updateBuildTargetsModel);
|
||||
}
|
||||
|
||||
QVariantMap CMakeBuildStep::toMap() const
|
||||
void CMakeBuildStep::toMap(QVariantMap &map) const
|
||||
{
|
||||
QVariantMap map(CMakeAbstractProcessStep::toMap());
|
||||
CMakeAbstractProcessStep::toMap(map);
|
||||
map.insert(BUILD_TARGETS_KEY, m_buildTargets);
|
||||
map.insert(QLatin1String(CLEAR_SYSTEM_ENVIRONMENT_KEY), m_clearSystemEnvironment);
|
||||
map.insert(QLatin1String(USER_ENVIRONMENT_CHANGES_KEY), EnvironmentItem::toStringList(m_userEnvironmentChanges));
|
||||
map.insert(QLatin1String(BUILD_PRESET_KEY), m_buildPreset);
|
||||
|
||||
return map;
|
||||
}
|
||||
|
||||
bool CMakeBuildStep::fromMap(const QVariantMap &map)
|
||||
|
||||
@@ -44,7 +44,7 @@ public:
|
||||
bool buildsBuildTarget(const QString &target) const;
|
||||
void setBuildsBuildTarget(const QString &target, bool on);
|
||||
|
||||
QVariantMap toMap() const override;
|
||||
void toMap(QVariantMap &map) const override;
|
||||
|
||||
QString cleanTarget() const;
|
||||
QString allTarget() const ;
|
||||
|
||||
Reference in New Issue
Block a user