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

4
src/plugins/android/androidbuildapkstep.cpp
View File

@@ -125,7 +125,7 @@ private:
this);
};
AndroidBuildApkStep::AndroidBuildApkStep(BuildStepList *parent, Core::Id id)
AndroidBuildApkStep::AndroidBuildApkStep(BuildStepList *parent, Utils::Id id)
: AbstractProcessStep(parent, id),
m_buildTargetSdk(AndroidConfig::apiLevelNameFor(AndroidConfigurations::
sdkManager()->latestAndroidSdkPlatform()))
@@ -512,7 +512,7 @@ void AndroidBuildApkStep::setBuildTargetSdk(const QString &sdk)
m_buildTargetSdk = sdk;
}
QVariant AndroidBuildApkStep::data(Core::Id id) const
QVariant AndroidBuildApkStep::data(Utils::Id id) const
{
if (id == Constants::AndroidNdkPlatform) {
if (auto qtVersion = QtKitAspect::qtVersion(target()->kit()))

4
src/plugins/android/androidbuildapkstep.h
View File

@@ -43,7 +43,7 @@ class ANDROID_EXPORT AndroidBuildApkStep : public ProjectExplorer::AbstractProce
Q_OBJECT
public:
AndroidBuildApkStep(ProjectExplorer::BuildStepList *bc, Core::Id id);
AndroidBuildApkStep(ProjectExplorer::BuildStepList *bc, Utils::Id id);
bool fromMap(const QVariantMap &map) override;
QVariantMap toMap() const override;
@@ -74,7 +74,7 @@ public:
QString buildTargetSdk() const;
void setBuildTargetSdk(const QString &sdk);
QVariant data(Core::Id id) const override;
QVariant data(Utils::Id id) const override;
private:
void showInGraphicalShell();

20
src/plugins/android/androidconfigurations.cpp
View File

@@ -1188,7 +1188,7 @@ void AndroidConfigurations::registerNewToolChains()
{
const QList<ToolChain *> existingAndroidToolChains
= ToolChainManager::toolChains(Utils::equal(&ToolChain::typeId,
Core::Id(Constants::ANDROID_TOOLCHAIN_TYPEID)));
Utils::Id(Constants::ANDROID_TOOLCHAIN_TYPEID)));
QList<ToolChain *> newToolchains = AndroidToolChainFactory::autodetectToolChains(
existingAndroidToolChains);
@@ -1201,7 +1201,7 @@ void AndroidConfigurations::registerNewToolChains()
void AndroidConfigurations::registerCustomToolChainsAndDebuggers()
{
const QList<ToolChain *> existingAndroidToolChains = ToolChainManager::toolChains(
Utils::equal(&ToolChain::typeId, Core::Id(Constants::ANDROID_TOOLCHAIN_TYPEID)));
Utils::equal(&ToolChain::typeId, Utils::Id(Constants::ANDROID_TOOLCHAIN_TYPEID)));
QList<FilePath> customNdks = Utils::transform(currentConfig().getCustomNdkList(),
FilePath::fromString);
QList<ToolChain *> customToolchains
@@ -1240,7 +1240,7 @@ void AndroidConfigurations::registerCustomToolChainsAndDebuggers()
void AndroidConfigurations::removeOldToolChains()
{
foreach (ToolChain *tc, ToolChainManager::toolChains(Utils::equal(&ToolChain::typeId, Core::Id(Constants::ANDROID_TOOLCHAIN_TYPEID)))) {
foreach (ToolChain *tc, ToolChainManager::toolChains(Utils::equal(&ToolChain::typeId, Utils::Id(Constants::ANDROID_TOOLCHAIN_TYPEID)))) {
if (!tc->isValid())
ToolChainManager::deregisterToolChain(tc);
}
@@ -1343,9 +1343,9 @@ void AndroidConfigurations::updateAutomaticKitList()
}
const QList<Kit *> existingKits = Utils::filtered(KitManager::kits(), [](Kit *k) {
Core::Id deviceTypeId = DeviceTypeKitAspect::deviceTypeId(k);
Utils::Id deviceTypeId = DeviceTypeKitAspect::deviceTypeId(k);
if (k->isAutoDetected() && !k->isSdkProvided()
&& deviceTypeId == Core::Id(Constants::ANDROID_DEVICE_TYPE)) {
&& deviceTypeId == Utils::Id(Constants::ANDROID_DEVICE_TYPE)) {
if (!QtSupport::QtKitAspect::qtVersion(k))
KitManager::deregisterKit(k); // Remove autoDetected kits without Qt.
else
@@ -1369,7 +1369,7 @@ void AndroidConfigurations::updateAutomaticKitList()
}
DeviceManager *dm = DeviceManager::instance();
IDevice::ConstPtr device = dm->find(Core::Id(Constants::ANDROID_DEVICE_ID));
IDevice::ConstPtr device = dm->find(Utils::Id(Constants::ANDROID_DEVICE_ID));
if (device.isNull()) {
// no device, means no sdk path
for (Kit *k : existingKits)
@@ -1384,7 +1384,7 @@ void AndroidConfigurations::updateAutomaticKitList()
&& tc->typeId() == Constants::ANDROID_TOOLCHAIN_TYPEID;
});
for (ToolChain *tc : toolchains) {
if (tc->language() != Core::Id(ProjectExplorer::Constants::CXX_LANGUAGE_ID))
if (tc->language() != Utils::Id(ProjectExplorer::Constants::CXX_LANGUAGE_ID))
continue;
for (const QtSupport::BaseQtVersion *qt : qtVersionsForArch.value(tc->targetAbi())) {
@@ -1398,7 +1398,7 @@ void AndroidConfigurations::updateAutomaticKitList()
return tc->targetAbi() == otherTc->targetAbi() && tcNdk == otherNdk;
});
QHash<Core::Id, ToolChain *> toolChainForLanguage;
QHash<Utils::Id, ToolChain *> toolChainForLanguage;
for (ToolChain *tc : allLanguages)
toolChainForLanguage[tc->language()] = tc;
@@ -1414,7 +1414,7 @@ void AndroidConfigurations::updateAutomaticKitList()
const auto initializeKit = [allLanguages, device, tc, qt](Kit *k) {
k->setAutoDetected(true);
k->setAutoDetectionSource("AndroidConfiguration");
DeviceTypeKitAspect::setDeviceTypeId(k, Core::Id(Constants::ANDROID_DEVICE_TYPE));
DeviceTypeKitAspect::setDeviceTypeId(k, Utils::Id(Constants::ANDROID_DEVICE_TYPE));
for (ToolChain *tc : allLanguages)
ToolChainKitAspect::setToolChain(k, tc);
QtSupport::QtKitAspect::setQtVersion(k, qt);
@@ -1597,7 +1597,7 @@ void AndroidConfigurations::updateAndroidDevice()
if (m_instance->m_config.adbToolPath().exists())
devMgr->addDevice(AndroidDevice::create());
else if (devMgr->find(Constants::ANDROID_DEVICE_ID))
devMgr->removeDevice(Core::Id(Constants::ANDROID_DEVICE_ID));
devMgr->removeDevice(Utils::Id(Constants::ANDROID_DEVICE_ID));
}
AndroidConfigurations *AndroidConfigurations::m_instance = nullptr;

4
src/plugins/android/androiddeployqtstep.cpp
View File

@@ -137,7 +137,7 @@ public:
// AndroidDeployQtStep
AndroidDeployQtStep::AndroidDeployQtStep(BuildStepList *parent, Core::Id id)
AndroidDeployQtStep::AndroidDeployQtStep(BuildStepList *parent, Utils::Id id)
: BuildStep(parent, id)
{
setImmutable(true);
@@ -155,7 +155,7 @@ AndroidDeployQtStep::AndroidDeployQtStep(BuildStepList *parent, Core::Id id)
this, &AndroidDeployQtStep::slotSetSerialNumber);
}
Core::Id AndroidDeployQtStep::stepId()
Utils::Id AndroidDeployQtStep::stepId()
{
return "Qt4ProjectManager.AndroidDeployQtStep";
}

6
src/plugins/android/androiddeployqtstep.h
View File

@@ -65,9 +65,9 @@ public:
ForceUnintall
};
AndroidDeployQtStep(ProjectExplorer::BuildStepList *bc, Core::Id id);
AndroidDeployQtStep(ProjectExplorer::BuildStepList *bc, Utils::Id id);
static Core::Id stepId();
static Utils::Id stepId();
bool fromMap(const QVariantMap &map) override;
QVariantMap toMap() const override;
@@ -116,7 +116,7 @@ private:
bool m_uninstallPreviousPackageRun = false;
bool m_useAndroiddeployqt = false;
bool m_askForUninstall = false;
static const Core::Id Id;
static const Utils::Id Id;
Utils::CommandLine m_androiddeployqtArgs;
Utils::FilePath m_adbPath;
Utils::FilePath m_command;

1
src/plugins/android/androidmanifesteditorfactory.cpp
View File

@@ -28,7 +28,6 @@
#include "androidmanifesteditorwidget.h"
#include "androidmanifesteditor.h"
#include <coreplugin/id.h>
#include <texteditor/texteditorsettings.h>
using namespace Android;

4
src/plugins/android/androidmanifesteditorwidget.cpp
View File

@@ -750,7 +750,7 @@ static const char kServicesInvalid[] = "AndroidServiceDefinitionInvalid";
void AndroidManifestEditorWidget::setInvalidServiceInfo()
{
Core::Id id(kServicesInvalid);
Utils::Id id(kServicesInvalid);
if (m_textEditorWidget->textDocument()->infoBar()->containsInfo(id))
return;
Utils::InfoBarEntry info(id,
@@ -762,7 +762,7 @@ void AndroidManifestEditorWidget::setInvalidServiceInfo()
void AndroidManifestEditorWidget::clearInvalidServiceInfo()
{
m_textEditorWidget->textDocument()->infoBar()->removeInfo(Core::Id(kServicesInvalid));
m_textEditorWidget->textDocument()->infoBar()->removeInfo(Utils::Id(kServicesInvalid));
}
void setApiLevel(QComboBox *box, const QDomElement &element, const QString &attribute)

4
src/plugins/android/androidpackageinstallationstep.cpp
View File

@@ -54,7 +54,7 @@ class AndroidPackageInstallationStep final : public AbstractProcessStep
Q_DECLARE_TR_FUNCTIONS(Android::AndroidPackageInstallationStep)
public:
AndroidPackageInstallationStep(BuildStepList *bsl, Core::Id id);
AndroidPackageInstallationStep(BuildStepList *bsl, Utils::Id id);
BuildStepConfigWidget *createConfigWidget() final;
@@ -82,7 +82,7 @@ public:
}
};
AndroidPackageInstallationStep::AndroidPackageInstallationStep(BuildStepList *bsl, Core::Id id)
AndroidPackageInstallationStep::AndroidPackageInstallationStep(BuildStepList *bsl, Utils::Id id)
: AbstractProcessStep(bsl, id)
{
const QString name = tr("Copy application data");

8
src/plugins/android/androidpotentialkit.cpp
View File

@@ -68,9 +68,9 @@ bool AndroidPotentialKit::isEnabled() const
{
QList<ProjectExplorer::Kit *> kits = ProjectExplorer::KitManager::kits();
foreach (ProjectExplorer::Kit *kit, kits) {
Core::Id deviceId = ProjectExplorer::DeviceKitAspect::deviceId(kit);
Utils::Id deviceId = ProjectExplorer::DeviceKitAspect::deviceId(kit);
if (kit->isAutoDetected()
&& deviceId == Core::Id(Constants::ANDROID_DEVICE_ID)
&& deviceId == Utils::Id(Constants::ANDROID_DEVICE_ID)
&& !kit->isSdkProvided()) {
return false;
}
@@ -120,9 +120,9 @@ void AndroidPotentialKitWidget::recheck()
{
QList<ProjectExplorer::Kit *> kits = ProjectExplorer::KitManager::kits();
foreach (ProjectExplorer::Kit *kit, kits) {
Core::Id deviceId = ProjectExplorer::DeviceKitAspect::deviceId(kit);
Utils::Id deviceId = ProjectExplorer::DeviceKitAspect::deviceId(kit);
if (kit->isAutoDetected()
&& deviceId == Core::Id(Constants::ANDROID_DEVICE_ID)
&& deviceId == Utils::Id(Constants::ANDROID_DEVICE_ID)
&& !kit->isSdkProvided()) {
setVisible(false);
return;

6
src/plugins/android/androidqtversion.cpp
View File

@@ -182,16 +182,16 @@ void AndroidQtVersion::parseMkSpec(ProFileEvaluator *evaluator) const
BaseQtVersion::parseMkSpec(evaluator);
}
QSet<Core::Id> AndroidQtVersion::availableFeatures() const
QSet<Utils::Id> AndroidQtVersion::availableFeatures() const
{
QSet<Core::Id> features = QtSupport::BaseQtVersion::availableFeatures();
QSet<Utils::Id> features = QtSupport::BaseQtVersion::availableFeatures();
features.insert(QtSupport::Constants::FEATURE_MOBILE);
features.remove(QtSupport::Constants::FEATURE_QT_CONSOLE);
features.remove(QtSupport::Constants::FEATURE_QT_WEBKIT);
return features;
}
QSet<Core::Id> AndroidQtVersion::targetDeviceTypes() const
QSet<Utils::Id> AndroidQtVersion::targetDeviceTypes() const
{
return {Constants::ANDROID_DEVICE_TYPE};
}

4
src/plugins/android/androidqtversion.h
View File

@@ -48,8 +48,8 @@ public:
void addToEnvironment(const ProjectExplorer::Kit *k, Utils::Environment &env) const override;
Utils::Environment qmakeRunEnvironment() const override;
QSet<Core::Id> availableFeatures() const override;
QSet<Core::Id> targetDeviceTypes() const override;
QSet<Utils::Id> availableFeatures() const override;
QSet<Utils::Id> targetDeviceTypes() const override;
QString description() const override;
const QStringList &androidAbis() const;

4
src/plugins/android/androidrunconfiguration.cpp
View File

@@ -55,7 +55,7 @@ using namespace Utils;
namespace Android {
BaseStringListAspect::BaseStringListAspect(const QString &settingsKey, Core::Id id)
BaseStringListAspect::BaseStringListAspect(const QString &settingsKey, Utils::Id id)
{
setSettingsKey(settingsKey);
setId(id);
@@ -104,7 +104,7 @@ void BaseStringListAspect::setLabel(const QString &label)
}
AndroidRunConfiguration::AndroidRunConfiguration(Target *target, Core::Id id)
AndroidRunConfiguration::AndroidRunConfiguration(Target *target, Utils::Id id)
: RunConfiguration(target, id)
{
auto envAspect = addAspect<EnvironmentAspect>();

4
src/plugins/android/androidrunconfiguration.h
View File

@@ -40,7 +40,7 @@ class BaseStringListAspect : public ProjectExplorer::ProjectConfigurationAspect
public:
explicit BaseStringListAspect(const QString &settingsKey = QString(),
Core::Id id = Core::Id());
Utils::Id id = Utils::Id());
~BaseStringListAspect() override;
void addToLayout(ProjectExplorer::LayoutBuilder &builder) override;
@@ -66,7 +66,7 @@ class ANDROID_EXPORT AndroidRunConfiguration : public ProjectExplorer::RunConfig
{
Q_OBJECT
public:
explicit AndroidRunConfiguration(ProjectExplorer::Target *target, Core::Id id);
explicit AndroidRunConfiguration(ProjectExplorer::Target *target, Utils::Id id);
};
} // namespace Android

2
src/plugins/android/androidrunnerworker.cpp
View File

@@ -249,7 +249,7 @@ AndroidRunnerWorker::AndroidRunnerWorker(RunWorker *runner, const QString &packa
m_useLldb = Debugger::DebuggerKitAspect::engineType(runControl->kit())
== Debugger::LldbEngineType;
auto aspect = runControl->aspect<Debugger::DebuggerRunConfigurationAspect>();
Core::Id runMode = runControl->runMode();
Utils::Id runMode = runControl->runMode();
const bool debuggingMode = runMode == ProjectExplorer::Constants::DEBUG_RUN_MODE;
m_useCppDebugger = debuggingMode && aspect->useCppDebugger();
if (debuggingMode && aspect->useQmlDebugger())

6
src/plugins/android/androidtoolchain.cpp
View File

@@ -57,10 +57,10 @@ static const QHash<QString, Abi> ClangTargets = {
{"aarch64-linux-android",
Abi(Abi::ArmArchitecture, Abi::LinuxOS, Abi::AndroidLinuxFlavor, Abi::ElfFormat, 64)}};
static const QList<Core::Id> LanguageIds = {ProjectExplorer::Constants::CXX_LANGUAGE_ID,
static const QList<Utils::Id> LanguageIds = {ProjectExplorer::Constants::CXX_LANGUAGE_ID,
ProjectExplorer::Constants::C_LANGUAGE_ID};
static ToolChain *findToolChain(Utils::FilePath &compilerPath, Core::Id lang, const QString &target,
static ToolChain *findToolChain(Utils::FilePath &compilerPath, Utils::Id lang, const QString &target,
const ToolChainList &alreadyKnown)
{
ToolChain * tc = Utils::findOrDefault(alreadyKnown, [target, compilerPath, lang](ToolChain *tc) {
@@ -216,7 +216,7 @@ ToolChainList AndroidToolChainFactory::autodetectToolChainsFromNdks(
continue;
}
for (const Core::Id &lang : LanguageIds) {
for (const Utils::Id &lang : LanguageIds) {
FilePath compilerCommand = clangPath;
if (lang == ProjectExplorer::Constants::CXX_LANGUAGE_ID)
compilerCommand = clangPlusPlusPath(clangPath);

2
src/plugins/android/androidtoolchain.h
View File

@@ -70,7 +70,7 @@ public:
class AndroidToolChainInformation
{
public:
Core::Id language;
Utils::Id language;
Utils::FilePath compilerCommand;
ProjectExplorer::Abi abi;
QString version;