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 <[email protected]>

27 files changed, 51 insertions, 50 deletions

diff --git a/src/plugins/autotest/boost/boosttestsettingspage.cpp b/src/plugins/autotest/boost/boosttestsettingspage.cpp
index ea9d41a0d50..955d50683db 100644
--- a/src/plugins/autotest/boost/boosttestsettingspage.cpp
+++ b/src/plugins/autotest/boost/boosttestsettingspage.cpp
@@ -101,7 +101,7 @@ void BoostTestSettingsWidget::fillComboBoxes()
     m_ui.reportLevelCB->addItem("No", QVariant::fromValue(ReportLevel::No));
 }
 
-BoostTestSettingsPage::BoostTestSettingsPage(BoostTestSettings *settings, Core::Id settingsId)
+BoostTestSettingsPage::BoostTestSettingsPage(BoostTestSettings *settings, Utils::Id settingsId)
 {
     setId(settingsId);
     setCategory(Constants::AUTOTEST_SETTINGS_CATEGORY);
diff --git a/src/plugins/autotest/boost/boosttestsettingspage.h b/src/plugins/autotest/boost/boosttestsettingspage.h
index 0c5340d91a1..92601652d58 100644
--- a/src/plugins/autotest/boost/boosttestsettingspage.h
+++ b/src/plugins/autotest/boost/boosttestsettingspage.h
@@ -35,7 +35,7 @@ class BoostTestSettings;
 class BoostTestSettingsPage final : public Core::IOptionsPage
 {
 public:
-    BoostTestSettingsPage(BoostTestSettings *settings, Core::Id settingsId);
+    BoostTestSettingsPage(BoostTestSettings *settings, Utils::Id settingsId);
 };
 
 } // Internal
diff --git a/src/plugins/autotest/catch/catchtestsettingspage.cpp b/src/plugins/autotest/catch/catchtestsettingspage.cpp
index 8c54dbe8c8a..0bb597b8b01 100644
--- a/src/plugins/autotest/catch/catchtestsettingspage.cpp
+++ b/src/plugins/autotest/catch/catchtestsettingspage.cpp
@@ -101,7 +101,7 @@ void CatchTestSettingsWidget::apply()
     m_settings->toSettings(Core::ICore::settings());
 }
 
-CatchTestSettingsPage::CatchTestSettingsPage(CatchTestSettings *settings, Core::Id settingsId)
+CatchTestSettingsPage::CatchTestSettingsPage(CatchTestSettings *settings, Utils::Id settingsId)
 {
     setId(settingsId);
     setCategory(Constants::AUTOTEST_SETTINGS_CATEGORY);
diff --git a/src/plugins/autotest/catch/catchtestsettingspage.h b/src/plugins/autotest/catch/catchtestsettingspage.h
index 1c659c7f10b..b2f9fe79697 100644
--- a/src/plugins/autotest/catch/catchtestsettingspage.h
+++ b/src/plugins/autotest/catch/catchtestsettingspage.h
@@ -35,7 +35,7 @@ class CatchTestSettings;
 class CatchTestSettingsPage : public Core::IOptionsPage
 {
 public:
-    CatchTestSettingsPage(CatchTestSettings *settings, Core::Id settingsId);
+    CatchTestSettingsPage(CatchTestSettings *settings, Utils::Id settingsId);
 };
 
 } // namespace Internal
diff --git a/src/plugins/autotest/gtest/gtestresult.cpp b/src/plugins/autotest/gtest/gtestresult.cpp
index ee3be048213..9f909a9de2c 100644
--- a/src/plugins/autotest/gtest/gtestresult.cpp
+++ b/src/plugins/autotest/gtest/gtestresult.cpp
@@ -28,7 +28,7 @@
 #include "../testframeworkmanager.h"
 #include "../testtreeitem.h"
 
-#include <coreplugin/id.h>
+#include <utils/id.h>
 
 #include <QRegularExpression>
 
@@ -95,7 +95,7 @@ static QString normalizeTestName(const QString &testname)
 
 const TestTreeItem *GTestResult::findTestTreeItem() const
 {
-    auto id = Core::Id(Constants::FRAMEWORK_PREFIX).withSuffix(GTest::Constants::FRAMEWORK_NAME);
+    auto id = Utils::Id(Constants::FRAMEWORK_PREFIX).withSuffix(GTest::Constants::FRAMEWORK_NAME);
     ITestFramework *framework = TestFrameworkManager::frameworkForId(id);
     QTC_ASSERT(framework, return nullptr);
     const TestTreeItem *rootNode = framework->rootNode();
diff --git a/src/plugins/autotest/gtest/gtestsettingspage.cpp b/src/plugins/autotest/gtest/gtestsettingspage.cpp
index c788d201af6..d3f94c671f3 100644
--- a/src/plugins/autotest/gtest/gtestsettingspage.cpp
+++ b/src/plugins/autotest/gtest/gtestsettingspage.cpp
@@ -105,11 +105,11 @@ void GTestSettingsWidget::apply()
     if (m_settings->groupMode == oldGroupMode && oldFilter == m_settings->gtestFilter)
         return;
 
-    auto id = Core::Id(Constants::FRAMEWORK_PREFIX).withSuffix(GTest::Constants::FRAMEWORK_NAME);
+    auto id = Utils::Id(Constants::FRAMEWORK_PREFIX).withSuffix(GTest::Constants::FRAMEWORK_NAME);
     TestTreeModel::instance()->rebuild({id});
 }
 
-GTestSettingsPage::GTestSettingsPage(GTestSettings *settings, Core::Id settingsId)
+GTestSettingsPage::GTestSettingsPage(GTestSettings *settings, Utils::Id settingsId)
 {
     setId(settingsId);
     setCategory(Constants::AUTOTEST_SETTINGS_CATEGORY);
diff --git a/src/plugins/autotest/gtest/gtestsettingspage.h b/src/plugins/autotest/gtest/gtestsettingspage.h
index 8cc20ae8b0f..acb3b3513c5 100644
--- a/src/plugins/autotest/gtest/gtestsettingspage.h
+++ b/src/plugins/autotest/gtest/gtestsettingspage.h
@@ -35,7 +35,7 @@ class GTestSettings;
 class GTestSettingsPage final : public Core::IOptionsPage
 {
 public:
-    GTestSettingsPage(GTestSettings *settings, Core::Id settingsId);
+    GTestSettingsPage(GTestSettings *settings, Utils::Id settingsId);
 };
 
 } // namespace Internal
diff --git a/src/plugins/autotest/itestframework.cpp b/src/plugins/autotest/itestframework.cpp
index e43a1ca65e1..ca60e960192 100644
--- a/src/plugins/autotest/itestframework.cpp
+++ b/src/plugins/autotest/itestframework.cpp
@@ -52,15 +52,15 @@ ITestParser *ITestFramework::testParser()
     return m_testParser;
 }
 
-Core::Id ITestFramework::settingsId() const
+Utils::Id ITestFramework::settingsId() const
 {
-    return Core::Id(Constants::SETTINGSPAGE_PREFIX)
+    return Utils::Id(Constants::SETTINGSPAGE_PREFIX)
             .withSuffix(QString("%1.%2").arg(priority()).arg(QLatin1String(name())));
 }
 
-Core::Id ITestFramework::id() const
+Utils::Id ITestFramework::id() const
 {
-    return Core::Id(Constants::FRAMEWORK_PREFIX).withSuffix(name());
+    return Utils::Id(Constants::FRAMEWORK_PREFIX).withSuffix(name());
 }
 
 void ITestFramework::resetRootNode()
diff --git a/src/plugins/autotest/itestframework.h b/src/plugins/autotest/itestframework.h
index 960b9d8ad56..eebb0326173 100644
--- a/src/plugins/autotest/itestframework.h
+++ b/src/plugins/autotest/itestframework.h
@@ -46,8 +46,8 @@ public:
     TestTreeItem *rootNode();
     ITestParser *testParser();
 
-    Core::Id settingsId() const;
-    Core::Id id() const;
+    Utils::Id settingsId() const;
+    Utils::Id id() const;
 
     bool active() const { return m_active; }
     void setActive(bool active) { m_active = active; }
diff --git a/src/plugins/autotest/itestparser.h b/src/plugins/autotest/itestparser.h
index e2ea592e093..3509e7b0271 100644
--- a/src/plugins/autotest/itestparser.h
+++ b/src/plugins/autotest/itestparser.h
@@ -28,7 +28,7 @@
 #include "testtreeitem.h"
 #include "testtreemodel.h"
 
-#include <coreplugin/id.h>
+#include <utils/id.h>
 #include <cplusplus/CppDocument.h>
 #include <cpptools/cppworkingcopy.h>
 #include <qmljs/qmljsdocument.h>
diff --git a/src/plugins/autotest/projectsettingswidget.cpp b/src/plugins/autotest/projectsettingswidget.cpp
index f5021e5c3ca..9706fa7e261 100644
--- a/src/plugins/autotest/projectsettingswidget.cpp
+++ b/src/plugins/autotest/projectsettingswidget.cpp
@@ -120,7 +120,7 @@ void ProjectTestSettingsWidget::populateFrameworks(const QMap<ITestFramework *,
 
 void ProjectTestSettingsWidget::onActiveFrameworkChanged(QTreeWidgetItem *item, int column)
 {
-    auto id = Core::Id::fromSetting(item->data(column, FrameworkIdRole));
+    auto id = Utils::Id::fromSetting(item->data(column, FrameworkIdRole));
     m_projectSettings->activateFramework(id, item->data(0, Qt::CheckStateRole) == Qt::Checked);
     m_syncFrameworksTimer.start(3000);
 }
diff --git a/src/plugins/autotest/qtest/qttestresult.cpp b/src/plugins/autotest/qtest/qttestresult.cpp
index 38fefa171bb..44daaf4aeba 100644
--- a/src/plugins/autotest/qtest/qttestresult.cpp
+++ b/src/plugins/autotest/qtest/qttestresult.cpp
@@ -28,7 +28,7 @@
 #include "../testtreeitem.h"
 #include "../quick/quicktestframework.h" // FIXME BAD! - but avoids declaring QuickTestResult
 
-#include <coreplugin/id.h>
+#include <utils/id.h>
 #include <utils/qtcassert.h>
 
 namespace Autotest {
@@ -131,11 +131,11 @@ TestResult *QtTestResult::createIntermediateResultFor(const TestResult *other)
 
 const TestTreeItem *QtTestResult::findTestTreeItem() const
 {
-    Core::Id id;
+    Utils::Id id;
     if (m_type == TestType::QtTest)
-        id = Core::Id(Constants::FRAMEWORK_PREFIX).withSuffix(QtTest::Constants::FRAMEWORK_NAME);
+        id = Utils::Id(Constants::FRAMEWORK_PREFIX).withSuffix(QtTest::Constants::FRAMEWORK_NAME);
     else
-        id = Core::Id(Constants::FRAMEWORK_PREFIX).withSuffix(QuickTest::Constants::FRAMEWORK_NAME);
+        id = Utils::Id(Constants::FRAMEWORK_PREFIX).withSuffix(QuickTest::Constants::FRAMEWORK_NAME);
     ITestFramework *framework = TestFrameworkManager::frameworkForId(id);
     QTC_ASSERT(framework, return nullptr);
     const TestTreeItem *rootNode = framework->rootNode();
diff --git a/src/plugins/autotest/qtest/qttestsettingspage.cpp b/src/plugins/autotest/qtest/qttestsettingspage.cpp
index 02a74cb344e..bed1930baa8 100644
--- a/src/plugins/autotest/qtest/qttestsettingspage.cpp
+++ b/src/plugins/autotest/qtest/qttestsettingspage.cpp
@@ -100,7 +100,7 @@ void QtTestSettingsWidget::apply()
     m_settings->toSettings(Core::ICore::settings());
 }
 
-QtTestSettingsPage::QtTestSettingsPage(QtTestSettings *settings, Core::Id settingsId)
+QtTestSettingsPage::QtTestSettingsPage(QtTestSettings *settings, Utils::Id settingsId)
 {
     setId(settingsId);
     setCategory(Constants::AUTOTEST_SETTINGS_CATEGORY);
diff --git a/src/plugins/autotest/qtest/qttestsettingspage.h b/src/plugins/autotest/qtest/qttestsettingspage.h
index 3ed9c76eaac..dbd8850a699 100644
--- a/src/plugins/autotest/qtest/qttestsettingspage.h
+++ b/src/plugins/autotest/qtest/qttestsettingspage.h
@@ -35,7 +35,7 @@ class QtTestSettings;
 class QtTestSettingsPage final : public Core::IOptionsPage
 {
 public:
-    QtTestSettingsPage(QtTestSettings *settings, Core::Id settingsId);
+    QtTestSettingsPage(QtTestSettings *settings, Utils::Id settingsId);
 };
 
 } // namespace Internal
diff --git a/src/plugins/autotest/quick/quicktestframework.cpp b/src/plugins/autotest/quick/quicktestframework.cpp
index 50d46c7e1e4..04b8eb4c9c4 100644
--- a/src/plugins/autotest/quick/quicktestframework.cpp
+++ b/src/plugins/autotest/quick/quicktestframework.cpp
@@ -56,8 +56,8 @@ unsigned QuickTestFramework::priority() const
 
 IFrameworkSettings *QuickTestFramework::frameworkSettings()
 {
-    static const Core::Id id
-            = Core::Id(Constants::FRAMEWORK_PREFIX).withSuffix(QtTest::Constants::FRAMEWORK_NAME);
+    static const Utils::Id id
+            = Utils::Id(Constants::FRAMEWORK_PREFIX).withSuffix(QtTest::Constants::FRAMEWORK_NAME);
     ITestFramework *qtTestFramework = TestFrameworkManager::frameworkForId(id);
     return qtTestFramework->frameworkSettings();
 }
diff --git a/src/plugins/autotest/testcodeparser.cpp b/src/plugins/autotest/testcodeparser.cpp
index 0f37ff6f5ba..1ef39f2ccf5 100644
--- a/src/plugins/autotest/testcodeparser.cpp
+++ b/src/plugins/autotest/testcodeparser.cpp
@@ -380,7 +380,7 @@ void TestCodeParser::scanForTests(const QStringList &fileList, const QList<ITest
     }
 }
 
-void TestCodeParser::onTaskStarted(Core::Id type)
+void TestCodeParser::onTaskStarted(Utils::Id type)
 {
     if (type == CppTools::Constants::TASK_INDEX) {
         m_codeModelParsing = true;
@@ -394,7 +394,7 @@ void TestCodeParser::onTaskStarted(Core::Id type)
     }
 }
 
-void TestCodeParser::onAllTasksFinished(Core::Id type)
+void TestCodeParser::onAllTasksFinished(Utils::Id type)
 {
     // if we cancel parsing ensure that progress animation is canceled as well
     if (type == Constants::TASK_PARSE && parsingHasFailed)
diff --git a/src/plugins/autotest/testcodeparser.h b/src/plugins/autotest/testcodeparser.h
index 977cac180be..ad1788221fd 100644
--- a/src/plugins/autotest/testcodeparser.h
+++ b/src/plugins/autotest/testcodeparser.h
@@ -92,8 +92,8 @@ private:
 
     // qml files must be handled slightly different
     void onDocumentUpdated(const QString &fileName, bool isQmlFile = false);
-    void onTaskStarted(Core::Id type);
-    void onAllTasksFinished(Core::Id type);
+    void onTaskStarted(Utils::Id type);
+    void onAllTasksFinished(Utils::Id type);
     void onFinished();
     void onPartialParsingFinished();
     void parsePostponedFiles();
diff --git a/src/plugins/autotest/testeditormark.cpp b/src/plugins/autotest/testeditormark.cpp
index 29ca484c9cd..16602cd8e53 100644
--- a/src/plugins/autotest/testeditormark.cpp
+++ b/src/plugins/autotest/testeditormark.cpp
@@ -30,7 +30,7 @@ namespace Autotest {
 namespace Internal {
 
 TestEditorMark::TestEditorMark(QPersistentModelIndex item, const Utils::FilePath &file, int line)
-    : TextEditor::TextMark(file, line, Core::Id(Constants::TASK_MARK_ID)),
+    : TextEditor::TextMark(file, line, Utils::Id(Constants::TASK_MARK_ID)),
       m_item(item)
 {
 }
diff --git a/src/plugins/autotest/testframeworkmanager.cpp b/src/plugins/autotest/testframeworkmanager.cpp
index d7f1354f30c..1d663a69319 100644
--- a/src/plugins/autotest/testframeworkmanager.cpp
+++ b/src/plugins/autotest/testframeworkmanager.cpp
@@ -35,6 +35,7 @@
 #include <QSettings>
 
 using namespace Core;
+using namespace Utils;
 
 namespace Autotest {
 
diff --git a/src/plugins/autotest/testframeworkmanager.h b/src/plugins/autotest/testframeworkmanager.h
index 4655c331bc4..3dfb09c56b3 100644
--- a/src/plugins/autotest/testframeworkmanager.h
+++ b/src/plugins/autotest/testframeworkmanager.h
@@ -46,7 +46,7 @@ public:
     bool registerTestFramework(ITestFramework *framework);
     void synchronizeSettings(QSettings *s);
 
-    static ITestFramework *frameworkForId(Core::Id frameworkId);
+    static ITestFramework *frameworkForId(Utils::Id frameworkId);
     static void activateFrameworksFromSettings(const Internal::TestSettings *settings);
     static TestFrameworks registeredFrameworks();
 
diff --git a/src/plugins/autotest/testprojectsettings.cpp b/src/plugins/autotest/testprojectsettings.cpp
index 3925671bde1..2726bf95663 100644
--- a/src/plugins/autotest/testprojectsettings.cpp
+++ b/src/plugins/autotest/testprojectsettings.cpp
@@ -60,7 +60,7 @@ void TestProjectSettings::setUseGlobalSettings(bool useGlobal)
      m_useGlobalSettings = useGlobal;
 }
 
-void TestProjectSettings::activateFramework(const Core::Id &id, bool activate)
+void TestProjectSettings::activateFramework(const Utils::Id &id, bool activate)
 {
     ITestFramework *framework = TestFrameworkManager::frameworkForId(id);
     m_activeTestFrameworks[framework] = activate;
@@ -81,7 +81,7 @@ void TestProjectSettings::load()
     if (activeFrameworks.isValid()) {
         const QMap<QString, QVariant> frameworksMap = activeFrameworks.toMap();
         for (ITestFramework *framework : registered) {
-            const Core::Id id = framework->id();
+            const Utils::Id id = framework->id();
             bool active = frameworksMap.value(id.toString(), framework->active()).toBool();
             m_activeTestFrameworks.insert(framework, active);
         }
diff --git a/src/plugins/autotest/testprojectsettings.h b/src/plugins/autotest/testprojectsettings.h
index d0b35d5c5fe..a4ce6b34fca 100644
--- a/src/plugins/autotest/testprojectsettings.h
+++ b/src/plugins/autotest/testprojectsettings.h
@@ -49,7 +49,7 @@ public:
     void setActiveFrameworks(const QMap<ITestFramework *, bool> enabledFrameworks)
     { m_activeTestFrameworks = enabledFrameworks; }
     QMap<ITestFramework *, bool> activeFrameworks() const { return m_activeTestFrameworks; }
-    void activateFramework(const Core::Id &id, bool activate);
+    void activateFramework(const Utils::Id &id, bool activate);
 private:
     void load();
     void save();
diff --git a/src/plugins/autotest/testsettings.cpp b/src/plugins/autotest/testsettings.cpp
index 71d306a5cf0..fffeaece488 100644
--- a/src/plugins/autotest/testsettings.cpp
+++ b/src/plugins/autotest/testsettings.cpp
@@ -27,7 +27,7 @@
 #include "autotestconstants.h"
 #include "testframeworkmanager.h"
 
-#include <coreplugin/id.h>
+#include <utils/id.h>
 
 #include <QSettings>
 
@@ -69,7 +69,7 @@ void TestSettings::toSettings(QSettings *s) const
     s->setValue(popupOnFailKey, popupOnFail);
     s->setValue(runAfterBuildKey, int(runAfterBuild));
     // store frameworks and their current active and grouping state
-    for (const Core::Id &id : frameworks.keys()) {
+    for (const Utils::Id &id : frameworks.keys()) {
         s->setValue(id.toString(), frameworks.value(id));
         s->setValue(id.toString() + groupSuffix, frameworksGrouping.value(id));
     }
@@ -97,7 +97,7 @@ void TestSettings::fromSettings(QSettings *s)
     frameworksGrouping.clear();
     for (const ITestFramework *framework : registered) {
         // get their active state
-        const Core::Id id = framework->id();
+        const Utils::Id id = framework->id();
         const QString key = id.toString();
         frameworks.insert(id, s->value(key, framework->active()).toBool());
         // and whether grouping is enabled
diff --git a/src/plugins/autotest/testsettingspage.cpp b/src/plugins/autotest/testsettingspage.cpp
index 30bb78acd67..c7339b96421 100644
--- a/src/plugins/autotest/testsettingspage.cpp
+++ b/src/plugins/autotest/testsettingspage.cpp
@@ -91,12 +91,12 @@ TestSettings TestSettingsWidget::settings() const
     return result;
 }
 
-void TestSettingsWidget::populateFrameworksListWidget(const QHash<Core::Id, bool> &frameworks)
+void TestSettingsWidget::populateFrameworksListWidget(const QHash<Utils::Id, bool> &frameworks)
 {
     const TestFrameworks &registered = TestFrameworkManager::registeredFrameworks();
     m_ui.frameworkTreeWidget->clear();
     for (const ITestFramework *framework : registered) {
-        const Core::Id id = framework->id();
+        const Utils::Id id = framework->id();
         auto item = new QTreeWidgetItem(m_ui.frameworkTreeWidget, QStringList(QLatin1String(framework->name())));
         item->setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsUserCheckable);
         item->setCheckState(0, frameworks.value(id) ? Qt::Checked : Qt::Unchecked);
@@ -118,7 +118,7 @@ void TestSettingsWidget::frameworkSettings(TestSettings &settings) const
     const int itemCount = model->rowCount();
     for (int row = 0; row < itemCount; ++row) {
         QModelIndex idx = model->index(row, 0);
-        const Core::Id id = Core::Id::fromSetting(idx.data(Qt::UserRole));
+        const Utils::Id id = Utils::Id::fromSetting(idx.data(Qt::UserRole));
         settings.frameworks.insert(id, idx.data(Qt::CheckStateRole) == Qt::Checked);
         idx = model->index(row, 1);
         settings.frameworksGrouping.insert(id, idx.data(Qt::CheckStateRole) == Qt::Checked);
@@ -162,8 +162,8 @@ void TestSettingsPage::apply()
     if (!m_widget) // page was not shown at all
         return;
     const TestSettings newSettings = m_widget->settings();
-    const QList<Core::Id> changedIds = Utils::filtered(newSettings.frameworksGrouping.keys(),
-                                                       [newSettings, this] (const Core::Id &id) {
+    const QList<Utils::Id> changedIds = Utils::filtered(newSettings.frameworksGrouping.keys(),
+                                                       [newSettings, this] (const Utils::Id &id) {
         return newSettings.frameworksGrouping[id] != m_settings->frameworksGrouping[id];
     });
     *m_settings = newSettings;
diff --git a/src/plugins/autotest/testsettingspage.h b/src/plugins/autotest/testsettingspage.h
index 8834511313c..46551951e96 100644
--- a/src/plugins/autotest/testsettingspage.h
+++ b/src/plugins/autotest/testsettingspage.h
@@ -46,7 +46,7 @@ public:
     TestSettings settings() const;
 
 private:
-    void populateFrameworksListWidget(const QHash<Core::Id, bool> &frameworks);
+    void populateFrameworksListWidget(const QHash<Utils::Id, bool> &frameworks);
     void frameworkSettings(TestSettings &settings) const;
     void onFrameworkItemChanged();
     Ui::TestSettingsPage m_ui;
diff --git a/src/plugins/autotest/testtreemodel.cpp b/src/plugins/autotest/testtreemodel.cpp
index 6fbae85cb5f..13d62216f2b 100644
--- a/src/plugins/autotest/testtreemodel.cpp
+++ b/src/plugins/autotest/testtreemodel.cpp
@@ -266,9 +266,9 @@ void TestTreeModel::filterAndInsert(TestTreeItem *item, TestTreeItem *root, bool
         insertItemInParent(filtered, root, groupingEnabled);
 }
 
-void TestTreeModel::rebuild(const QList<Core::Id> &frameworkIds)
+void TestTreeModel::rebuild(const QList<Utils::Id> &frameworkIds)
 {
-    for (const Core::Id &id : frameworkIds) {
+    for (const Utils::Id &id : frameworkIds) {
         ITestFramework *framework = TestFrameworkManager::frameworkForId(id);
         TestTreeItem *frameworkRoot = framework->rootNode();
         const bool groupingEnabled = framework->grouping();
@@ -549,25 +549,25 @@ void TestTreeModel::removeAllTestItems()
 // we're inside tests - so use some internal knowledge to make testing easier
 static TestTreeItem *qtRootNode()
 {
-    auto id = Core::Id(Constants::FRAMEWORK_PREFIX).withSuffix("QtTest");
+    auto id = Utils::Id(Constants::FRAMEWORK_PREFIX).withSuffix("QtTest");
     return TestFrameworkManager::frameworkForId(id)->rootNode();
 }
 
 static TestTreeItem *quickRootNode()
 {
-    auto id = Core::Id(Constants::FRAMEWORK_PREFIX).withSuffix("QtQuickTest");
+    auto id = Utils::Id(Constants::FRAMEWORK_PREFIX).withSuffix("QtQuickTest");
     return TestFrameworkManager::frameworkForId(id)->rootNode();
 }
 
 static TestTreeItem *gtestRootNode()
 {
-    auto id = Core::Id(Constants::FRAMEWORK_PREFIX).withSuffix("GTest");
+    auto id = Utils::Id(Constants::FRAMEWORK_PREFIX).withSuffix("GTest");
     return TestFrameworkManager::frameworkForId(id)->rootNode();
 }
 
 static TestTreeItem *boostTestRootNode()
 {
-    auto id = Core::Id(Constants::FRAMEWORK_PREFIX).withSuffix("Boost");
+    auto id = Utils::Id(Constants::FRAMEWORK_PREFIX).withSuffix("Boost");
     return TestFrameworkManager::frameworkForId(id)->rootNode();
 }
 
diff --git a/src/plugins/autotest/testtreemodel.h b/src/plugins/autotest/testtreemodel.h
index 20ef8e01369..af3501c484d 100644
--- a/src/plugins/autotest/testtreemodel.h
+++ b/src/plugins/autotest/testtreemodel.h
@@ -64,7 +64,7 @@ public:
     QList<TestConfiguration *> getTestsForFile(const Utils::FilePath &fileName) const;
     QList<TestTreeItem *> testItemsByName(const QString &testName);
     void synchronizeTestFrameworks();
-    void rebuild(const QList<Core::Id> &frameworkIds);
+    void rebuild(const QList<Utils::Id> &frameworkIds);
 
     void updateCheckStateCache();
 #ifdef WITH_TESTS