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>

10 files changed, 16 insertions, 17 deletions

diff --git a/src/plugins/clangtools/clangtool.cpp b/src/plugins/clangtools/clangtool.cpp
index 3eefa29732..49f389b4f2 100644
--- a/src/plugins/clangtools/clangtool.cpp
+++ b/src/plugins/clangtools/clangtool.cpp
@@ -376,7 +376,7 @@ static RunSettings runSettings()
     return ClangToolsSettings::instance()->runSettings();
 }
 
-static ClangDiagnosticConfig diagnosticConfig(const Core::Id &diagConfigId)
+static ClangDiagnosticConfig diagnosticConfig(const Utils::Id &diagConfigId)
 {
     const ClangDiagnosticConfigsModel configs = diagnosticConfigsModel();
     QTC_ASSERT(configs.hasConfigWithId(diagConfigId), return ClangDiagnosticConfig());
@@ -879,8 +879,8 @@ void ClangTool::reset()
 static bool canAnalyzeProject(Project *project)
 {
     if (const Target *target = project->activeTarget()) {
-        const Core::Id c = ProjectExplorer::Constants::C_LANGUAGE_ID;
-        const Core::Id cxx = ProjectExplorer::Constants::CXX_LANGUAGE_ID;
+        const Utils::Id c = ProjectExplorer::Constants::C_LANGUAGE_ID;
+        const Utils::Id cxx = ProjectExplorer::Constants::CXX_LANGUAGE_ID;
         const bool projectSupportsLanguage = project->projectLanguages().contains(c)
                                              || project->projectLanguages().contains(cxx);
         return projectSupportsLanguage
diff --git a/src/plugins/clangtools/clangtoolruncontrol.h b/src/plugins/clangtools/clangtoolruncontrol.h
index f497413247..97f667a01a 100644
--- a/src/plugins/clangtools/clangtoolruncontrol.h
+++ b/src/plugins/clangtools/clangtoolruncontrol.h
@@ -116,7 +116,7 @@ private:
     CppTools::ProjectInfo m_projectInfoBeforeBuild;
     CppTools::ProjectInfo m_projectInfo;
     QString m_targetTriple;
-    Core::Id m_toolChainType;
+    Utils::Id m_toolChainType;
 
     QFutureInterface<void> m_progress;
     QueueItems m_queue;
diff --git a/src/plugins/clangtools/clangtoolsdiagnosticmodel.cpp b/src/plugins/clangtools/clangtoolsdiagnosticmodel.cpp
index fdb113f7e3..6cf881c159 100644
--- a/src/plugins/clangtools/clangtoolsdiagnosticmodel.cpp
+++ b/src/plugins/clangtools/clangtoolsdiagnosticmodel.cpp
@@ -382,7 +382,7 @@ static TextEditor::TextMark *generateDiagnosticTextMark(const Diagnostic &diag)
 {
     auto mark = new TextEditor::TextMark(Utils::FilePath::fromString(diag.location.filePath),
                                          diag.location.line,
-                                         Core::Id("ClangTool.DiagnosticMark"));
+                                         Utils::Id("ClangTool.DiagnosticMark"));
     if (diag.type == "error" || diag.type == "fatal")
         mark->setColor(Utils::Theme::CodeModel_Error_TextMarkColor);
     else
diff --git a/src/plugins/clangtools/clangtoolsprojectsettings.h b/src/plugins/clangtools/clangtoolsprojectsettings.h
index 1b872c3c31..aa6c035395 100644
--- a/src/plugins/clangtools/clangtoolsprojectsettings.h
+++ b/src/plugins/clangtools/clangtoolsprojectsettings.h
@@ -27,7 +27,6 @@
 
 #include "clangtoolssettings.h"
 
-#include <coreplugin/id.h>
 #include <projectexplorer/project.h>
 
 #include <utils/fileutils.h>
diff --git a/src/plugins/clangtools/clangtoolssettings.cpp b/src/plugins/clangtools/clangtoolssettings.cpp
index ad704728ac..ec76cdd729 100644
--- a/src/plugins/clangtools/clangtoolssettings.cpp
+++ b/src/plugins/clangtools/clangtoolssettings.cpp
@@ -50,7 +50,7 @@ using namespace CppTools;
 namespace ClangTools {
 namespace Internal {
 
-static Core::Id defaultDiagnosticId()
+static Utils::Id defaultDiagnosticId()
 {
     return ClangTools::Constants::DIAG_CONFIG_TIDY_AND_CLAZY;
 }
@@ -63,7 +63,7 @@ RunSettings::RunSettings()
 
 void RunSettings::fromMap(const QVariantMap &map, const QString &prefix)
 {
-    m_diagnosticConfigId = Core::Id::fromSetting(map.value(prefix + diagnosticConfigIdKey));
+    m_diagnosticConfigId = Utils::Id::fromSetting(map.value(prefix + diagnosticConfigIdKey));
     m_parallelJobs = map.value(prefix + parallelJobsKey).toInt();
     m_buildBeforeAnalysis = map.value(prefix + buildBeforeAnalysisKey).toBool();
 }
@@ -75,7 +75,7 @@ void RunSettings::toMap(QVariantMap &map, const QString &prefix) const
     map.insert(prefix + buildBeforeAnalysisKey, m_buildBeforeAnalysis);
 }
 
-Core::Id RunSettings::diagnosticConfigId() const
+Utils::Id RunSettings::diagnosticConfigId() const
 {
     if (!diagnosticConfigsModel().hasConfigWithId(m_diagnosticConfigId))
         return defaultDiagnosticId();
diff --git a/src/plugins/clangtools/clangtoolssettings.h b/src/plugins/clangtools/clangtoolssettings.h
index fd7022ba6c..21b62e02a4 100644
--- a/src/plugins/clangtools/clangtoolssettings.h
+++ b/src/plugins/clangtools/clangtoolssettings.h
@@ -25,9 +25,10 @@
 
 #pragma once
 
-#include <coreplugin/id.h>
 #include <cpptools/clangdiagnosticconfig.h>
 
+#include <utils/id.h>
+
 #include <QObject>
 #include <QString>
 
@@ -44,8 +45,8 @@ public:
     void fromMap(const QVariantMap &map, const QString &prefix = QString());
     void toMap(QVariantMap &map, const QString &prefix = QString()) const;
 
-    Core::Id diagnosticConfigId() const;
-    void setDiagnosticConfigId(const Core::Id &id) { m_diagnosticConfigId = id; }
+    Utils::Id diagnosticConfigId() const;
+    void setDiagnosticConfigId(const Utils::Id &id) { m_diagnosticConfigId = id; }
 
     bool buildBeforeAnalysis() const { return m_buildBeforeAnalysis; }
     void setBuildBeforeAnalysis(bool yesno) { m_buildBeforeAnalysis = yesno; }
@@ -54,7 +55,7 @@ public:
     void setParallelJobs(int jobs) { m_parallelJobs = jobs; }
 
 private:
-    Core::Id m_diagnosticConfigId;
+    Utils::Id m_diagnosticConfigId;
     int m_parallelJobs = -1;
     bool m_buildBeforeAnalysis = true;
 };
diff --git a/src/plugins/clangtools/clangtoolsutils.h b/src/plugins/clangtools/clangtoolsutils.h
index 751304ebc8..a9a1e3ce93 100644
--- a/src/plugins/clangtools/clangtoolsutils.h
+++ b/src/plugins/clangtools/clangtoolsutils.h
@@ -25,7 +25,6 @@
 
 #pragma once
 
-#include <coreplugin/id.h>
 #include <cpptools/clangdiagnosticconfig.h>
 
 #include <QtGlobal>
diff --git a/src/plugins/clangtools/diagnosticconfigswidget.cpp b/src/plugins/clangtools/diagnosticconfigswidget.cpp
index e70fcd72ce..9e12f89a02 100644
--- a/src/plugins/clangtools/diagnosticconfigswidget.cpp
+++ b/src/plugins/clangtools/diagnosticconfigswidget.cpp
@@ -694,7 +694,7 @@ static void setupTreeView(QTreeView *view, QAbstractItemModel *model, int expand
 }
 
 DiagnosticConfigsWidget::DiagnosticConfigsWidget(const ClangDiagnosticConfigs &configs,
-                                                 const Core::Id &configToSelect,
+                                                 const Utils::Id &configToSelect,
                                                  const ClangTidyInfo &tidyInfo,
                                                  const ClazyStandaloneInfo &clazyInfo)
     : ClangDiagnosticConfigsWidget(configs, configToSelect)
diff --git a/src/plugins/clangtools/diagnosticconfigswidget.h b/src/plugins/clangtools/diagnosticconfigswidget.h
index fcbaeef844..251fdd0f47 100644
--- a/src/plugins/clangtools/diagnosticconfigswidget.h
+++ b/src/plugins/clangtools/diagnosticconfigswidget.h
@@ -50,7 +50,7 @@ class DiagnosticConfigsWidget : public CppTools::ClangDiagnosticConfigsWidget
 
 public:
     DiagnosticConfigsWidget(const CppTools::ClangDiagnosticConfigs &configs,
-                            const Core::Id &configToSelect,
+                            const Utils::Id &configToSelect,
                             const ClangTidyInfo &tidyInfo,
                             const ClazyStandaloneInfo &clazyInfo);
     ~DiagnosticConfigsWidget();
diff --git a/src/plugins/clangtools/runsettingswidget.cpp b/src/plugins/clangtools/runsettingswidget.cpp
index 336f9d772b..76fc820373 100644
--- a/src/plugins/clangtools/runsettingswidget.cpp
+++ b/src/plugins/clangtools/runsettingswidget.cpp
@@ -57,7 +57,7 @@ CppTools::ClangDiagnosticConfigsSelectionWidget *RunSettingsWidget::diagnosticSe
 }
 
 static CppTools::ClangDiagnosticConfigsWidget *createEditWidget(
-    const CppTools::ClangDiagnosticConfigs &configs, const Core::Id &configToSelect)
+    const CppTools::ClangDiagnosticConfigs &configs, const Utils::Id &configToSelect)
 {
     // Determine executable paths
     QString clangTidyPath;