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

2
src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
View File

@@ -81,7 +81,7 @@ static QString extractToolchainPrefix(QString *compilerName)
static QString targetPlatform(const ProjectExplorer::Abi &abi, const ProjectExplorer::Kit *k)
{
const Core::Id device = ProjectExplorer::DeviceTypeKitAspect::deviceTypeId(k);
const Utils::Id device = ProjectExplorer::DeviceTypeKitAspect::deviceTypeId(k);
switch (abi.os()) {
case ProjectExplorer::Abi::WindowsOS:
return QLatin1String("windows");

2
src/plugins/qbsprojectmanager/qbskitinformation.cpp
View File

@@ -101,7 +101,7 @@ void QbsKitAspect::setProperties(Kit *kit, const QVariantMap &properties)
kit->setValue(id(), properties);
}
Core::Id QbsKitAspect::id()
Utils::Id QbsKitAspect::id()
{
return "Qbs.KitInformation";
}

2
src/plugins/qbsprojectmanager/qbskitinformation.h
View File

@@ -42,7 +42,7 @@ public:
static void setProperties(ProjectExplorer::Kit *kit, const QVariantMap &properties);
private:
static Core::Id id();
static Utils::Id id();
ProjectExplorer::Tasks validate(const ProjectExplorer::Kit *) const override;
ItemList toUserOutput(const ProjectExplorer::Kit *) const override;

4
src/plugins/qbsprojectmanager/qbsnodes.h
View File

@@ -47,7 +47,7 @@ public:
private:
friend class QbsBuildSystem;
AddNewInformation addNewInformation(const QStringList &files, Node *context) const override;
QVariant data(Core::Id role) const override;
QVariant data(Utils::Id role) const override;
const QJsonObject m_groupData;
};
@@ -67,7 +67,7 @@ public:
const QJsonObject productData() const { return m_productData; }
QJsonObject mainGroup() const;
QVariant data(Core::Id role) const override;
QVariant data(Utils::Id role) const override;
private:
const QJsonObject m_productData;