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>

8 files changed, 15 insertions, 13 deletions

diff --git a/src/plugins/diffeditor/diffeditor.cpp b/src/plugins/diffeditor/diffeditor.cpp
index 52499aa4b2..f303c22e70 100644
--- a/src/plugins/diffeditor/diffeditor.cpp
+++ b/src/plugins/diffeditor/diffeditor.cpp
@@ -257,7 +257,7 @@ Core::IEditor *DiffEditor::duplicate()
     editor->m_sync = m_sync;
     editor->m_showDescription = m_showDescription;
 
-    Core::Id id = currentView()->id();
+    Utils::Id id = currentView()->id();
     IDiffView *view = Utils::findOr(editor->m_views, editor->m_views.at(0),
                                     Utils::equal(&IDiffView::id, id));
     QTC_ASSERT(view, view = editor->currentView());
@@ -523,7 +523,7 @@ IDiffView *DiffEditor::loadSettings()
     m_sync = s->value(horizontalScrollBarSynchronizationKeyC, true).toBool();
     m_document->setIgnoreWhitespace(s->value(ignoreWhitespaceKeyC, false).toBool());
     m_document->setContextLineCount(s->value(contextLineCountKeyC, 3).toInt());
-    Core::Id id = Core::Id::fromSetting(s->value(diffViewKeyC));
+    Utils::Id id = Utils::Id::fromSetting(s->value(diffViewKeyC));
     s->endGroup();
 
     IDiffView *view = Utils::findOr(m_views, m_views.at(0),
diff --git a/src/plugins/diffeditor/diffeditorfactory.cpp b/src/plugins/diffeditor/diffeditorfactory.cpp
index 46c79df29d..c88ff3b576 100644
--- a/src/plugins/diffeditor/diffeditorfactory.cpp
+++ b/src/plugins/diffeditor/diffeditorfactory.cpp
@@ -35,6 +35,7 @@
 
 using namespace Core;
 using namespace TextEditor;
+using namespace Utils;
 
 namespace DiffEditor {
 namespace Internal {
@@ -60,7 +61,7 @@ DiffEditorFactory::DiffEditorFactory() :
     },
     rightHandler {
         Constants::DIFF_EDITOR_ID,
-        Core::Id(Constants::SIDE_BY_SIDE_VIEW_ID).withSuffix(2),
+        Utils::Id(Constants::SIDE_BY_SIDE_VIEW_ID).withSuffix(2),
         TextEditorActionHandler::None,
         [](Core::IEditor *e) { return static_cast<DiffEditor *>(e)->rightEditorWidget(); }
     }
diff --git a/src/plugins/diffeditor/diffeditorwidgetcontroller.cpp b/src/plugins/diffeditor/diffeditorwidgetcontroller.cpp
index 253bf67a61..a5757f42d2 100644
--- a/src/plugins/diffeditor/diffeditorwidgetcontroller.cpp
+++ b/src/plugins/diffeditor/diffeditorwidgetcontroller.cpp
@@ -51,6 +51,7 @@
 
 using namespace Core;
 using namespace TextEditor;
+using namespace Utils;
 
 namespace DiffEditor {
 namespace Internal {
diff --git a/src/plugins/diffeditor/diffview.cpp b/src/plugins/diffeditor/diffview.cpp
index 7c7086f52d..1b68399e4d 100644
--- a/src/plugins/diffeditor/diffview.cpp
+++ b/src/plugins/diffeditor/diffview.cpp
@@ -61,7 +61,7 @@ QString IDiffView::syncToolTip() const
     return m_syncToolTip;
 }
 
-Core::Id IDiffView::id() const
+Utils::Id IDiffView::id() const
 {
     return m_id;
 }
@@ -76,7 +76,7 @@ void IDiffView::setToolTip(const QString &toolTip)
     m_toolTip = toolTip;
 }
 
-void IDiffView::setId(const Core::Id &id)
+void IDiffView::setId(const Utils::Id &id)
 {
     m_id = id;
 }
diff --git a/src/plugins/diffeditor/diffview.h b/src/plugins/diffeditor/diffview.h
index 1f760d82c4..417e654ba4 100644
--- a/src/plugins/diffeditor/diffview.h
+++ b/src/plugins/diffeditor/diffview.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include <coreplugin/id.h>
+#include <utils/id.h>
 
 #include <QIcon>
 #include <QString>
@@ -57,7 +57,7 @@ public:
     bool supportsSync() const;
     QString syncToolTip() const;
 
-    Core::Id id() const;
+    Utils::Id id() const;
     virtual QWidget *widget() = 0;
     virtual void setDocument(DiffEditorDocument *document) = 0;
 
@@ -74,14 +74,14 @@ signals:
 protected:
     void setIcon(const QIcon &icon);
     void setToolTip(const QString &toolTip);
-    void setId(const Core::Id &id);
+    void setId(const Utils::Id &id);
     void setSupportsSync(bool sync);
     void setSyncToolTip(const QString &text);
 
 private:
     QIcon m_icon;
     QString m_toolTip;
-    Core::Id m_id;
+    Utils::Id m_id;
     bool m_supportsSync = false;
     QString m_syncToolTip;
 };
diff --git a/src/plugins/diffeditor/selectabletexteditorwidget.cpp b/src/plugins/diffeditor/selectabletexteditorwidget.cpp
index 5d35b06e56..bffedaf75c 100644
--- a/src/plugins/diffeditor/selectabletexteditorwidget.cpp
+++ b/src/plugins/diffeditor/selectabletexteditorwidget.cpp
@@ -33,7 +33,7 @@
 namespace DiffEditor {
 namespace Internal {
 
-SelectableTextEditorWidget::SelectableTextEditorWidget(Core::Id id, QWidget *parent)
+SelectableTextEditorWidget::SelectableTextEditorWidget(Utils::Id id, QWidget *parent)
     : TextEditorWidget(parent)
 {
     setFrameStyle(QFrame::NoFrame);
diff --git a/src/plugins/diffeditor/selectabletexteditorwidget.h b/src/plugins/diffeditor/selectabletexteditorwidget.h
index 7059177f64..0f9a1791e3 100644
--- a/src/plugins/diffeditor/selectabletexteditorwidget.h
+++ b/src/plugins/diffeditor/selectabletexteditorwidget.h
@@ -46,7 +46,7 @@ class SelectableTextEditorWidget : public TextEditor::TextEditorWidget
 {
     Q_OBJECT
 public:
-    SelectableTextEditorWidget(Core::Id id, QWidget *parent = nullptr);
+    SelectableTextEditorWidget(Utils::Id id, QWidget *parent = nullptr);
     ~SelectableTextEditorWidget() override;
     void setSelections(const QMap<int, QList<DiffSelection> > &selections);
 
diff --git a/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp b/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp
index 584e065300..d9b593befa 100644
--- a/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp
+++ b/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp
@@ -804,11 +804,11 @@ SideBySideDiffEditorWidget::SideBySideDiffEditorWidget(QWidget *parent)
 
     auto leftContext = new IContext(this);
     leftContext->setWidget(m_leftEditor);
-    leftContext->setContext(Core::Context(Core::Id(Constants::SIDE_BY_SIDE_VIEW_ID).withSuffix(1)));
+    leftContext->setContext(Core::Context(Utils::Id(Constants::SIDE_BY_SIDE_VIEW_ID).withSuffix(1)));
     Core::ICore::addContextObject(leftContext);
     auto rightContext = new IContext(this);
     rightContext->setWidget(m_rightEditor);
-    rightContext->setContext(Core::Context(Core::Id(Constants::SIDE_BY_SIDE_VIEW_ID).withSuffix(2)));
+    rightContext->setContext(Core::Context(Utils::Id(Constants::SIDE_BY_SIDE_VIEW_ID).withSuffix(2)));
     Core::ICore::addContextObject(rightContext);
 }