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 430a33dcd9)
Reviewed-by: Eike Ziller <eike.ziller@qt.io>

src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp

@@ -180,7 +180,7 @@ void ClangEditorDocumentProcessor::clearProjectPart()
     m_projectPart.clear();
 }
 
-Core::Id ClangEditorDocumentProcessor::diagnosticConfigId() const
+::Utils::Id ClangEditorDocumentProcessor::diagnosticConfigId() const
 {
     return m_diagnosticConfigId;
 }
@@ -451,7 +451,7 @@ public:
     }
 
     const QStringList &options() const { return m_options; }
-    const Core::Id &diagnosticConfigId() const { return m_diagnosticConfigId; }
+    const ::Utils::Id &diagnosticConfigId() const { return m_diagnosticConfigId; }
     CppTools::UseBuildSystemWarnings useBuildSystemWarnings() const
     {
         return m_useBuildSystemWarnings;
@@ -479,7 +479,7 @@ private:
         if (m_projectPart.project) {
             ClangProjectSettings &projectSettings = getProjectSettings(m_projectPart.project);
             if (!projectSettings.useGlobalConfig()) {
-                const Core::Id warningConfigId = projectSettings.warningConfigId();
+                const ::Utils::Id warningConfigId = projectSettings.warningConfigId();
                 const CppTools::ClangDiagnosticConfigsModel configsModel
                     = CppTools::diagnosticConfigsModel();
                 if (configsModel.hasConfigWithId(warningConfigId)) {
@@ -538,7 +538,7 @@ private:
     const QString &m_filePath;
     const CppTools::ProjectPart &m_projectPart;
 
-    Core::Id m_diagnosticConfigId;
+    ::Utils::Id m_diagnosticConfigId;
     CppTools::UseBuildSystemWarnings m_useBuildSystemWarnings = CppTools::UseBuildSystemWarnings::No;
     CppTools::CompilerOptionsBuilder m_builder;
     bool m_isClMode = false;

src/plugins/clangcodemodel/clangeditordocumentprocessor.h

@@ -28,10 +28,11 @@
 #include "clangdiagnosticmanager.h"
 #include "clangeditordocumentparser.h"
 
-#include <coreplugin/id.h>
 #include <cpptools/builtineditordocumentprocessor.h>
 #include <cpptools/semantichighlighter.h>
 
+#include <utils/id.h>
+
 #include <QFutureWatcher>
 #include <QTimer>
 
@@ -68,7 +69,7 @@ public:
     CppTools::ProjectPart::Ptr projectPart() const;
     void clearProjectPart();
 
-    Core::Id diagnosticConfigId() const;
+    ::Utils::Id diagnosticConfigId() const;
 
     void updateCodeWarnings(const QVector<ClangBackEnd::DiagnosticContainer> &diagnostics,
                             const ClangBackEnd::DiagnosticContainer &firstHeaderErrorDiagnostic,
@@ -134,7 +135,7 @@ private:
     BackendCommunicator &m_communicator;
     QSharedPointer<ClangEditorDocumentParser> m_parser;
     CppTools::ProjectPart::Ptr m_projectPart;
-    Core::Id m_diagnosticConfigId;
+    ::Utils::Id m_diagnosticConfigId;
     bool m_isProjectFile = false;
     QFutureWatcher<void> m_parserWatcher;
     QTimer m_updateBackendDocumentTimer;

src/plugins/clangcodemodel/clangmodelmanagersupport.cpp

@@ -425,14 +425,14 @@ void ClangModelManagerSupport::onProjectPartsRemoved(const QStringList &projectP
 }
 
 static ClangEditorDocumentProcessors clangProcessorsWithDiagnosticConfig(
-    const QVector<Core::Id> &configIds)
+    const QVector<::Utils::Id> &configIds)
 {
     return ::Utils::filtered(clangProcessors(), [configIds](ClangEditorDocumentProcessor *p) {
         return configIds.contains(p->diagnosticConfigId());
     });
 }
 
-void ClangModelManagerSupport::onDiagnosticConfigsInvalidated(const QVector<Core::Id> &configIds)
+void ClangModelManagerSupport::onDiagnosticConfigsInvalidated(const QVector<::Utils::Id> &configIds)
 {
     updateProcessors(clangProcessorsWithDiagnosticConfig(configIds));
 }

src/plugins/clangcodemodel/clangmodelmanagersupport.h

@@ -30,8 +30,9 @@
 
 #include <cpptools/cppmodelmanagersupport.h>
 
+#include <utils/id.h>
+
 #include <QObject>
-#include <QScopedPointer>
 
 #include <memory>
 
@@ -40,9 +41,6 @@ class QMenu;
 class QWidget;
 QT_END_NAMESPACE
 
-namespace Core {
-class IDocument;
-} // namespace Core
 namespace TextEditor { class TextEditorWidget; }
 namespace CppTools {
 class FollowSymbolInterface;
@@ -108,7 +106,7 @@ private:
     void onProjectPartsUpdated(ProjectExplorer::Project *project);
     void onProjectPartsRemoved(const QStringList &projectPartIds);
 
-    void onDiagnosticConfigsInvalidated(const QVector<Core::Id> &configIds);
+    void onDiagnosticConfigsInvalidated(const QVector<::Utils::Id> &configIds);
 
     void reinitializeBackendDocuments(const QStringList &projectPartIds);
 

src/plugins/clangcodemodel/clangprojectsettings.cpp

@@ -51,9 +51,9 @@ static bool useGlobalConfigFromSettings(ProjectExplorer::Project *project)
     return useGlobalConfigVariant.isValid() ? useGlobalConfigVariant.toBool() : true;
 }
 
-static Core::Id warningConfigIdFromSettings(ProjectExplorer::Project *project)
+static Utils::Id warningConfigIdFromSettings(ProjectExplorer::Project *project)
 {
-    return Core::Id::fromSetting(project->namedSettings(warningConfigIdKey()));
+    return Utils::Id::fromSetting(project->namedSettings(warningConfigIdKey()));
 }
 
 static QStringList customCommandLineFromSettings(ProjectExplorer::Project *project)
@@ -75,7 +75,7 @@ ClangProjectSettings::ClangProjectSettings(ProjectExplorer::Project *project)
             this, &ClangProjectSettings::store);
 }
 
-Core::Id ClangProjectSettings::warningConfigId() const
+Utils::Id ClangProjectSettings::warningConfigId() const
 {
     const CppTools::ClangDiagnosticConfigsModel model = CppTools::diagnosticConfigsModel();
     if (!model.hasConfigWithId(m_warningConfigId))
@@ -83,7 +83,7 @@ Core::Id ClangProjectSettings::warningConfigId() const
     return m_warningConfigId;
 }
 
-void ClangProjectSettings::setWarningConfigId(const Core::Id &customConfigId)
+void ClangProjectSettings::setWarningConfigId(const Utils::Id &customConfigId)
 {
     m_warningConfigId = customConfigId;
 }

src/plugins/clangcodemodel/clangprojectsettings.h

@@ -25,9 +25,10 @@
 
 #pragma once
 
-#include <coreplugin/id.h>
 #include <projectexplorer/project.h>
 
+#include <utils/id.h>
+
 #include <QObject>
 #include <QString>
 
@@ -48,8 +49,8 @@ public:
     bool useGlobalConfig() const;
     void setUseGlobalConfig(bool useGlobalConfig);
 
-    Core::Id warningConfigId() const;
-    void setWarningConfigId(const Core::Id &warningConfigId);
+    ::Utils::Id warningConfigId() const;
+    void setWarningConfigId(const ::Utils::Id &warningConfigId);
 
     QStringList commandLineOptions() const;
     void setCommandLineOptions(const QStringList &options);
@@ -65,7 +66,7 @@ signals:
 private:
     ProjectExplorer::Project *m_project;
     bool m_useGlobalConfig = true;
-    Core::Id m_warningConfigId;
+    ::Utils::Id m_warningConfigId;
 
     QStringList m_customCommandLineOptions;
 };

src/plugins/clangcodemodel/clangprojectsettingswidget.cpp

@@ -41,7 +41,7 @@
 namespace ClangCodeModel {
 namespace Internal {
 
-static Core::Id configIdForProject(ClangProjectSettings &projectSettings)
+static Utils::Id configIdForProject(ClangProjectSettings &projectSettings)
 {
     if (projectSettings.useGlobalConfig())
         return CppTools::codeModelSettings()->clangDiagnosticConfigId();
@@ -67,7 +67,7 @@ ClangProjectSettingsWidget::ClangProjectSettingsWidget(ProjectExplorer::Project
             this,
             [this]() {
                 // Save project's config id
-                const Core::Id currentConfigId = m_ui.clangDiagnosticConfigsSelectionWidget
+                const Utils::Id currentConfigId = m_ui.clangDiagnosticConfigsSelectionWidget
                                                      ->currentConfigId();
                 m_projectSettings.setWarningConfigId(currentConfigId);
 
@@ -150,7 +150,7 @@ void ClangProjectSettingsWidget::syncOtherWidgetsToComboBox()
         ->refresh(CppTools::diagnosticConfigsModel(),
                   configIdForProject(m_projectSettings),
                   [](const CppTools::ClangDiagnosticConfigs &configs,
-                     const Core::Id &configToSelect) {
+                     const Utils::Id &configToSelect) {
                       return new CppTools::ClangDiagnosticConfigsWidget(configs, configToSelect);
                   });
 }

src/plugins/clangcodemodel/clangtextmark.cpp

@@ -71,7 +71,7 @@ bool isWarningOrNote(ClangBackEnd::DiagnosticSeverity severity)
     Q_UNREACHABLE();
 }
 
-static Core::Id categoryForSeverity(ClangBackEnd::DiagnosticSeverity severity)
+static ::Utils::Id categoryForSeverity(ClangBackEnd::DiagnosticSeverity severity)
 {
     return isWarningOrNote(severity) ? Constants::CLANG_WARNING : Constants::CLANG_ERROR;
 }
@@ -134,7 +134,7 @@ ClangDiagnosticConfig diagnosticConfig(const ClangProjectSettings &projectSettin
     QTC_ASSERT(project, return {});
 
     // Get config id
-    Core::Id currentConfigId = projectSettings.warningConfigId();
+    ::Utils::Id currentConfigId = projectSettings.warningConfigId();
     if (projectSettings.useGlobalConfig())
         currentConfigId = globalSettings.clangDiagnosticConfigId();