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>

8 files changed, 14 insertions, 19 deletions

diff --git a/src/plugins/macros/actionmacrohandler.cpp b/src/plugins/macros/actionmacrohandler.cpp
index 83f7a09b89..6238875b0d 100644
--- a/src/plugins/macros/actionmacrohandler.cpp
+++ b/src/plugins/macros/actionmacrohandler.cpp
@@ -32,7 +32,6 @@
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/icontext.h>
 #include <coreplugin/icore.h>
-#include <coreplugin/id.h>
 
 #include <texteditor/texteditorconstants.h>
 
@@ -40,6 +39,7 @@
 #include <QEvent>
 
 using namespace Core;
+using namespace Utils;
 
 namespace Macros {
 namespace Internal {
diff --git a/src/plugins/macros/actionmacrohandler.h b/src/plugins/macros/actionmacrohandler.h
index 84735203a6..ff1b48b662 100644
--- a/src/plugins/macros/actionmacrohandler.h
+++ b/src/plugins/macros/actionmacrohandler.h
@@ -27,7 +27,6 @@
 
 #include "imacrohandler.h"
 
-#include <coreplugin/id.h>
 #include <coreplugin/actionmanager/actionmanager.h>
 
 #include <QSet>
@@ -46,12 +45,12 @@ public:
     bool executeEvent(const MacroEvent &macroEvent) override;
 
 private:
-    void registerCommand(Core::Id id);
+    void registerCommand(Utils::Id id);
     Core::Command *command(const QString &id);
-    void addCommand(Core::Id id);
+    void addCommand(Utils::Id id);
 
 private:
-    QSet<Core::Id> m_commandIds;
+    QSet<Utils::Id> m_commandIds;
 };
 
 } // namespace Internal
diff --git a/src/plugins/macros/macroevent.cpp b/src/plugins/macros/macroevent.cpp
index 4b0d93c34e..9b37298798 100644
--- a/src/plugins/macros/macroevent.cpp
+++ b/src/plugins/macros/macroevent.cpp
@@ -60,7 +60,7 @@ void MacroEvent::load(QDataStream &stream)
 {
     QByteArray ba;
     stream >> ba;
-    m_id = Core::Id::fromName(ba);
+    m_id = Utils::Id::fromName(ba);
     int count;
     stream >> count;
     quint8 id;
@@ -80,12 +80,12 @@ void MacroEvent::save(QDataStream &stream) const
         stream << i.key() << i.value();
 }
 
-Core::Id MacroEvent::id() const
+Utils::Id MacroEvent::id() const
 {
     return m_id;
 }
 
-void MacroEvent::setId(Core::Id id)
+void MacroEvent::setId(Utils::Id id)
 {
     m_id = id;
 }
diff --git a/src/plugins/macros/macroevent.h b/src/plugins/macros/macroevent.h
index b5f69f94f8..3d145d8ada 100644
--- a/src/plugins/macros/macroevent.h
+++ b/src/plugins/macros/macroevent.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include <coreplugin/id.h>
+#include <utils/id.h>
 
 #include <QMap>
 #include <QVariant>
@@ -42,8 +42,8 @@ class MacroEvent
 public:
     MacroEvent() = default;
 
-    Core::Id id() const;
-    void setId(Core::Id id);
+    Utils::Id id() const;
+    void setId(Utils::Id id);
 
     QVariant value(quint8 id) const;
     void setValue(quint8 id, const QVariant &value);
@@ -52,7 +52,7 @@ public:
     void save(QDataStream &stream) const;
 
 private:
-    Core::Id m_id;
+    Utils::Id m_id;
     QMap<quint8, QVariant> m_values;
 };
 
diff --git a/src/plugins/macros/macromanager.cpp b/src/plugins/macros/macromanager.cpp
index c221eb3512..59e87e17ee 100644
--- a/src/plugins/macros/macromanager.cpp
+++ b/src/plugins/macros/macromanager.cpp
@@ -41,7 +41,6 @@
 #include <coreplugin/actionmanager/actioncontainer.h>
 #include <coreplugin/actionmanager/command.h>
 #include <coreplugin/icore.h>
-#include <coreplugin/id.h>
 #include <coreplugin/icontext.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/editormanager/ieditor.h>
@@ -144,9 +143,9 @@ void MacroManagerPrivate::initialize()
     }
 }
 
-static Core::Id makeId(const QString &name)
+static Utils::Id makeId(const QString &name)
 {
-    return Core::Id(Macros::Constants::PREFIX_MACRO).withSuffix(name);
+    return Utils::Id(Macros::Constants::PREFIX_MACRO).withSuffix(name);
 }
 
 void MacroManagerPrivate::addMacro(Macro *macro)
diff --git a/src/plugins/macros/macrooptionswidget.cpp b/src/plugins/macros/macrooptionswidget.cpp
index 1d4b5716a8..9bade1fea5 100644
--- a/src/plugins/macros/macrooptionswidget.cpp
+++ b/src/plugins/macros/macrooptionswidget.cpp
@@ -33,7 +33,6 @@
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/command.h>
-#include <coreplugin/id.h>
 
 #include <QAction>
 #include <QDir>
@@ -85,7 +84,7 @@ void MacroOptionsWidget::initialize()
 void MacroOptionsWidget::createTable()
 {
     QDir dir(MacroManager::macrosDirectory());
-    const Core::Id base = Core::Id(Constants::PREFIX_MACRO);
+    const Utils::Id base = Utils::Id(Constants::PREFIX_MACRO);
     for (Macro *macro : MacroManager::macros()) {
         QFileInfo fileInfo(macro->fileName());
         if (fileInfo.absoluteDir() == dir.absolutePath()) {
diff --git a/src/plugins/macros/macrosplugin.cpp b/src/plugins/macros/macrosplugin.cpp
index bb8f086914..e4f634a7d0 100644
--- a/src/plugins/macros/macrosplugin.cpp
+++ b/src/plugins/macros/macrosplugin.cpp
@@ -37,7 +37,6 @@
 #include <coreplugin/actionmanager/actioncontainer.h>
 #include <coreplugin/actionmanager/command.h>
 #include <coreplugin/icore.h>
-#include <coreplugin/id.h>
 #include <coreplugin/icontext.h>
 
 #include <QSettings>
diff --git a/src/plugins/macros/texteditormacrohandler.cpp b/src/plugins/macros/texteditormacrohandler.cpp
index fac0796e7d..5d9d7cf39a 100644
--- a/src/plugins/macros/texteditormacrohandler.cpp
+++ b/src/plugins/macros/texteditormacrohandler.cpp
@@ -35,7 +35,6 @@
 #include <coreplugin/editormanager/ieditor.h>
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/command.h>
-#include <coreplugin/id.h>
 
 #include <QAction>
 #include <QKeyEvent>