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 <[email protected]>

6 files changed, 16 insertions, 20 deletions

diff --git a/src/plugins/git/changeselectiondialog.cpp b/src/plugins/git/changeselectiondialog.cpp
index 9872112bdf7..7e797783964 100644
--- a/src/plugins/git/changeselectiondialog.cpp
+++ b/src/plugins/git/changeselectiondialog.cpp
@@ -52,7 +52,7 @@ using namespace Utils;
 namespace Git {
 namespace Internal {
 
-ChangeSelectionDialog::ChangeSelectionDialog(const QString &workingDirectory, Core::Id id,
+ChangeSelectionDialog::ChangeSelectionDialog(const QString &workingDirectory, Utils::Id id,
                                              QWidget *parent) :
     QDialog(parent), m_ui(new Ui::ChangeSelectionDialog)
 {
diff --git a/src/plugins/git/changeselectiondialog.h b/src/plugins/git/changeselectiondialog.h
index b7714cece6e..d49cc18b222 100644
--- a/src/plugins/git/changeselectiondialog.h
+++ b/src/plugins/git/changeselectiondialog.h
@@ -25,9 +25,8 @@
 
 #pragma once
 
-#include <coreplugin/id.h>
-
 #include <utils/fileutils.h>
+#include <utils/id.h>
 
 #include <QDialog>
 #include <QProcessEnvironment>
@@ -55,7 +54,7 @@ class ChangeSelectionDialog : public QDialog
 {
     Q_OBJECT
 public:
-    ChangeSelectionDialog(const QString &workingDirectory, Core::Id id, QWidget *parent);
+    ChangeSelectionDialog(const QString &workingDirectory, Utils::Id id, QWidget *parent);
     ~ChangeSelectionDialog() override;
 
     QString change() const;
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index 253b9d7473b..70f34604ae3 100644
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -38,7 +38,6 @@
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/icore.h>
-#include <coreplugin/id.h>
 #include <coreplugin/idocument.h>
 #include <coreplugin/iversioncontrol.h>
 #include <coreplugin/vcsmanager.h>
diff --git a/src/plugins/git/giteditor.cpp b/src/plugins/git/giteditor.cpp
index fc6b74d358f..940945d3be6 100644
--- a/src/plugins/git/giteditor.cpp
+++ b/src/plugins/git/giteditor.cpp
@@ -262,7 +262,7 @@ void GitEditorWidget::applyDiffChunk(const DiffChunk& chunk, bool revert)
 void GitEditorWidget::init()
 {
     VcsBaseEditorWidget::init();
-    Core::Id editorId = textDocument()->id();
+    Utils::Id editorId = textDocument()->id();
     if (editorId == Git::Constants::GIT_COMMIT_TEXT_EDITOR_ID)
         textDocument()->setSyntaxHighlighter(new GitSubmitHighlighter);
     else if (editorId == Git::Constants::GIT_REBASE_EDITOR_ID)
@@ -287,7 +287,7 @@ void GitEditorWidget::addDiffActions(QMenu *menu, const DiffChunk &chunk)
 void GitEditorWidget::aboutToOpen(const QString &fileName, const QString &realFileName)
 {
     Q_UNUSED(realFileName)
-    Core::Id editorId = textDocument()->id();
+    Utils::Id editorId = textDocument()->id();
     if (editorId == Git::Constants::GIT_COMMIT_TEXT_EDITOR_ID
             || editorId == Git::Constants::GIT_REBASE_EDITOR_ID) {
         QFileInfo fi(fileName);
diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp
index 6a17e89f088..aa1d36d13b9 100644
--- a/src/plugins/git/gitplugin.cpp
+++ b/src/plugins/git/gitplugin.cpp
@@ -48,7 +48,6 @@
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/actioncontainer.h>
 #include <coreplugin/actionmanager/command.h>
-#include <coreplugin/id.h>
 #include <coreplugin/idocument.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/editormanager/ieditor.h>
@@ -234,7 +233,7 @@ public:
 
     // IVersionControl
     QString displayName() const final;
-    Core::Id id() const final;
+    Utils::Id id() const final;
 
     bool isVcsFileOrDirectory(const Utils::FilePath &fileName) const final;
 
@@ -308,7 +307,7 @@ public:
     void resetRepository();
     void recoverDeletedFiles();
     void startRebase();
-    void startChangeRelatedAction(const Core::Id &id);
+    void startChangeRelatedAction(const Utils::Id &id);
     void stageFile();
     void unstageFile();
     void gitkForCurrentFile();
@@ -335,37 +334,37 @@ public:
     void updateContinueAndAbortCommands();
     void delayedPushToGerrit();
 
-    Core::Command *createCommand(QAction *action, Core::ActionContainer *ac, Core::Id id,
+    Core::Command *createCommand(QAction *action, Core::ActionContainer *ac, Utils::Id id,
                                  const Core::Context &context, bool addToLocator,
                                  const std::function<void()> &callback, const QKeySequence &keys);
 
     Utils::ParameterAction *createParameterAction(Core::ActionContainer *ac,
                                                   const QString &defaultText, const QString &parameterText,
-                                                  Core::Id id, const Core::Context &context, bool addToLocator,
+                                                  Utils::Id id, const Core::Context &context, bool addToLocator,
                                                   const std::function<void()> &callback,
                                                   const QKeySequence &keys = QKeySequence());
 
     QAction *createFileAction(Core::ActionContainer *ac,
                               const QString &defaultText, const QString &parameterText,
-                              Core::Id id, const Core::Context &context, bool addToLocator,
+                              Utils::Id id, const Core::Context &context, bool addToLocator,
                               const std::function<void()> &callback,
                               const QKeySequence &keys = QKeySequence());
 
     QAction *createProjectAction(Core::ActionContainer *ac,
                                  const QString &defaultText, const QString &parameterText,
-                                 Core::Id id, const Core::Context &context, bool addToLocator,
+                                 Utils::Id id, const Core::Context &context, bool addToLocator,
                                  void (GitPluginPrivate::*func)(),
                                  const QKeySequence &keys = QKeySequence());
 
-    QAction *createRepositoryAction(Core::ActionContainer *ac, const QString &text, Core::Id id,
+    QAction *createRepositoryAction(Core::ActionContainer *ac, const QString &text, Utils::Id id,
                                     const Core::Context &context, bool addToLocator,
                                     const std::function<void()> &callback,
                                     const QKeySequence &keys = QKeySequence());
-    QAction *createRepositoryAction(Core::ActionContainer *ac, const QString &text, Core::Id id,
+    QAction *createRepositoryAction(Core::ActionContainer *ac, const QString &text, Utils::Id id,
                                     const Core::Context &context, bool addToLocator,
                                     GitClientMemberFunc, const QKeySequence &keys = QKeySequence());
 
-    QAction *createChangeRelatedRepositoryAction(const QString &text, Core::Id id,
+    QAction *createChangeRelatedRepositoryAction(const QString &text, Utils::Id id,
                                                  const Core::Context &context);
 
     void updateRepositoryBrowserAction();
@@ -1812,9 +1811,9 @@ QString GitPluginPrivate::displayName() const
     return QLatin1String("Git");
 }
 
-Core::Id GitPluginPrivate::id() const
+Utils::Id GitPluginPrivate::id() const
 {
-    return Core::Id(VcsBase::Constants::VCS_ID_GIT);
+    return Utils::Id(VcsBase::Constants::VCS_ID_GIT);
 }
 
 bool GitPluginPrivate::isVcsFileOrDirectory(const Utils::FilePath &fileName) const
diff --git a/src/plugins/git/gitplugin.h b/src/plugins/git/gitplugin.h
index 6bd13532c7d..8275006787d 100644
--- a/src/plugins/git/gitplugin.h
+++ b/src/plugins/git/gitplugin.h
@@ -27,7 +27,6 @@
 
 #include "gitsettings.h"
 
-#include <coreplugin/id.h>
 #include <coreplugin/iversioncontrol.h>
 
 #include <extensionsystem/iplugin.h>