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

Core/Utils: Migrate further to Utils::Id

Browse Source 
The coreplugin/id.h header is kept for downstream for now.

Change-Id: I8c44590f7b988b3770ecdc177c40783e12353e66
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2020-06-26 13:59:38 +02:00
parent 4924392620
commit 430a33dcd9
655 changed files with 2115 additions and 2093 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,6 +34,7 @@
#include <utils/qtcassert.h>
using namespace Core;
using namespace Utils;
namespace CMakeProjectManager {
@@ -90,7 +91,7 @@ bool CMakeToolManager::registerCMakeTool(std::unique_ptr<CMakeTool> &&tool)
if (!tool || Utils::contains(d->m_cmakeTools, tool.get()))
return true;
const Core::Id toolId = tool->id();
const Utils::Id toolId = tool->id();
QTC_ASSERT(toolId.isValid(),return false);
//make sure the same id was not used before
@@ -184,9 +185,9 @@ void CMakeToolManager::saveCMakeTools()
void CMakeToolManager::ensureDefaultCMakeToolIsValid()
{
const Core::Id oldId = d->m_defaultCMake;
const Utils::Id oldId = d->m_defaultCMake;
if (d->m_cmakeTools.size() == 0) {
d->m_defaultCMake = Core::Id();
d->m_defaultCMake = Utils::Id();
} else {
if (findById(d->m_defaultCMake))
return;