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

21
src/plugins/projectexplorer/runconfiguration.cpp
View File

@@ -246,7 +246,8 @@ bool RunConfiguration::isCustomized() const
{
if (m_customized)
return true;
QVariantMap state = toMapSimple();
QVariantMap state;
toMapSimple(state);
// TODO: Why do we save this at all? It's a computed value.
state.remove("RunConfiguration.WorkingDirectory.default");
@@ -265,7 +266,8 @@ bool RunConfiguration::hasCreator() const
void RunConfiguration::setPristineState()
{
if (!m_customized) {
m_pristineState = toMapSimple();
m_pristineState.clear();
toMapSimple(m_pristineState);
m_pristineState.remove("RunConfiguration.WorkingDirectory.default");
}
}
@@ -306,16 +308,15 @@ Task RunConfiguration::createConfigurationIssue(const QString &description) cons
return BuildSystemTask(Task::Error, description);
}
QVariantMap RunConfiguration::toMap() const
void RunConfiguration::toMap(QVariantMap &map) const
{
QVariantMap map = toMapSimple();
toMapSimple(map);
map.insert(CUSTOMIZED_KEY, isCustomized());
return map;
}
QVariantMap RunConfiguration::toMapSimple() const
void RunConfiguration::toMapSimple(QVariantMap &map) const
{
QVariantMap map = ProjectConfiguration::toMap();
ProjectConfiguration::toMap(map);
map.insert(BUILD_KEY, m_buildKey);
// FIXME: Remove this id mangling, e.g. by using a separate entry for the build key.
@@ -323,8 +324,6 @@ QVariantMap RunConfiguration::toMapSimple() const
const Utils::Id mangled = id().withSuffix(m_buildKey);
map.insert(settingsIdKey(), mangled.toSetting());
}
return map;
}
void RunConfiguration::setCommandLineGetter(const CommandLineGetter &cmdGetter)
@@ -649,7 +648,9 @@ RunConfiguration *RunConfigurationFactory::restore(Target *parent, const QVarian
RunConfiguration *RunConfigurationFactory::clone(Target *parent, RunConfiguration *source)
{
return restore(parent, source->toMap());
QVariantMap map;
source->toMap(map);
return restore(parent, map);
}
const QList<RunConfigurationCreationInfo> RunConfigurationFactory::creatorsForTarget(Target *parent)