From 2127f96f5f8c42ab031d70e83e40bee4119b0851 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@qt.io>
Date: Fri, 29 Jun 2018 13:48:37 +0200
Subject: [PATCH] CMake: Remove CMakeTool::addCMakeTool method

Change-Id: I9c6abb58711acc14ae78d79b6f077034389c0a6f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
---
 .../cmakeprojectmanager/cmaketoolmanager.cpp  | 24 +++++++------------
 .../cmakeprojectmanager/cmaketoolmanager.h    |  1 -
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/src/plugins/cmakeprojectmanager/cmaketoolmanager.cpp b/src/plugins/cmakeprojectmanager/cmaketoolmanager.cpp
index 794b3ac0cc4..19e3c7d5488 100644
--- a/src/plugins/cmakeprojectmanager/cmaketoolmanager.cpp
+++ b/src/plugins/cmakeprojectmanager/cmaketoolmanager.cpp
@@ -250,7 +250,7 @@ Id CMakeToolManager::registerOrFindCMakeTool(const FileName &command)
     cmake->setCMakeExecutable(command);
     cmake->setDisplayName(tr("CMake at %1").arg(command.toUserOutput()));
 
-    addCMakeTool(cmake);
+    QTC_ASSERT(registerCMakeTool(cmake), return Core::Id());
     return cmake->id();
 }
 
@@ -267,7 +267,14 @@ bool CMakeToolManager::registerCMakeTool(CMakeTool *tool)
             return false;
     }
 
-    addCMakeTool(tool);
+    d->m_cmakeTools.append(tool);
+
+    emit CMakeToolManager::m_instance->cmakeAdded(tool->id());
+
+    //set the first registered cmake tool as default if there is not already one
+    if (!d->m_defaultCMake.isValid())
+        CMakeToolManager::setDefaultCMakeTool(tool->id());
+
     return true;
 }
 
@@ -391,17 +398,4 @@ void CMakeToolManager::saveCMakeTools()
     d->m_writer->save(data, ICore::mainWindow());
 }
 
-void CMakeToolManager::addCMakeTool(CMakeTool *item)
-{
-    QTC_ASSERT(item->id().isValid(), return);
-
-    d->m_cmakeTools.append(item);
-
-    emit CMakeToolManager::m_instance->cmakeAdded(item->id());
-
-    //set the first registered cmake tool as default if there is not already one
-    if (!d->m_defaultCMake.isValid())
-        CMakeToolManager::setDefaultCMakeTool(item->id());
-}
-
 } // namespace CMakeProjectManager
diff --git a/src/plugins/cmakeprojectmanager/cmaketoolmanager.h b/src/plugins/cmakeprojectmanager/cmaketoolmanager.h
index 690109a3390..f3c4c92cd30 100644
--- a/src/plugins/cmakeprojectmanager/cmaketoolmanager.h
+++ b/src/plugins/cmakeprojectmanager/cmaketoolmanager.h
@@ -69,7 +69,6 @@ signals:
 
 private:
     static void saveCMakeTools();
-    static void addCMakeTool(CMakeTool *item);
 
     static CMakeToolManager *m_instance;
 };