From 430a33dcd9ac80ddb848e41f8f059102857c88aa 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
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
---
 src/plugins/cmakeprojectmanager/cmaketoolmanager.h | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'src/plugins/cmakeprojectmanager/cmaketoolmanager.h')

diff --git a/src/plugins/cmakeprojectmanager/cmaketoolmanager.h b/src/plugins/cmakeprojectmanager/cmaketoolmanager.h
index 7b3e3c4aa02..b84532b27e4 100644
--- a/src/plugins/cmakeprojectmanager/cmaketoolmanager.h
+++ b/src/plugins/cmakeprojectmanager/cmaketoolmanager.h
@@ -29,9 +29,8 @@
 
 #include "cmaketool.h"
 
-#include <coreplugin/id.h>
-
 #include <utils/fileutils.h>
+#include <utils/id.h>
 
 #include <QObject>
 
@@ -51,12 +50,12 @@ public:
     static QList<CMakeTool *> cmakeTools();
 
     static bool registerCMakeTool(std::unique_ptr<CMakeTool> &&tool);
-    static void deregisterCMakeTool(const Core::Id &id);
+    static void deregisterCMakeTool(const Utils::Id &id);
 
     static CMakeTool *defaultCMakeTool();
-    static void setDefaultCMakeTool(const Core::Id &id);
+    static void setDefaultCMakeTool(const Utils::Id &id);
     static CMakeTool *findByCommand(const Utils::FilePath &command);
-    static CMakeTool *findById(const Core::Id &id);
+    static CMakeTool *findById(const Utils::Id &id);
 
     static void notifyAboutUpdate(CMakeTool *);
     static void restoreCMakeTools();
@@ -64,9 +63,9 @@ public:
     static void updateDocumentation();
 
 signals:
-    void cmakeAdded (const Core::Id &id);
-    void cmakeRemoved (const Core::Id &id);
-    void cmakeUpdated (const Core::Id &id);
+    void cmakeAdded (const Utils::Id &id);
+    void cmakeRemoved (const Utils::Id &id);
+    void cmakeUpdated (const Utils::Id &id);
     void cmakeToolsChanged ();
     void cmakeToolsLoaded ();
     void defaultCMakeChanged ();
-- 
cgit v1.2.3