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

10
src/plugins/projectexplorer/buildsteplist.cpp
View File

@@ -39,7 +39,7 @@ namespace ProjectExplorer {
const char STEPS_COUNT_KEY[] = "ProjectExplorer.BuildStepList.StepsCount";
const char STEPS_PREFIX[] = "ProjectExplorer.BuildStepList.Step.";
BuildStepList::BuildStepList(QObject *parent, Core::Id id)
BuildStepList::BuildStepList(QObject *parent, Utils::Id id)
: QObject(parent), m_id(id)
{
QTC_ASSERT(parent, return);
@@ -91,7 +91,7 @@ bool BuildStepList::isEmpty() const
return m_steps.isEmpty();
}
bool BuildStepList::contains(Core::Id id) const
bool BuildStepList::contains(Utils::Id id) const
{
return Utils::anyOf(steps(), [id](BuildStep *bs){
return bs->id() == id;
@@ -130,7 +130,7 @@ bool BuildStepList::fromMap(const QVariantMap &map)
continue;
}
bool handled = false;
Core::Id stepId = idFromMap(bsData);
Utils::Id stepId = idFromMap(bsData);
for (BuildStepFactory *factory : factories) {
if (factory->stepId() == stepId) {
if (factory->canHandle(this)) {
@@ -153,7 +153,7 @@ QList<BuildStep *> BuildStepList::steps() const
return m_steps;
}
BuildStep *BuildStepList::firstStepWithId(Core::Id id) const
BuildStep *BuildStepList::firstStepWithId(Utils::Id id) const
{
return Utils::findOrDefault(m_steps, Utils::equal(&BuildStep::id, id));
}
@@ -164,7 +164,7 @@ void BuildStepList::insertStep(int position, BuildStep *step)
emit stepInserted(position);
}
void BuildStepList::insertStep(int position, Core::Id stepId)
void BuildStepList::insertStep(int position, Utils::Id stepId)
{
for (BuildStepFactory *factory : BuildStepFactory::allBuildStepFactories()) {
if (BuildStep *step = factory->create(this, stepId)) {