CMake: Remove CMakeTool::addCMakeTool method

Change-Id: I9c6abb58711acc14ae78d79b6f077034389c0a6f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Tobias Hunger
2018-06-29 13:48:37 +02:00
parent c08aab7b96
commit 2127f96f5f
2 changed files with 9 additions and 16 deletions

View File

@@ -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

View File

@@ -69,7 +69,6 @@ signals:
private:
static void saveCMakeTools();
static void addCMakeTool(CMakeTool *item);
static CMakeToolManager *m_instance;
};