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
(cherry picked from commit 430a33dcd9)
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2020-06-26 13:59:38 +02:00
parent c9eedbe0f3
commit e1c88116b3
655 changed files with 2115 additions and 2093 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/mcusupport/mcusupportoptions.cpp
View File

@@ -235,7 +235,7 @@ McuToolChainPackage::Type McuToolChainPackage::type() const
return m_type;
}
static ProjectExplorer::ToolChain *desktopToolChain(Core::Id language)
static ProjectExplorer::ToolChain *desktopToolChain(Utils::Id language)
{
using namespace ProjectExplorer;
@@ -251,7 +251,7 @@ static ProjectExplorer::ToolChain *desktopToolChain(Core::Id language)
return toolChain;
}
static ProjectExplorer::ToolChain* armGccToolChain(const Utils::FilePath &path, Core::Id language)
static ProjectExplorer::ToolChain* armGccToolChain(const Utils::FilePath &path, Utils::Id language)
{
using namespace ProjectExplorer;
@@ -277,7 +277,7 @@ static ProjectExplorer::ToolChain* armGccToolChain(const Utils::FilePath &path,
return toolChain;
}
ProjectExplorer::ToolChain *McuToolChainPackage::toolChain(Core::Id language) const
ProjectExplorer::ToolChain *McuToolChainPackage::toolChain(Utils::Id language) const
{
ProjectExplorer::ToolChain *tc = nullptr;
if (m_type == TypeDesktop) {
@@ -500,7 +500,7 @@ static void setKitProperties(const QString &kitName, ProjectExplorer::Kit *k,
k->makeSticky();
if (mcuTarget->toolChainPackage()->type() == McuToolChainPackage::TypeDesktop)
k->setDeviceTypeForIcon(DEVICE_TYPE);
QSet<Core::Id> irrelevant = {
QSet<Utils::Id> irrelevant = {
SysRootKitAspect::id(),
QtSupport::QtKitAspect::id()
};