diff options
author | hjk <hjk@qt.io> | 2020-06-26 13:59:38 +0200 |
---|---|---|
committer | hjk <hjk@qt.io> | 2020-07-06 11:15:18 +0000 |
commit | e1c88116b397ecac2ef0f0678a419790a3e40402 (patch) | |
tree | 830be4b2f1aabad0522c7e01287ec9197b55e4cf /src/plugins/projectexplorer/buildsteplist.cpp | |
parent | c9eedbe0f387f33e5e455af03a795d2114528543 (diff) |
Core/Utils: Migrate further to Utils::Id
The coreplugin/id.h header is kept for downstream for now.
Change-Id: I8c44590f7b988b3770ecdc177c40783e12353e66
(cherry picked from commit 430a33dcd9ac80ddb848e41f8f059102857c88aa)
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/plugins/projectexplorer/buildsteplist.cpp')
-rw-r--r-- | src/plugins/projectexplorer/buildsteplist.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/projectexplorer/buildsteplist.cpp b/src/plugins/projectexplorer/buildsteplist.cpp index 273835bd99..3fd22f8c4e 100644 --- a/src/plugins/projectexplorer/buildsteplist.cpp +++ b/src/plugins/projectexplorer/buildsteplist.cpp @@ -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)) { |