feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ProjectExplorer: Change ProjectConfiguration::toMap signature

Browse Source 
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:
hjk
2023-07-21 17:44:01 +02:00
parent 1a88508654
commit 53d06feecd
37 changed files with 100 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/mesonprojectmanager/mesonbuildconfiguration.cpp
View File

@@ -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)

2
src/plugins/mesonprojectmanager/mesonbuildconfiguration.h
View File

@@ -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;

7
src/plugins/mesonprojectmanager/ninjabuildstep.cpp
View File

@@ -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)

3
src/plugins/mesonprojectmanager/ninjabuildstep.h
View File

@@ -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: