Core/Utils: Migrate further to Utils::Id

The coreplugin/id.h header is kept for downstream for now.

Change-Id: I8c44590f7b988b3770ecdc177c40783e12353e66
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

4 files changed, 5 insertions, 5 deletions

diff --git a/src/plugins/cppcheck/cppcheckplugin.cpp b/src/plugins/cppcheck/cppcheckplugin.cpp
index 4bbab6a4de..6d338a1df3 100644
--- a/src/plugins/cppcheck/cppcheckplugin.cpp
+++ b/src/plugins/cppcheck/cppcheckplugin.cpp
@@ -145,7 +145,7 @@ void CppcheckPluginPrivate::updateManualRunAction()
     using namespace ProjectExplorer;
     const Project *project = SessionManager::startupProject();
     const Target *target = SessionManager::startupTarget();
-    const Core::Id cxx = ProjectExplorer::Constants::CXX_LANGUAGE_ID;
+    const Utils::Id cxx = ProjectExplorer::Constants::CXX_LANGUAGE_ID;
     const bool canRun = target && project->projectLanguages().contains(cxx)
                   && ToolChainKitAspect::cxxToolChain(target->kit());
     manualRunAction->setEnabled(canRun);
diff --git a/src/plugins/cppcheck/cppchecktextmark.cpp b/src/plugins/cppcheck/cppchecktextmark.cpp
index 68489709df..512ba37ce9 100644
--- a/src/plugins/cppcheck/cppchecktextmark.cpp
+++ b/src/plugins/cppcheck/cppchecktextmark.cpp
@@ -65,7 +65,7 @@ static Visual getVisual(Diagnostic::Severity type)
 
 CppcheckTextMark::CppcheckTextMark (const Diagnostic &diagnostic)
     : TextEditor::TextMark (diagnostic.fileName, diagnostic.lineNumber,
-                            Core::Id(Constants::TEXTMARK_CATEGORY_ID)),
+                            Utils::Id(Constants::TEXTMARK_CATEGORY_ID)),
     m_severity(diagnostic.severity),
     m_checkId(diagnostic.checkId),
     m_message(diagnostic.message)
diff --git a/src/plugins/cppcheck/cppchecktool.cpp b/src/plugins/cppcheck/cppchecktool.cpp
index cf52af1958..492f1b2e25 100644
--- a/src/plugins/cppcheck/cppchecktool.cpp
+++ b/src/plugins/cppcheck/cppchecktool.cpp
@@ -45,7 +45,7 @@ namespace Cppcheck {
 namespace Internal {
 
 CppcheckTool::CppcheckTool(CppcheckDiagnosticManager &manager,
-                           const Core::Id &progressId) :
+                           const Utils::Id &progressId) :
     m_manager(manager),
     m_progressRegexp("^.* checked (\\d+)% done$"),
     m_messageRegexp("^(.+),(\\d+),(\\w+),(\\w+),(.*)$"),
diff --git a/src/plugins/cppcheck/cppchecktool.h b/src/plugins/cppcheck/cppchecktool.h
index a443264d81..abce347fbf 100644
--- a/src/plugins/cppcheck/cppchecktool.h
+++ b/src/plugins/cppcheck/cppchecktool.h
@@ -58,7 +58,7 @@ class CppcheckTool final : public QObject
     Q_OBJECT
 
 public:
-    CppcheckTool(CppcheckDiagnosticManager &manager, const Core::Id &progressId);
+    CppcheckTool(CppcheckDiagnosticManager &manager, const Utils::Id &progressId);
     ~CppcheckTool() override;
 
     void updateOptions(const CppcheckOptions &options);
@@ -87,7 +87,7 @@ private:
     QVector<QRegExp> m_filters;
     QRegularExpression m_progressRegexp;
     QRegularExpression m_messageRegexp;
-    Core::Id m_progressId;
+    Utils::Id m_progressId;
 };
 
 } // namespace Internal