From e1c88116b397ecac2ef0f0678a419790a3e40402 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Fri, 26 Jun 2020 13:59:38 +0200
Subject: 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>
---
 src/plugins/cvs/cvsplugin.cpp | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'src/plugins/cvs')

diff --git a/src/plugins/cvs/cvsplugin.cpp b/src/plugins/cvs/cvsplugin.cpp
index 9b2cad8cf9..0bfd311f12 100644
--- a/src/plugins/cvs/cvsplugin.cpp
+++ b/src/plugins/cvs/cvsplugin.cpp
@@ -56,7 +56,6 @@
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/actioncontainer.h>
 #include <coreplugin/actionmanager/command.h>
-#include <coreplugin/id.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/locator/commandlocator.h>
 #include <coreplugin/vcsmanager.h>
@@ -214,13 +213,13 @@ public:
         return Utils::defaultExitCodeInterpreter;
     }
 
-    Core::Id vcsEditorKind(VcsCommandTag cmd) const override
+    Utils::Id vcsEditorKind(VcsCommandTag cmd) const override
     {
         switch (cmd) {
         case DiffCommand:
             return "CVS Diff Editor"; // TODO: replace by string from cvsconstants.h
         default:
-            return Core::Id();
+            return Utils::Id();
         }
     }
 };
@@ -235,7 +234,7 @@ public:
 
     // IVersionControl
     QString displayName() const final { return QLatin1String("cvs"); }
-    Core::Id id() const final;
+    Utils::Id id() const final;
 
     bool isVcsFileOrDirectory(const Utils::FilePath &fileName) const final;
 
@@ -305,7 +304,7 @@ private:
 
     bool isCommitEditorOpen() const;
     Core::IEditor *showOutputInEditor(const QString& title, const QString &output,
-                                      Core::Id id, const QString &source,
+                                      Utils::Id id, const QString &source,
                                       QTextCodec *codec);
 
     CvsResponse runCvs(const QString &workingDirectory,
@@ -401,9 +400,9 @@ public:
     };
 };
 
-Core::Id CvsPluginPrivate::id() const
+Utils::Id CvsPluginPrivate::id() const
 {
-    return Core::Id(VcsBase::Constants::VCS_ID_CVS);
+    return Utils::Id(VcsBase::Constants::VCS_ID_CVS);
 }
 
 bool CvsPluginPrivate::isVcsFileOrDirectory(const Utils::FilePath &fileName) const
@@ -1471,7 +1470,7 @@ CvsResponse CvsPluginPrivate::runCvs(const QString &workingDirectory,
 }
 
 IEditor *CvsPluginPrivate::showOutputInEditor(const QString& title, const QString &output,
-                                              Core::Id id, const QString &source,
+                                              Utils::Id id, const QString &source,
                                               QTextCodec *codec)
 {
     QString s = title;
-- 
cgit v1.2.3