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

Introduce Utils::DisplayName

Browse Source 
The concept of a default display name as used in ProjectConfiguration is
useful, and we'd like to use it elsewhere.

Change-Id: I10d9a5bd3d3e385a99f1122c6b119136662502fa
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Kandeler
2019-08-01 14:13:59 +02:00
parent 1d7f6fe298
commit b85b805092
7 changed files with 153 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/plugins/projectexplorer/projectconfiguration.cpp
View File

@@ -111,31 +111,15 @@ QString ProjectConfiguration::settingsIdKey()
return QString(CONFIGURATION_ID_KEY);
}
QString ProjectConfiguration::displayName() const
{
if (!m_displayName.isEmpty())
return m_displayName;
return m_defaultDisplayName;
}
void ProjectConfiguration::setDisplayName(const QString &name)
{
if (displayName() == name)
return;
if (name == m_defaultDisplayName)
m_displayName.clear();
else
m_displayName = name;
emit displayNameChanged();
if (m_displayName.setValue(name))
emit displayNameChanged();
}
void ProjectConfiguration::setDefaultDisplayName(const QString &name)
{
if (m_defaultDisplayName == name)
return;
const QString originalName = displayName();
m_defaultDisplayName = name;
if (originalName != displayName())
if (m_displayName.setDefaultValue(name))
emit displayNameChanged();
}
@@ -152,17 +136,12 @@ QString ProjectConfiguration::toolTip() const
return m_toolTip;
}
bool ProjectConfiguration::usesDefaultDisplayName() const
{
return m_displayName.isEmpty();
}
QVariantMap ProjectConfiguration::toMap() const
{
QTC_CHECK(m_id.isValid());
QVariantMap map;
map.insert(QLatin1String(CONFIGURATION_ID_KEY), m_id.toSetting());
map.insert(QLatin1String(DISPLAY_NAME_KEY), m_displayName);
m_displayName.toMap(map, DISPLAY_NAME_KEY);
m_aspects.toMap(map);
return map;
}
@@ -180,7 +159,7 @@ bool ProjectConfiguration::fromMap(const QVariantMap &map)
// mangle in their build keys.
QTC_ASSERT(id.toString().startsWith(m_id.toString()), return false);
m_displayName = map.value(QLatin1String(DISPLAY_NAME_KEY), QString()).toString();
m_displayName.fromMap(map, DISPLAY_NAME_KEY);
m_aspects.fromMap(map);
return true;
}