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>

4 files changed, 5 insertions, 4 deletions

diff --git a/src/plugins/scxmleditor/scxmleditordata.cpp b/src/plugins/scxmleditor/scxmleditordata.cpp
index ae7379a3e1e..7f823093075 100644
--- a/src/plugins/scxmleditor/scxmleditordata.cpp
+++ b/src/plugins/scxmleditor/scxmleditordata.cpp
@@ -51,6 +51,7 @@
 
 using namespace ScxmlEditor::Common;
 using namespace ScxmlEditor::PluginInterface;
+using namespace Utils;
 
 namespace ScxmlEditor {
 
diff --git a/src/plugins/scxmleditor/scxmleditordocument.cpp b/src/plugins/scxmleditor/scxmleditordocument.cpp
index 3f74d97a0c0..5c2a072326b 100644
--- a/src/plugins/scxmleditor/scxmleditordocument.cpp
+++ b/src/plugins/scxmleditor/scxmleditordocument.cpp
@@ -48,7 +48,7 @@ ScxmlEditorDocument::ScxmlEditorDocument(MainWidget *designWidget, QObject *pare
 {
     setMimeType(QLatin1String(ProjectExplorer::Constants::SCXML_MIMETYPE));
     setParent(parent);
-    setId(Core::Id(ScxmlEditor::Constants::K_SCXML_EDITOR_ID));
+    setId(Utils::Id(ScxmlEditor::Constants::K_SCXML_EDITOR_ID));
 
     // Designer needs UTF-8 regardless of settings.
     setCodec(QTextCodec::codecForName("UTF-8"));
diff --git a/src/plugins/scxmleditor/scxmleditorstack.cpp b/src/plugins/scxmleditor/scxmleditorstack.cpp
index 2861f24b508..eb66134e8a1 100644
--- a/src/plugins/scxmleditor/scxmleditorstack.cpp
+++ b/src/plugins/scxmleditor/scxmleditorstack.cpp
@@ -85,7 +85,7 @@ QWidget *ScxmlEditorStack::widgetForEditor(ScxmlTextEditor *xmlEditor)
     return widget(i);
 }
 
-void ScxmlEditorStack::modeAboutToChange(Core::Id m)
+void ScxmlEditorStack::modeAboutToChange(Utils::Id m)
 {
     // Sync the editor when entering edit mode
     if (m == Core::Constants::MODE_EDIT) {
diff --git a/src/plugins/scxmleditor/scxmleditorstack.h b/src/plugins/scxmleditor/scxmleditorstack.h
index 3fc228313ab..bcdf5abd628 100644
--- a/src/plugins/scxmleditor/scxmleditorstack.h
+++ b/src/plugins/scxmleditor/scxmleditorstack.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include <coreplugin/id.h>
+#include <utils/id.h>
 
 #include <QStackedWidget>
 
@@ -52,7 +52,7 @@ public:
     bool setVisibleEditor(Core::IEditor *xmlEditor);
 
 private:
-    void modeAboutToChange(Core::Id m);
+    void modeAboutToChange(Utils::Id m);
 
     QVector<ScxmlTextEditor*> m_editors;
 };