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

Core/Utils: Migrate further to Utils::Id

Browse Source 
The coreplugin/id.h header is kept for downstream for now.

Change-Id: I8c44590f7b988b3770ecdc177c40783e12353e66
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2020-06-26 13:59:38 +02:00
parent 4924392620
commit 430a33dcd9
655 changed files with 2115 additions and 2093 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -151,7 +151,7 @@ ProjectConfigurationAspects::~ProjectConfigurationAspects()
qDeleteAll(base());
}
ProjectConfigurationAspect *ProjectConfigurationAspects::aspect(Core::Id id) const
ProjectConfigurationAspect *ProjectConfigurationAspects::aspect(Utils::Id id) const
{
return Utils::findOrDefault(base(), Utils::equal(&ProjectConfigurationAspect::id, id));
}
@@ -171,7 +171,7 @@ void ProjectConfigurationAspects::toMap(QVariantMap &map) const
// ProjectConfiguration
ProjectConfiguration::ProjectConfiguration(QObject *parent, Core::Id id)
ProjectConfiguration::ProjectConfiguration(QObject *parent, Utils::Id id)
: QObject(parent)
, m_id(id)
{
@@ -194,7 +194,7 @@ Project *ProjectConfiguration::project() const
return m_target->project();
}
Core::Id ProjectConfiguration::id() const
Utils::Id ProjectConfiguration::id() const
{
return m_id;
}
@@ -246,7 +246,7 @@ Target *ProjectConfiguration::target() const
bool ProjectConfiguration::fromMap(const QVariantMap &map)
{
Core::Id id = Core::Id::fromSetting(map.value(QLatin1String(CONFIGURATION_ID_KEY)));
Utils::Id id = Utils::Id::fromSetting(map.value(QLatin1String(CONFIGURATION_ID_KEY)));
// Note: This is only "startsWith", not ==, as RunConfigurations currently still
// mangle in their build keys.
QTC_ASSERT(id.toString().startsWith(m_id.toString()), return false);
@@ -256,7 +256,7 @@ bool ProjectConfiguration::fromMap(const QVariantMap &map)
return true;
}
ProjectConfigurationAspect *ProjectConfiguration::aspect(Core::Id id) const
ProjectConfigurationAspect *ProjectConfiguration::aspect(Utils::Id id) const
{
return m_aspects.aspect(id);
}
@@ -267,7 +267,7 @@ void ProjectConfiguration::acquaintAspects()
aspect->acquaintSiblings(m_aspects);
}
Core::Id ProjectExplorer::idFromMap(const QVariantMap &map)
Utils::Id ProjectExplorer::idFromMap(const QVariantMap &map)
{
return Core::Id::fromSetting(map.value(QLatin1String(CONFIGURATION_ID_KEY)));
return Utils::Id::fromSetting(map.value(QLatin1String(CONFIGURATION_ID_KEY)));
}