feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CMake: Simplify code

Browse Source 
Emit signal in addCMakeTool method directly instead of later.

Change-Id: I4640ffdf76d22f80a8c1ee14f8d79cc7885ddd70
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Tobias Hunger
2018-05-29 15:52:03 +02:00
parent bef6d49adc
commit 73f617ab34
2 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/plugins/cmakeprojectmanager/cmaketoolmanager.cpp
View File

@@ -58,17 +58,6 @@ public:
};
static CMakeToolManagerPrivate *d = nullptr;
static void addCMakeTool(CMakeTool *item)
{
QTC_ASSERT(item->id().isValid(), return);
d->m_cmakeTools.append(item);
//set the first registered cmake tool as default if there is not already one
if (!d->m_defaultCMake.isValid())
CMakeToolManager::setDefaultCMakeTool(item->id());
}
static FileName userSettingsFileName()
{
return FileName::fromString(ICore::userResourcePath() + CMAKETOOL_FILENAME);
@@ -243,7 +232,6 @@ Id CMakeToolManager::registerOrFindCMakeTool(const FileName &command)
cmake->setDisplayName(tr("CMake at %1").arg(command.toUserOutput()));
addCMakeTool(cmake);
emit m_instance->cmakeAdded(cmake->id());
return cmake->id();
}
@@ -261,7 +249,6 @@ bool CMakeToolManager::registerCMakeTool(CMakeTool *tool)
}
addCMakeTool(tool);
emit m_instance->cmakeAdded(tool->id());
return true;
}
@@ -423,4 +410,17 @@ 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