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/libs/qmldebug/qmldebugcommandlinearguments.h
View File

@@ -25,9 +25,10 @@
#pragma once #pragma once
#include <coreplugin/id.h>
#include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorerconstants.h>
#include <utils/id.h>
#include <QString> #include <QString>
#include <QUrl> #include <QUrl>
@@ -88,7 +89,7 @@ inline QString qmlDebugLocalArguments(QmlDebugServicesPreset services, const QSt
return qmlDebugCommandLineArguments(services, QLatin1String("file:") + socket, block); return qmlDebugCommandLineArguments(services, QLatin1String("file:") + socket, block);
} }
inline Core::Id runnerIdForRunMode(Core::Id runMode) inline Utils::Id runnerIdForRunMode(Utils::Id runMode)
{ {
if (runMode == ProjectExplorer::Constants::QML_PROFILER_RUN_MODE) if (runMode == ProjectExplorer::Constants::QML_PROFILER_RUN_MODE)
return ProjectExplorer::Constants::QML_PROFILER_RUNNER; return ProjectExplorer::Constants::QML_PROFILER_RUNNER;
@@ -97,7 +98,7 @@ inline Core::Id runnerIdForRunMode(Core::Id runMode)
return {}; return {};
} }
inline QmlDebugServicesPreset servicesForRunMode(Core::Id runMode) inline QmlDebugServicesPreset servicesForRunMode(Utils::Id runMode)
{ {
if (runMode == ProjectExplorer::Constants::QML_PROFILER_RUN_MODE) if (runMode == ProjectExplorer::Constants::QML_PROFILER_RUN_MODE)
return QmlDebug::QmlProfilerServices; return QmlDebug::QmlProfilerServices;

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

@@ -125,7 +125,7 @@ private:
this); this);
}; };
AndroidBuildApkStep::AndroidBuildApkStep(BuildStepList *parent, Core::Id id) AndroidBuildApkStep::AndroidBuildApkStep(BuildStepList *parent, Utils::Id id)
: AbstractProcessStep(parent, id), : AbstractProcessStep(parent, id),
m_buildTargetSdk(AndroidConfig::apiLevelNameFor(AndroidConfigurations:: m_buildTargetSdk(AndroidConfig::apiLevelNameFor(AndroidConfigurations::
sdkManager()->latestAndroidSdkPlatform())) sdkManager()->latestAndroidSdkPlatform()))
@@ -512,7 +512,7 @@ void AndroidBuildApkStep::setBuildTargetSdk(const QString &sdk)
m_buildTargetSdk = sdk; m_buildTargetSdk = sdk;
} }
QVariant AndroidBuildApkStep::data(Core::Id id) const QVariant AndroidBuildApkStep::data(Utils::Id id) const
{ {
if (id == Constants::AndroidNdkPlatform) { if (id == Constants::AndroidNdkPlatform) {
if (auto qtVersion = QtKitAspect::qtVersion(target()->kit())) 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 Q_OBJECT
public: public:
AndroidBuildApkStep(ProjectExplorer::BuildStepList *bc, Core::Id id); AndroidBuildApkStep(ProjectExplorer::BuildStepList *bc, Utils::Id id);
bool fromMap(const QVariantMap &map) override; bool fromMap(const QVariantMap &map) override;
QVariantMap toMap() const override; QVariantMap toMap() const override;
@@ -74,7 +74,7 @@ public:
QString buildTargetSdk() const; QString buildTargetSdk() const;
void setBuildTargetSdk(const QString &sdk); void setBuildTargetSdk(const QString &sdk);
QVariant data(Core::Id id) const override; QVariant data(Utils::Id id) const override;
private: private:
void showInGraphicalShell(); void showInGraphicalShell();

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

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

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

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

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

@@ -65,9 +65,9 @@ public:
ForceUnintall 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; bool fromMap(const QVariantMap &map) override;
QVariantMap toMap() const override; QVariantMap toMap() const override;
@@ -116,7 +116,7 @@ private:
bool m_uninstallPreviousPackageRun = false; bool m_uninstallPreviousPackageRun = false;
bool m_useAndroiddeployqt = false; bool m_useAndroiddeployqt = false;
bool m_askForUninstall = false; bool m_askForUninstall = false;
static const Core::Id Id; static const Utils::Id Id;
Utils::CommandLine m_androiddeployqtArgs; Utils::CommandLine m_androiddeployqtArgs;
Utils::FilePath m_adbPath; Utils::FilePath m_adbPath;
Utils::FilePath m_command; Utils::FilePath m_command;

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

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

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

@@ -750,7 +750,7 @@ static const char kServicesInvalid[] = "AndroidServiceDefinitionInvalid";
void AndroidManifestEditorWidget::setInvalidServiceInfo() void AndroidManifestEditorWidget::setInvalidServiceInfo()
{ {
Core::Id id(kServicesInvalid); Utils::Id id(kServicesInvalid);
if (m_textEditorWidget->textDocument()->infoBar()->containsInfo(id)) if (m_textEditorWidget->textDocument()->infoBar()->containsInfo(id))
return; return;
Utils::InfoBarEntry info(id, Utils::InfoBarEntry info(id,
@@ -762,7 +762,7 @@ void AndroidManifestEditorWidget::setInvalidServiceInfo()
void AndroidManifestEditorWidget::clearInvalidServiceInfo() 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) 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) Q_DECLARE_TR_FUNCTIONS(Android::AndroidPackageInstallationStep)
public: public:
AndroidPackageInstallationStep(BuildStepList *bsl, Core::Id id); AndroidPackageInstallationStep(BuildStepList *bsl, Utils::Id id);
BuildStepConfigWidget *createConfigWidget() final; BuildStepConfigWidget *createConfigWidget() final;
@@ -79,7 +79,7 @@ public:
} }
}; };
AndroidPackageInstallationStep::AndroidPackageInstallationStep(BuildStepList *bsl, Core::Id id) AndroidPackageInstallationStep::AndroidPackageInstallationStep(BuildStepList *bsl, Utils::Id id)
: AbstractProcessStep(bsl, id) : AbstractProcessStep(bsl, id)
{ {
const QString name = tr("Copy application data"); 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(); QList<ProjectExplorer::Kit *> kits = ProjectExplorer::KitManager::kits();
foreach (ProjectExplorer::Kit *kit, kits) { foreach (ProjectExplorer::Kit *kit, kits) {
Core::Id deviceId = ProjectExplorer::DeviceKitAspect::deviceId(kit); Utils::Id deviceId = ProjectExplorer::DeviceKitAspect::deviceId(kit);
if (kit->isAutoDetected() if (kit->isAutoDetected()
&& deviceId == Core::Id(Constants::ANDROID_DEVICE_ID) && deviceId == Utils::Id(Constants::ANDROID_DEVICE_ID)
&& !kit->isSdkProvided()) { && !kit->isSdkProvided()) {
return false; return false;
} }
@@ -120,9 +120,9 @@ void AndroidPotentialKitWidget::recheck()
{ {
QList<ProjectExplorer::Kit *> kits = ProjectExplorer::KitManager::kits(); QList<ProjectExplorer::Kit *> kits = ProjectExplorer::KitManager::kits();
foreach (ProjectExplorer::Kit *kit, kits) { foreach (ProjectExplorer::Kit *kit, kits) {
Core::Id deviceId = ProjectExplorer::DeviceKitAspect::deviceId(kit); Utils::Id deviceId = ProjectExplorer::DeviceKitAspect::deviceId(kit);
if (kit->isAutoDetected() if (kit->isAutoDetected()
&& deviceId == Core::Id(Constants::ANDROID_DEVICE_ID) && deviceId == Utils::Id(Constants::ANDROID_DEVICE_ID)
&& !kit->isSdkProvided()) { && !kit->isSdkProvided()) {
setVisible(false); setVisible(false);
return; return;

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

@@ -182,16 +182,16 @@ void AndroidQtVersion::parseMkSpec(ProFileEvaluator *evaluator) const
BaseQtVersion::parseMkSpec(evaluator); 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.insert(QtSupport::Constants::FEATURE_MOBILE);
features.remove(QtSupport::Constants::FEATURE_QT_CONSOLE); features.remove(QtSupport::Constants::FEATURE_QT_CONSOLE);
features.remove(QtSupport::Constants::FEATURE_QT_WEBKIT); features.remove(QtSupport::Constants::FEATURE_QT_WEBKIT);
return features; return features;
} }
QSet<Core::Id> AndroidQtVersion::targetDeviceTypes() const QSet<Utils::Id> AndroidQtVersion::targetDeviceTypes() const
{ {
return {Constants::ANDROID_DEVICE_TYPE}; 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; void addToEnvironment(const ProjectExplorer::Kit *k, Utils::Environment &env) const override;
Utils::Environment qmakeRunEnvironment() const override; Utils::Environment qmakeRunEnvironment() const override;
QSet<Core::Id> availableFeatures() const override; QSet<Utils::Id> availableFeatures() const override;
QSet<Core::Id> targetDeviceTypes() const override; QSet<Utils::Id> targetDeviceTypes() const override;
QString description() const override; QString description() const override;
const QStringList &androidAbis() const; const QStringList &androidAbis() const;

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

@@ -55,7 +55,7 @@ using namespace Utils;
namespace Android { namespace Android {
BaseStringListAspect::BaseStringListAspect(const QString &settingsKey, Core::Id id) BaseStringListAspect::BaseStringListAspect(const QString &settingsKey, Utils::Id id)
{ {
setSettingsKey(settingsKey); setSettingsKey(settingsKey);
setId(id); 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) : RunConfiguration(target, id)
{ {
auto envAspect = addAspect<EnvironmentAspect>(); auto envAspect = addAspect<EnvironmentAspect>();

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

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

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

@@ -251,7 +251,7 @@ AndroidRunnerWorker::AndroidRunnerWorker(RunWorker *runner, const QString &packa
m_useLldb = Debugger::DebuggerKitAspect::engineType(runControl->kit()) m_useLldb = Debugger::DebuggerKitAspect::engineType(runControl->kit())
== Debugger::LldbEngineType; == Debugger::LldbEngineType;
auto aspect = runControl->aspect<Debugger::DebuggerRunConfigurationAspect>(); 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; const bool debuggingMode = runMode == ProjectExplorer::Constants::DEBUG_RUN_MODE;
m_useCppDebugger = debuggingMode && aspect->useCppDebugger(); m_useCppDebugger = debuggingMode && aspect->useCppDebugger();
if (debuggingMode && aspect->useQmlDebugger()) 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", {"aarch64-linux-android",
Abi(Abi::ArmArchitecture, Abi::LinuxOS, Abi::AndroidLinuxFlavor, Abi::ElfFormat, 64)}}; 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}; 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) const ToolChainList &alreadyKnown)
{ {
ToolChain * tc = Utils::findOrDefault(alreadyKnown, [target, compilerPath, lang](ToolChain *tc) { ToolChain * tc = Utils::findOrDefault(alreadyKnown, [target, compilerPath, lang](ToolChain *tc) {
@@ -218,7 +218,7 @@ ToolChainList AndroidToolChainFactory::autodetectToolChainsFromNdks(
continue; continue;
} }
for (const Core::Id &lang : LanguageIds) { for (const Utils::Id &lang : LanguageIds) {
FilePath compilerCommand = clangPath; FilePath compilerCommand = clangPath;
if (lang == ProjectExplorer::Constants::CXX_LANGUAGE_ID) if (lang == ProjectExplorer::Constants::CXX_LANGUAGE_ID)
compilerCommand = clangPlusPlusPath(clangPath); compilerCommand = clangPlusPlusPath(clangPath);

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

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

2
src/plugins/autotest/boost/boosttestsettingspage.cpp
View File

@@ -101,7 +101,7 @@ void BoostTestSettingsWidget::fillComboBoxes()
m_ui.reportLevelCB->addItem("No", QVariant::fromValue(ReportLevel::No)); m_ui.reportLevelCB->addItem("No", QVariant::fromValue(ReportLevel::No));
} }
BoostTestSettingsPage::BoostTestSettingsPage(BoostTestSettings *settings, Core::Id settingsId) BoostTestSettingsPage::BoostTestSettingsPage(BoostTestSettings *settings, Utils::Id settingsId)
{ {
setId(settingsId); setId(settingsId);
setCategory(Constants::AUTOTEST_SETTINGS_CATEGORY); setCategory(Constants::AUTOTEST_SETTINGS_CATEGORY);

2
src/plugins/autotest/boost/boosttestsettingspage.h
View File

@@ -35,7 +35,7 @@ class BoostTestSettings;
class BoostTestSettingsPage final : public Core::IOptionsPage class BoostTestSettingsPage final : public Core::IOptionsPage
{ {
public: public:
BoostTestSettingsPage(BoostTestSettings *settings, Core::Id settingsId); BoostTestSettingsPage(BoostTestSettings *settings, Utils::Id settingsId);
}; };
} // Internal } // Internal

2
src/plugins/autotest/catch/catchtestsettingspage.cpp
View File

@@ -101,7 +101,7 @@ void CatchTestSettingsWidget::apply()
m_settings->toSettings(Core::ICore::settings()); m_settings->toSettings(Core::ICore::settings());
} }
CatchTestSettingsPage::CatchTestSettingsPage(CatchTestSettings *settings, Core::Id settingsId) CatchTestSettingsPage::CatchTestSettingsPage(CatchTestSettings *settings, Utils::Id settingsId)
{ {
setId(settingsId); setId(settingsId);
setCategory(Constants::AUTOTEST_SETTINGS_CATEGORY); setCategory(Constants::AUTOTEST_SETTINGS_CATEGORY);

2
src/plugins/autotest/catch/catchtestsettingspage.h
View File

@@ -35,7 +35,7 @@ class CatchTestSettings;
class CatchTestSettingsPage : public Core::IOptionsPage class CatchTestSettingsPage : public Core::IOptionsPage
{ {
public: public:
CatchTestSettingsPage(CatchTestSettings *settings, Core::Id settingsId); CatchTestSettingsPage(CatchTestSettings *settings, Utils::Id settingsId);
}; };
} // namespace Internal } // namespace Internal

4
src/plugins/autotest/gtest/gtestresult.cpp
View File

@@ -28,7 +28,7 @@
#include "../testframeworkmanager.h" #include "../testframeworkmanager.h"
#include "../testtreeitem.h" #include "../testtreeitem.h"
#include <coreplugin/id.h> #include <utils/id.h>
#include <QRegularExpression> #include <QRegularExpression>
@@ -95,7 +95,7 @@ static QString normalizeTestName(const QString &testname)
const TestTreeItem *GTestResult::findTestTreeItem() const const TestTreeItem *GTestResult::findTestTreeItem() const
{ {
auto id = Core::Id(Constants::FRAMEWORK_PREFIX).withSuffix(GTest::Constants::FRAMEWORK_NAME); auto id = Utils::Id(Constants::FRAMEWORK_PREFIX).withSuffix(GTest::Constants::FRAMEWORK_NAME);
ITestFramework *framework = TestFrameworkManager::frameworkForId(id); ITestFramework *framework = TestFrameworkManager::frameworkForId(id);
QTC_ASSERT(framework, return nullptr); QTC_ASSERT(framework, return nullptr);
const TestTreeItem *rootNode = framework->rootNode(); const TestTreeItem *rootNode = framework->rootNode();

4
src/plugins/autotest/gtest/gtestsettingspage.cpp
View File

@@ -105,11 +105,11 @@ void GTestSettingsWidget::apply()
if (m_settings->groupMode == oldGroupMode && oldFilter == m_settings->gtestFilter) if (m_settings->groupMode == oldGroupMode && oldFilter == m_settings->gtestFilter)
return; return;
auto id = Core::Id(Constants::FRAMEWORK_PREFIX).withSuffix(GTest::Constants::FRAMEWORK_NAME); auto id = Utils::Id(Constants::FRAMEWORK_PREFIX).withSuffix(GTest::Constants::FRAMEWORK_NAME);
TestTreeModel::instance()->rebuild({id}); TestTreeModel::instance()->rebuild({id});
} }
GTestSettingsPage::GTestSettingsPage(GTestSettings *settings, Core::Id settingsId) GTestSettingsPage::GTestSettingsPage(GTestSettings *settings, Utils::Id settingsId)
{ {
setId(settingsId); setId(settingsId);
setCategory(Constants::AUTOTEST_SETTINGS_CATEGORY); setCategory(Constants::AUTOTEST_SETTINGS_CATEGORY);

2
src/plugins/autotest/gtest/gtestsettingspage.h
View File

@@ -35,7 +35,7 @@ class GTestSettings;
class GTestSettingsPage final : public Core::IOptionsPage class GTestSettingsPage final : public Core::IOptionsPage
{ {
public: public:
GTestSettingsPage(GTestSettings *settings, Core::Id settingsId); GTestSettingsPage(GTestSettings *settings, Utils::Id settingsId);
}; };
} // namespace Internal } // namespace Internal

8
src/plugins/autotest/itestframework.cpp
View File

@@ -52,15 +52,15 @@ ITestParser *ITestFramework::testParser()
return m_testParser; return m_testParser;
} }
Core::Id ITestFramework::settingsId() const Utils::Id ITestFramework::settingsId() const
{ {
return Core::Id(Constants::SETTINGSPAGE_PREFIX) return Utils::Id(Constants::SETTINGSPAGE_PREFIX)
.withSuffix(QString("%1.%2").arg(priority()).arg(QLatin1String(name()))); .withSuffix(QString("%1.%2").arg(priority()).arg(QLatin1String(name())));
} }
Core::Id ITestFramework::id() const Utils::Id ITestFramework::id() const
{ {
return Core::Id(Constants::FRAMEWORK_PREFIX).withSuffix(name()); return Utils::Id(Constants::FRAMEWORK_PREFIX).withSuffix(name());
} }
void ITestFramework::resetRootNode() void ITestFramework::resetRootNode()

4
src/plugins/autotest/itestframework.h
View File

@@ -46,8 +46,8 @@ public:
TestTreeItem *rootNode(); TestTreeItem *rootNode();
ITestParser *testParser(); ITestParser *testParser();
Core::Id settingsId() const; Utils::Id settingsId() const;
Core::Id id() const; Utils::Id id() const;
bool active() const { return m_active; } bool active() const { return m_active; }
void setActive(bool active) { m_active = active; } void setActive(bool active) { m_active = active; }

2
src/plugins/autotest/itestparser.h
View File

@@ -28,7 +28,7 @@
#include "testtreeitem.h" #include "testtreeitem.h"
#include "testtreemodel.h" #include "testtreemodel.h"
#include <coreplugin/id.h> #include <utils/id.h>
#include <cplusplus/CppDocument.h> #include <cplusplus/CppDocument.h>
#include <cpptools/cppworkingcopy.h> #include <cpptools/cppworkingcopy.h>
#include <qmljs/qmljsdocument.h> #include <qmljs/qmljsdocument.h>

2
src/plugins/autotest/projectsettingswidget.cpp
View File

@@ -120,7 +120,7 @@ void ProjectTestSettingsWidget::populateFrameworks(const QMap<ITestFramework *,
void ProjectTestSettingsWidget::onActiveFrameworkChanged(QTreeWidgetItem *item, int column) void ProjectTestSettingsWidget::onActiveFrameworkChanged(QTreeWidgetItem *item, int column)
{ {
auto id = Core::Id::fromSetting(item->data(column, FrameworkIdRole)); auto id = Utils::Id::fromSetting(item->data(column, FrameworkIdRole));
m_projectSettings->activateFramework(id, item->data(0, Qt::CheckStateRole) == Qt::Checked); m_projectSettings->activateFramework(id, item->data(0, Qt::CheckStateRole) == Qt::Checked);
m_syncFrameworksTimer.start(3000); m_syncFrameworksTimer.start(3000);
} }

8
src/plugins/autotest/qtest/qttestresult.cpp
View File

@@ -28,7 +28,7 @@
#include "../testtreeitem.h" #include "../testtreeitem.h"
#include "../quick/quicktestframework.h" // FIXME BAD! - but avoids declaring QuickTestResult #include "../quick/quicktestframework.h" // FIXME BAD! - but avoids declaring QuickTestResult
#include <coreplugin/id.h> #include <utils/id.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
namespace Autotest { namespace Autotest {
@@ -131,11 +131,11 @@ TestResult *QtTestResult::createIntermediateResultFor(const TestResult *other)
const TestTreeItem *QtTestResult::findTestTreeItem() const const TestTreeItem *QtTestResult::findTestTreeItem() const
{ {
Core::Id id; Utils::Id id;
if (m_type == TestType::QtTest) if (m_type == TestType::QtTest)
id = Core::Id(Constants::FRAMEWORK_PREFIX).withSuffix(QtTest::Constants::FRAMEWORK_NAME); id = Utils::Id(Constants::FRAMEWORK_PREFIX).withSuffix(QtTest::Constants::FRAMEWORK_NAME);
else else
id = Core::Id(Constants::FRAMEWORK_PREFIX).withSuffix(QuickTest::Constants::FRAMEWORK_NAME); id = Utils::Id(Constants::FRAMEWORK_PREFIX).withSuffix(QuickTest::Constants::FRAMEWORK_NAME);
ITestFramework *framework = TestFrameworkManager::frameworkForId(id); ITestFramework *framework = TestFrameworkManager::frameworkForId(id);
QTC_ASSERT(framework, return nullptr); QTC_ASSERT(framework, return nullptr);
const TestTreeItem *rootNode = framework->rootNode(); const TestTreeItem *rootNode = framework->rootNode();

2
src/plugins/autotest/qtest/qttestsettingspage.cpp
View File

@@ -100,7 +100,7 @@ void QtTestSettingsWidget::apply()
m_settings->toSettings(Core::ICore::settings()); m_settings->toSettings(Core::ICore::settings());
} }
QtTestSettingsPage::QtTestSettingsPage(QtTestSettings *settings, Core::Id settingsId) QtTestSettingsPage::QtTestSettingsPage(QtTestSettings *settings, Utils::Id settingsId)
{ {
setId(settingsId); setId(settingsId);
setCategory(Constants::AUTOTEST_SETTINGS_CATEGORY); setCategory(Constants::AUTOTEST_SETTINGS_CATEGORY);

2
src/plugins/autotest/qtest/qttestsettingspage.h
View File

@@ -35,7 +35,7 @@ class QtTestSettings;
class QtTestSettingsPage final : public Core::IOptionsPage class QtTestSettingsPage final : public Core::IOptionsPage
{ {
public: public:
QtTestSettingsPage(QtTestSettings *settings, Core::Id settingsId); QtTestSettingsPage(QtTestSettings *settings, Utils::Id settingsId);
}; };
} // namespace Internal } // namespace Internal

4
src/plugins/autotest/quick/quicktestframework.cpp
View File

@@ -56,8 +56,8 @@ unsigned QuickTestFramework::priority() const
IFrameworkSettings *QuickTestFramework::frameworkSettings() IFrameworkSettings *QuickTestFramework::frameworkSettings()
{ {
static const Core::Id id static const Utils::Id id
= Core::Id(Constants::FRAMEWORK_PREFIX).withSuffix(QtTest::Constants::FRAMEWORK_NAME); = Utils::Id(Constants::FRAMEWORK_PREFIX).withSuffix(QtTest::Constants::FRAMEWORK_NAME);
ITestFramework *qtTestFramework = TestFrameworkManager::frameworkForId(id); ITestFramework *qtTestFramework = TestFrameworkManager::frameworkForId(id);
return qtTestFramework->frameworkSettings(); return qtTestFramework->frameworkSettings();
} }

4
src/plugins/autotest/testcodeparser.cpp
View File

@@ -380,7 +380,7 @@ void TestCodeParser::scanForTests(const QStringList &fileList, const QList<ITest
} }
} }
void TestCodeParser::onTaskStarted(Core::Id type) void TestCodeParser::onTaskStarted(Utils::Id type)
{ {
if (type == CppTools::Constants::TASK_INDEX) { if (type == CppTools::Constants::TASK_INDEX) {
m_codeModelParsing = true; m_codeModelParsing = true;
@@ -394,7 +394,7 @@ void TestCodeParser::onTaskStarted(Core::Id type)
} }
} }
void TestCodeParser::onAllTasksFinished(Core::Id type) void TestCodeParser::onAllTasksFinished(Utils::Id type)
{ {
// if we cancel parsing ensure that progress animation is canceled as well // if we cancel parsing ensure that progress animation is canceled as well
if (type == Constants::TASK_PARSE && parsingHasFailed) if (type == Constants::TASK_PARSE && parsingHasFailed)

4
src/plugins/autotest/testcodeparser.h
View File

@@ -92,8 +92,8 @@ private:
// qml files must be handled slightly different // qml files must be handled slightly different
void onDocumentUpdated(const QString &fileName, bool isQmlFile = false); void onDocumentUpdated(const QString &fileName, bool isQmlFile = false);
void onTaskStarted(Core::Id type); void onTaskStarted(Utils::Id type);
void onAllTasksFinished(Core::Id type); void onAllTasksFinished(Utils::Id type);
void onFinished(); void onFinished();
void onPartialParsingFinished(); void onPartialParsingFinished();
void parsePostponedFiles(); void parsePostponedFiles();

2
src/plugins/autotest/testeditormark.cpp
View File

@@ -30,7 +30,7 @@ namespace Autotest {
namespace Internal { namespace Internal {
TestEditorMark::TestEditorMark(QPersistentModelIndex item, const Utils::FilePath &file, int line) TestEditorMark::TestEditorMark(QPersistentModelIndex item, const Utils::FilePath &file, int line)
: TextEditor::TextMark(file, line, Core::Id(Constants::TASK_MARK_ID)), : TextEditor::TextMark(file, line, Utils::Id(Constants::TASK_MARK_ID)),
m_item(item) m_item(item)
{ {
} }

1
src/plugins/autotest/testframeworkmanager.cpp
View File

@@ -35,6 +35,7 @@
#include <QSettings> #include <QSettings>
using namespace Core; using namespace Core;
using namespace Utils;
namespace Autotest { namespace Autotest {

2
src/plugins/autotest/testframeworkmanager.h
View File

@@ -46,7 +46,7 @@ public:
bool registerTestFramework(ITestFramework *framework); bool registerTestFramework(ITestFramework *framework);
void synchronizeSettings(QSettings *s); void synchronizeSettings(QSettings *s);
static ITestFramework *frameworkForId(Core::Id frameworkId); static ITestFramework *frameworkForId(Utils::Id frameworkId);
static void activateFrameworksFromSettings(const Internal::TestSettings *settings); static void activateFrameworksFromSettings(const Internal::TestSettings *settings);
static TestFrameworks registeredFrameworks(); static TestFrameworks registeredFrameworks();

4
src/plugins/autotest/testprojectsettings.cpp
View File

@@ -60,7 +60,7 @@ void TestProjectSettings::setUseGlobalSettings(bool useGlobal)
m_useGlobalSettings = useGlobal; m_useGlobalSettings = useGlobal;
} }
void TestProjectSettings::activateFramework(const Core::Id &id, bool activate) void TestProjectSettings::activateFramework(const Utils::Id &id, bool activate)
{ {
ITestFramework *framework = TestFrameworkManager::frameworkForId(id); ITestFramework *framework = TestFrameworkManager::frameworkForId(id);
m_activeTestFrameworks[framework] = activate; m_activeTestFrameworks[framework] = activate;
@@ -81,7 +81,7 @@ void TestProjectSettings::load()
if (activeFrameworks.isValid()) { if (activeFrameworks.isValid()) {
const QMap<QString, QVariant> frameworksMap = activeFrameworks.toMap(); const QMap<QString, QVariant> frameworksMap = activeFrameworks.toMap();
for (ITestFramework *framework : registered) { for (ITestFramework *framework : registered) {
const Core::Id id = framework->id(); const Utils::Id id = framework->id();
bool active = frameworksMap.value(id.toString(), framework->active()).toBool(); bool active = frameworksMap.value(id.toString(), framework->active()).toBool();
m_activeTestFrameworks.insert(framework, active); m_activeTestFrameworks.insert(framework, active);
} }

2
src/plugins/autotest/testprojectsettings.h
View File

@@ -49,7 +49,7 @@ public:
void setActiveFrameworks(const QMap<ITestFramework *, bool> enabledFrameworks) void setActiveFrameworks(const QMap<ITestFramework *, bool> enabledFrameworks)
{ m_activeTestFrameworks = enabledFrameworks; } { m_activeTestFrameworks = enabledFrameworks; }
QMap<ITestFramework *, bool> activeFrameworks() const { return m_activeTestFrameworks; } QMap<ITestFramework *, bool> activeFrameworks() const { return m_activeTestFrameworks; }
void activateFramework(const Core::Id &id, bool activate); void activateFramework(const Utils::Id &id, bool activate);
private: private:
void load(); void load();
void save(); void save();

6
src/plugins/autotest/testsettings.cpp
View File

@@ -27,7 +27,7 @@
#include "autotestconstants.h" #include "autotestconstants.h"
#include "testframeworkmanager.h" #include "testframeworkmanager.h"
#include <coreplugin/id.h> #include <utils/id.h>
#include <QSettings> #include <QSettings>
@@ -69,7 +69,7 @@ void TestSettings::toSettings(QSettings *s) const
s->setValue(popupOnFailKey, popupOnFail); s->setValue(popupOnFailKey, popupOnFail);
s->setValue(runAfterBuildKey, int(runAfterBuild)); s->setValue(runAfterBuildKey, int(runAfterBuild));
// store frameworks and their current active and grouping state // store frameworks and their current active and grouping state
for (const Core::Id &id : frameworks.keys()) { for (const Utils::Id &id : frameworks.keys()) {
s->setValue(id.toString(), frameworks.value(id)); s->setValue(id.toString(), frameworks.value(id));
s->setValue(id.toString() + groupSuffix, frameworksGrouping.value(id)); s->setValue(id.toString() + groupSuffix, frameworksGrouping.value(id));
} }
@@ -97,7 +97,7 @@ void TestSettings::fromSettings(QSettings *s)
frameworksGrouping.clear(); frameworksGrouping.clear();
for (const ITestFramework *framework : registered) { for (const ITestFramework *framework : registered) {
// get their active state // get their active state
const Core::Id id = framework->id(); const Utils::Id id = framework->id();
const QString key = id.toString(); const QString key = id.toString();
frameworks.insert(id, s->value(key, framework->active()).toBool()); frameworks.insert(id, s->value(key, framework->active()).toBool());
// and whether grouping is enabled // and whether grouping is enabled

10
src/plugins/autotest/testsettingspage.cpp
View File

@@ -91,12 +91,12 @@ TestSettings TestSettingsWidget::settings() const
return result; return result;
} }
void TestSettingsWidget::populateFrameworksListWidget(const QHash<Core::Id, bool> &frameworks) void TestSettingsWidget::populateFrameworksListWidget(const QHash<Utils::Id, bool> &frameworks)
{ {
const TestFrameworks &registered = TestFrameworkManager::registeredFrameworks(); const TestFrameworks &registered = TestFrameworkManager::registeredFrameworks();
m_ui.frameworkTreeWidget->clear(); m_ui.frameworkTreeWidget->clear();
for (const ITestFramework *framework : registered) { for (const ITestFramework *framework : registered) {
const Core::Id id = framework->id(); const Utils::Id id = framework->id();
auto item = new QTreeWidgetItem(m_ui.frameworkTreeWidget, QStringList(QLatin1String(framework->name()))); auto item = new QTreeWidgetItem(m_ui.frameworkTreeWidget, QStringList(QLatin1String(framework->name())));
item->setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsUserCheckable); item->setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsUserCheckable);
item->setCheckState(0, frameworks.value(id) ? Qt::Checked : Qt::Unchecked); item->setCheckState(0, frameworks.value(id) ? Qt::Checked : Qt::Unchecked);
@@ -118,7 +118,7 @@ void TestSettingsWidget::frameworkSettings(TestSettings &settings) const
const int itemCount = model->rowCount(); const int itemCount = model->rowCount();
for (int row = 0; row < itemCount; ++row) { for (int row = 0; row < itemCount; ++row) {
QModelIndex idx = model->index(row, 0); QModelIndex idx = model->index(row, 0);
const Core::Id id = Core::Id::fromSetting(idx.data(Qt::UserRole)); const Utils::Id id = Utils::Id::fromSetting(idx.data(Qt::UserRole));
settings.frameworks.insert(id, idx.data(Qt::CheckStateRole) == Qt::Checked); settings.frameworks.insert(id, idx.data(Qt::CheckStateRole) == Qt::Checked);
idx = model->index(row, 1); idx = model->index(row, 1);
settings.frameworksGrouping.insert(id, idx.data(Qt::CheckStateRole) == Qt::Checked); settings.frameworksGrouping.insert(id, idx.data(Qt::CheckStateRole) == Qt::Checked);
@@ -162,8 +162,8 @@ void TestSettingsPage::apply()
if (!m_widget) // page was not shown at all if (!m_widget) // page was not shown at all
return; return;
const TestSettings newSettings = m_widget->settings(); const TestSettings newSettings = m_widget->settings();
const QList<Core::Id> changedIds = Utils::filtered(newSettings.frameworksGrouping.keys(), const QList<Utils::Id> changedIds = Utils::filtered(newSettings.frameworksGrouping.keys(),
[newSettings, this] (const Core::Id &id) { [newSettings, this] (const Utils::Id &id) {
return newSettings.frameworksGrouping[id] != m_settings->frameworksGrouping[id]; return newSettings.frameworksGrouping[id] != m_settings->frameworksGrouping[id];
}); });
*m_settings = newSettings; *m_settings = newSettings;

2
src/plugins/autotest/testsettingspage.h
View File

@@ -46,7 +46,7 @@ public:
TestSettings settings() const; TestSettings settings() const;
private: private:
void populateFrameworksListWidget(const QHash<Core::Id, bool> &frameworks); void populateFrameworksListWidget(const QHash<Utils::Id, bool> &frameworks);
void frameworkSettings(TestSettings &settings) const; void frameworkSettings(TestSettings &settings) const;
void onFrameworkItemChanged(); void onFrameworkItemChanged();
Ui::TestSettingsPage m_ui; Ui::TestSettingsPage m_ui;

12
src/plugins/autotest/testtreemodel.cpp
View File

@@ -266,9 +266,9 @@ void TestTreeModel::filterAndInsert(TestTreeItem *item, TestTreeItem *root, bool
insertItemInParent(filtered, root, groupingEnabled); insertItemInParent(filtered, root, groupingEnabled);
} }
void TestTreeModel::rebuild(const QList<Core::Id> &frameworkIds) void TestTreeModel::rebuild(const QList<Utils::Id> &frameworkIds)
{ {
for (const Core::Id &id : frameworkIds) { for (const Utils::Id &id : frameworkIds) {
ITestFramework *framework = TestFrameworkManager::frameworkForId(id); ITestFramework *framework = TestFrameworkManager::frameworkForId(id);
TestTreeItem *frameworkRoot = framework->rootNode(); TestTreeItem *frameworkRoot = framework->rootNode();
const bool groupingEnabled = framework->grouping(); const bool groupingEnabled = framework->grouping();
@@ -549,25 +549,25 @@ void TestTreeModel::removeAllTestItems()
// we're inside tests - so use some internal knowledge to make testing easier // we're inside tests - so use some internal knowledge to make testing easier
static TestTreeItem *qtRootNode() static TestTreeItem *qtRootNode()
{ {
auto id = Core::Id(Constants::FRAMEWORK_PREFIX).withSuffix("QtTest"); auto id = Utils::Id(Constants::FRAMEWORK_PREFIX).withSuffix("QtTest");
return TestFrameworkManager::frameworkForId(id)->rootNode(); return TestFrameworkManager::frameworkForId(id)->rootNode();
} }
static TestTreeItem *quickRootNode() static TestTreeItem *quickRootNode()
{ {
auto id = Core::Id(Constants::FRAMEWORK_PREFIX).withSuffix("QtQuickTest"); auto id = Utils::Id(Constants::FRAMEWORK_PREFIX).withSuffix("QtQuickTest");
return TestFrameworkManager::frameworkForId(id)->rootNode(); return TestFrameworkManager::frameworkForId(id)->rootNode();
} }
static TestTreeItem *gtestRootNode() static TestTreeItem *gtestRootNode()
{ {
auto id = Core::Id(Constants::FRAMEWORK_PREFIX).withSuffix("GTest"); auto id = Utils::Id(Constants::FRAMEWORK_PREFIX).withSuffix("GTest");
return TestFrameworkManager::frameworkForId(id)->rootNode(); return TestFrameworkManager::frameworkForId(id)->rootNode();
} }
static TestTreeItem *boostTestRootNode() static TestTreeItem *boostTestRootNode()
{ {
auto id = Core::Id(Constants::FRAMEWORK_PREFIX).withSuffix("Boost"); auto id = Utils::Id(Constants::FRAMEWORK_PREFIX).withSuffix("Boost");
return TestFrameworkManager::frameworkForId(id)->rootNode(); return TestFrameworkManager::frameworkForId(id)->rootNode();
} }

2
src/plugins/autotest/testtreemodel.h
View File

@@ -64,7 +64,7 @@ public:
QList<TestConfiguration *> getTestsForFile(const Utils::FilePath &fileName) const; QList<TestConfiguration *> getTestsForFile(const Utils::FilePath &fileName) const;
QList<TestTreeItem *> testItemsByName(const QString &testName); QList<TestTreeItem *> testItemsByName(const QString &testName);
void synchronizeTestFrameworks(); void synchronizeTestFrameworks();
void rebuild(const QList<Core::Id> &frameworkIds); void rebuild(const QList<Utils::Id> &frameworkIds);
void updateCheckStateCache(); void updateCheckStateCache();
#ifdef WITH_TESTS #ifdef WITH_TESTS

4
src/plugins/autotoolsprojectmanager/autogenstep.cpp
View File

@@ -60,7 +60,7 @@ class AutogenStep : public AbstractProcessStep
Q_DECLARE_TR_FUNCTIONS(AutotoolsProjectManager::Internal::AutogenStep) Q_DECLARE_TR_FUNCTIONS(AutotoolsProjectManager::Internal::AutogenStep)
public: public:
AutogenStep(BuildStepList *bsl, Core::Id id); AutogenStep(BuildStepList *bsl, Utils::Id id);
private: private:
bool init() override; bool init() override;
@@ -70,7 +70,7 @@ private:
bool m_runAutogen = false; bool m_runAutogen = false;
}; };
AutogenStep::AutogenStep(BuildStepList *bsl, Core::Id id) : AbstractProcessStep(bsl, id) AutogenStep::AutogenStep(BuildStepList *bsl, Utils::Id id) : AbstractProcessStep(bsl, id)
{ {
setDefaultDisplayName(tr("Autogen")); setDefaultDisplayName(tr("Autogen"));

4
src/plugins/autotoolsprojectmanager/autoreconfstep.cpp
View File

@@ -57,7 +57,7 @@ class AutoreconfStep : public AbstractProcessStep
Q_DECLARE_TR_FUNCTIONS(AutotoolsProjectManager::Internal::AutoreconfStep) Q_DECLARE_TR_FUNCTIONS(AutotoolsProjectManager::Internal::AutoreconfStep)
public: public:
AutoreconfStep(BuildStepList *bsl, Core::Id id); AutoreconfStep(BuildStepList *bsl, Utils::Id id);
bool init() override; bool init() override;
void doRun() override; void doRun() override;
@@ -67,7 +67,7 @@ private:
bool m_runAutoreconf = false; bool m_runAutoreconf = false;
}; };
AutoreconfStep::AutoreconfStep(BuildStepList *bsl, Core::Id id) AutoreconfStep::AutoreconfStep(BuildStepList *bsl, Utils::Id id)
: AbstractProcessStep(bsl, id) : AbstractProcessStep(bsl, id)
{ {
setDefaultDisplayName(tr("Autoreconf")); setDefaultDisplayName(tr("Autoreconf"));

2
src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp
View File

@@ -48,7 +48,7 @@ class AutotoolsBuildConfiguration : public BuildConfiguration
Q_DECLARE_TR_FUNCTIONS(AutotoolsProjectManager::Internal::AutotoolsBuildConfiguration) Q_DECLARE_TR_FUNCTIONS(AutotoolsProjectManager::Internal::AutotoolsBuildConfiguration)
public: public:
AutotoolsBuildConfiguration(Target *target, Core::Id id) AutotoolsBuildConfiguration(Target *target, Utils::Id id)
: BuildConfiguration(target, id) : BuildConfiguration(target, id)
{ {
// /<foobar> is used so the un-changed check in setBuildDirectory() works correctly. // /<foobar> is used so the un-changed check in setBuildDirectory() works correctly.

4
src/plugins/autotoolsprojectmanager/configurestep.cpp
View File

@@ -77,7 +77,7 @@ class ConfigureStep : public ProjectExplorer::AbstractProcessStep
Q_DECLARE_TR_FUNCTIONS(AutotoolsProjectManager::Internal::ConfigureStep) Q_DECLARE_TR_FUNCTIONS(AutotoolsProjectManager::Internal::ConfigureStep)
public: public:
ConfigureStep(BuildStepList *bsl, Core::Id id); ConfigureStep(BuildStepList *bsl, Utils::Id id);
void setAdditionalArguments(const QString &list); void setAdditionalArguments(const QString &list);
@@ -89,7 +89,7 @@ private:
bool m_runConfigure = false; bool m_runConfigure = false;
}; };
ConfigureStep::ConfigureStep(BuildStepList *bsl, Core::Id id) ConfigureStep::ConfigureStep(BuildStepList *bsl, Utils::Id id)
: AbstractProcessStep(bsl, id) : AbstractProcessStep(bsl, id)
{ {
setDefaultDisplayName(tr("Configure")); setDefaultDisplayName(tr("Configure"));

4
src/plugins/autotoolsprojectmanager/makestep.cpp
View File

@@ -41,10 +41,10 @@ namespace Internal {
class MakeStep : public ProjectExplorer::MakeStep class MakeStep : public ProjectExplorer::MakeStep
{ {
public: public:
MakeStep(ProjectExplorer::BuildStepList *bsl, Core::Id id); MakeStep(ProjectExplorer::BuildStepList *bsl, Utils::Id id);
}; };
MakeStep::MakeStep(ProjectExplorer::BuildStepList *bsl, Core::Id id) MakeStep::MakeStep(ProjectExplorer::BuildStepList *bsl, Utils::Id id)
: ProjectExplorer::MakeStep(bsl, id) : ProjectExplorer::MakeStep(bsl, id)
{ {
setAvailableBuildTargets({"all", "clean"}); setAvailableBuildTargets({"all", "clean"});

2
src/plugins/baremetal/baremetaldeviceconfigurationwizard.cpp
View File

@@ -48,7 +48,7 @@ BareMetalDeviceConfigurationWizard::BareMetalDeviceConfigurationWizard(QWidget *
ProjectExplorer::IDevice::Ptr BareMetalDeviceConfigurationWizard::device() const ProjectExplorer::IDevice::Ptr BareMetalDeviceConfigurationWizard::device() const
{ {
const auto dev = BareMetalDevice::create(); const auto dev = BareMetalDevice::create();
dev->setupId(ProjectExplorer::IDevice::ManuallyAdded, Core::Id()); dev->setupId(ProjectExplorer::IDevice::ManuallyAdded, Utils::Id());
dev->setDisplayName(m_setupPage->configurationName()); dev->setDisplayName(m_setupPage->configurationName());
dev->setType(Constants::BareMetalOsType); dev->setType(Constants::BareMetalOsType);
dev->setMachineType(ProjectExplorer::IDevice::Hardware); dev->setMachineType(ProjectExplorer::IDevice::Hardware);

4
src/plugins/baremetal/baremetalrunconfiguration.cpp
View File

@@ -45,7 +45,7 @@ class BareMetalRunConfiguration final : public RunConfiguration
Q_DECLARE_TR_FUNCTIONS(BareMetal::Internal::BareMetalRunConfiguration) Q_DECLARE_TR_FUNCTIONS(BareMetal::Internal::BareMetalRunConfiguration)
public: public:
explicit BareMetalRunConfiguration(Target *target, Core::Id id) explicit BareMetalRunConfiguration(Target *target, Utils::Id id)
: RunConfiguration(target, id) : RunConfiguration(target, id)
{ {
const auto exeAspect = addAspect<ExecutableAspect>(); const auto exeAspect = addAspect<ExecutableAspect>();
@@ -69,7 +69,7 @@ class BareMetalCustomRunConfiguration final : public RunConfiguration
Q_DECLARE_TR_FUNCTIONS(BareMetal::Internal::BareMetalCustomRunConfiguration) Q_DECLARE_TR_FUNCTIONS(BareMetal::Internal::BareMetalCustomRunConfiguration)
public: public:
explicit BareMetalCustomRunConfiguration(Target *target, Core::Id id) explicit BareMetalCustomRunConfiguration(Target *target, Utils::Id id)
: RunConfiguration(target, id) : RunConfiguration(target, id)
{ {
const auto exeAspect = addAspect<ExecutableAspect>(); const auto exeAspect = addAspect<ExecutableAspect>();

2
src/plugins/baremetal/iarewparser.cpp
View File

@@ -54,7 +54,7 @@ IarParser::IarParser()
setObjectName("IarParser"); setObjectName("IarParser");
} }
Core::Id IarParser::id() Utils::Id IarParser::id()
{ {
return "BareMetal.OutputParser.Iar"; return "BareMetal.OutputParser.Iar";
} }

2
src/plugins/baremetal/iarewparser.h
View File

@@ -39,7 +39,7 @@ class IarParser final : public ProjectExplorer::OutputTaskParser
public: public:
explicit IarParser(); explicit IarParser();
static Core::Id id(); static Utils::Id id();
private: private:
void newTask(const ProjectExplorer::Task &task); void newTask(const ProjectExplorer::Task &task);

12
src/plugins/baremetal/iarewtoolchain.cpp
View File

@@ -89,7 +89,7 @@ static QString cppLanguageOption(const FilePath &compiler)
} }
static Macros dumpPredefinedMacros(const FilePath &compiler, const QStringList &extraArgs, static Macros dumpPredefinedMacros(const FilePath &compiler, const QStringList &extraArgs,
const Core::Id languageId, const QStringList &env) const Utils::Id languageId, const QStringList &env)
{ {
if (compiler.isEmpty() || !compiler.toFileInfo().isExecutable()) if (compiler.isEmpty() || !compiler.toFileInfo().isExecutable())
return {}; return {};
@@ -130,7 +130,7 @@ static Macros dumpPredefinedMacros(const FilePath &compiler, const QStringList &
return Macro::toMacros(output); return Macro::toMacros(output);
} }
static HeaderPaths dumpHeaderPaths(const FilePath &compiler, const Core::Id languageId, static HeaderPaths dumpHeaderPaths(const FilePath &compiler, const Utils::Id languageId,
const QStringList &env) const QStringList &env)
{ {
if (!compiler.exists()) if (!compiler.exists())
@@ -280,7 +280,7 @@ static Abi guessAbi(const Macros &macros)
guessFormat(arch), guessWordWidth(macros)}; guessFormat(arch), guessWordWidth(macros)};
} }
static QString buildDisplayName(Abi::Architecture arch, Core::Id language, static QString buildDisplayName(Abi::Architecture arch, Utils::Id language,
const QString &version) const QString &version)
{ {
const auto archName = Abi::toString(arch); const auto archName = Abi::toString(arch);
@@ -320,7 +320,7 @@ ToolChain::MacroInspectionRunner IarToolChain::createMacroInspectionRunner() con
addToEnvironment(env); addToEnvironment(env);
const Utils::FilePath compilerCommand = m_compilerCommand; const Utils::FilePath compilerCommand = m_compilerCommand;
const Core::Id languageId = language(); const Utils::Id languageId = language();
const QStringList extraArgs = m_extraCodeModelFlags; const QStringList extraArgs = m_extraCodeModelFlags;
MacrosCache macrosCache = predefinedMacrosCache(); MacrosCache macrosCache = predefinedMacrosCache();
@@ -367,7 +367,7 @@ ToolChain::BuiltInHeaderPathsRunner IarToolChain::createBuiltInHeaderPathsRunner
addToEnvironment(env); addToEnvironment(env);
const Utils::FilePath compilerCommand = m_compilerCommand; const Utils::FilePath compilerCommand = m_compilerCommand;
const Core::Id languageId = language(); const Utils::Id languageId = language();
HeaderPathsCache headerPaths = headerPathsCache(); HeaderPathsCache headerPaths = headerPathsCache();
@@ -583,7 +583,7 @@ QList<ToolChain *> IarToolChainFactory::autoDetectToolchains(
} }
QList<ToolChain *> IarToolChainFactory::autoDetectToolchain( QList<ToolChain *> IarToolChainFactory::autoDetectToolchain(
const Candidate &candidate, Core::Id languageId) const const Candidate &candidate, Utils::Id languageId) const
{ {
const auto env = Environment::systemEnvironment(); const auto env = Environment::systemEnvironment();
const Macros macros = dumpPredefinedMacros(candidate.compilerPath, {}, languageId, const Macros macros = dumpPredefinedMacros(candidate.compilerPath, {}, languageId,

2
src/plugins/baremetal/iarewtoolchain.h
View File

@@ -111,7 +111,7 @@ private:
QList<ProjectExplorer::ToolChain *> autoDetectToolchains(const Candidates &candidates, QList<ProjectExplorer::ToolChain *> autoDetectToolchains(const Candidates &candidates,
const QList<ProjectExplorer::ToolChain *> &alreadyKnown) const; const QList<ProjectExplorer::ToolChain *> &alreadyKnown) const;
QList<ProjectExplorer::ToolChain *> autoDetectToolchain( QList<ProjectExplorer::ToolChain *> autoDetectToolchain(
const Candidate &candidate, Core::Id languageId) const; const Candidate &candidate, Utils::Id languageId) const;
}; };
// IarToolChainConfigWidget // IarToolChainConfigWidget

1
src/plugins/baremetal/idebugserverprovider.h
View File

@@ -25,7 +25,6 @@
#pragma once #pragma once
#include <coreplugin/id.h>
#include <debugger/debuggerconstants.h> #include <debugger/debuggerconstants.h>
#include <projectexplorer/abi.h> #include <projectexplorer/abi.h>
#include <utils/fileutils.h> #include <utils/fileutils.h>

2
src/plugins/baremetal/keilparser.cpp
View File

@@ -56,7 +56,7 @@ KeilParser::KeilParser()
setObjectName("KeilParser"); setObjectName("KeilParser");
} }
Core::Id KeilParser::id() Utils::Id KeilParser::id()
{ {
return "BareMetal.OutputParser.Keil"; return "BareMetal.OutputParser.Keil";
} }

2
src/plugins/baremetal/keilparser.h
View File

@@ -39,7 +39,7 @@ class KeilParser final : public ProjectExplorer::OutputTaskParser
public: public:
explicit KeilParser(); explicit KeilParser();
static Core::Id id(); static Utils::Id id();
private: private:
void newTask(const ProjectExplorer::Task &task); void newTask(const ProjectExplorer::Task &task);

6
src/plugins/baremetal/keiltoolchain.cpp
View File

@@ -404,7 +404,7 @@ static Abi guessAbi(const Macros &macros)
guessFormat(arch), guessWordWidth(macros, arch)}; guessFormat(arch), guessWordWidth(macros, arch)};
} }
static QString buildDisplayName(Abi::Architecture arch, Core::Id language, static QString buildDisplayName(Abi::Architecture arch, Utils::Id language,
const QString &version) const QString &version)
{ {
const auto archName = Abi::toString(arch); const auto archName = Abi::toString(arch);
@@ -459,7 +459,7 @@ ToolChain::MacroInspectionRunner KeilToolChain::createMacroInspectionRunner() co
addToEnvironment(env); addToEnvironment(env);
const Utils::FilePath compilerCommand = m_compilerCommand; const Utils::FilePath compilerCommand = m_compilerCommand;
const Core::Id lang = language(); const Utils::Id lang = language();
MacrosCache macroCache = predefinedMacrosCache(); MacrosCache macroCache = predefinedMacrosCache();
const QStringList extraArgs = m_extraCodeModelFlags; const QStringList extraArgs = m_extraCodeModelFlags;
@@ -734,7 +734,7 @@ QList<ToolChain *> KeilToolChainFactory::autoDetectToolchains(
} }
QList<ToolChain *> KeilToolChainFactory::autoDetectToolchain( QList<ToolChain *> KeilToolChainFactory::autoDetectToolchain(
const Candidate &candidate, Core::Id language) const const Candidate &candidate, Utils::Id language) const
{ {
const auto env = Environment::systemEnvironment(); const auto env = Environment::systemEnvironment();

2
src/plugins/baremetal/keiltoolchain.h
View File

@@ -112,7 +112,7 @@ private:
QList<ProjectExplorer::ToolChain *> autoDetectToolchains(const Candidates &candidates, QList<ProjectExplorer::ToolChain *> autoDetectToolchains(const Candidates &candidates,
const QList<ProjectExplorer::ToolChain *> &alreadyKnown) const; const QList<ProjectExplorer::ToolChain *> &alreadyKnown) const;
QList<ProjectExplorer::ToolChain *> autoDetectToolchain( QList<ProjectExplorer::ToolChain *> autoDetectToolchain(
const Candidate &candidate, Core::Id language) const; const Candidate &candidate, Utils::Id language) const;
}; };
// KeilToolchainConfigWidget // KeilToolchainConfigWidget

2
src/plugins/baremetal/sdccparser.cpp
View File

@@ -56,7 +56,7 @@ SdccParser::SdccParser()
setObjectName("SdccParser"); setObjectName("SdccParser");
} }
Core::Id SdccParser::id() Utils::Id SdccParser::id()
{ {
return "BareMetal.OutputParser.Sdcc"; return "BareMetal.OutputParser.Sdcc";
} }

2
src/plugins/baremetal/sdccparser.h
View File

@@ -39,7 +39,7 @@ class SdccParser final : public ProjectExplorer::OutputTaskParser
public: public:
explicit SdccParser(); explicit SdccParser();
static Core::Id id(); static Utils::Id id();
private: private:
void newTask(const ProjectExplorer::Task &task); void newTask(const ProjectExplorer::Task &task);

6
src/plugins/baremetal/sdcctoolchain.cpp
View File

@@ -197,7 +197,7 @@ static Abi guessAbi(const Macros &macros)
guessFormat(arch), guessWordWidth(macros)}; guessFormat(arch), guessWordWidth(macros)};
} }
static QString buildDisplayName(Abi::Architecture arch, Core::Id language, static QString buildDisplayName(Abi::Architecture arch, Utils::Id language,
const QString &version) const QString &version)
{ {
const auto archName = Abi::toString(arch); const auto archName = Abi::toString(arch);
@@ -244,7 +244,7 @@ ToolChain::MacroInspectionRunner SdccToolChain::createMacroInspectionRunner() co
addToEnvironment(env); addToEnvironment(env);
const Utils::FilePath compilerCommand = m_compilerCommand; const Utils::FilePath compilerCommand = m_compilerCommand;
const Core::Id lang = language(); const Utils::Id lang = language();
const Abi abi = m_targetAbi; const Abi abi = m_targetAbi;
MacrosCache macrosCache = predefinedMacrosCache(); MacrosCache macrosCache = predefinedMacrosCache();
@@ -458,7 +458,7 @@ QList<ToolChain *> SdccToolChainFactory::autoDetectToolchains(
} }
QList<ToolChain *> SdccToolChainFactory::autoDetectToolchain( QList<ToolChain *> SdccToolChainFactory::autoDetectToolchain(
const Candidate &candidate, Core::Id language) const const Candidate &candidate, Utils::Id language) const
{ {
const auto env = Environment::systemEnvironment(); const auto env = Environment::systemEnvironment();

2
src/plugins/baremetal/sdcctoolchain.h
View File

@@ -107,7 +107,7 @@ private:
QList<ProjectExplorer::ToolChain *> autoDetectToolchains(const Candidates &candidates, QList<ProjectExplorer::ToolChain *> autoDetectToolchains(const Candidates &candidates,
const QList<ProjectExplorer::ToolChain *> &alreadyKnown) const; const QList<ProjectExplorer::ToolChain *> &alreadyKnown) const;
QList<ProjectExplorer::ToolChain *> autoDetectToolchain( QList<ProjectExplorer::ToolChain *> autoDetectToolchain(
const Candidate &candidate, Core::Id language) const; const Candidate &candidate, Utils::Id language) const;
}; };
// SdccToolChainConfigWidget // SdccToolChainConfigWidget

6
src/plugins/bazaar/bazaarclient.cpp
View File

@@ -26,8 +26,6 @@
#include "bazaarclient.h" #include "bazaarclient.h"
#include "constants.h" #include "constants.h"
#include <coreplugin/id.h>
#include <vcsbase/vcsbaseplugin.h> #include <vcsbase/vcsbaseplugin.h>
#include <vcsbase/vcsoutputwindow.h> #include <vcsbase/vcsoutputwindow.h>
#include <vcsbase/vcsbaseeditorconfig.h> #include <vcsbase/vcsbaseeditorconfig.h>
@@ -206,7 +204,7 @@ void BazaarClient::view(const QString &source, const QString &id, const QStringL
VcsBaseClient::view(source, id, args); VcsBaseClient::view(source, id, args);
} }
Core::Id BazaarClient::vcsEditorKind(VcsCommandTag cmd) const Utils::Id BazaarClient::vcsEditorKind(VcsCommandTag cmd) const
{ {
switch (cmd) { switch (cmd) {
case AnnotateCommand: case AnnotateCommand:
@@ -216,7 +214,7 @@ Core::Id BazaarClient::vcsEditorKind(VcsCommandTag cmd) const
case LogCommand: case LogCommand:
return Constants::FILELOG_ID; return Constants::FILELOG_ID;
default: default:
return Core::Id(); return Utils::Id();
} }
} }

2
src/plugins/bazaar/bazaarclient.h
View File

@@ -56,7 +56,7 @@ public:
void view(const QString &source, const QString &id, void view(const QString &source, const QString &id,
const QStringList &extraOptions = QStringList()) override; const QStringList &extraOptions = QStringList()) override;
Core::Id vcsEditorKind(VcsCommandTag cmd) const override; Utils::Id vcsEditorKind(VcsCommandTag cmd) const override;
QString vcsCommandString(VcsCommandTag cmd) const override; QString vcsCommandString(VcsCommandTag cmd) const override;
Utils::ExitCodeInterpreter exitCodeInterpreter(VcsCommandTag cmd) const override; Utils::ExitCodeInterpreter exitCodeInterpreter(VcsCommandTag cmd) const override;
QStringList revisionSpec(const QString &revision) const override; QStringList revisionSpec(const QString &revision) const override;

7
src/plugins/bazaar/bazaarplugin.cpp
View File

@@ -44,7 +44,6 @@
#include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/actionmanager/actioncontainer.h> #include <coreplugin/actionmanager/actioncontainer.h>
#include <coreplugin/actionmanager/command.h> #include <coreplugin/actionmanager/command.h>
#include <coreplugin/id.h>
#include <coreplugin/coreconstants.h> #include <coreplugin/coreconstants.h>
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
#include <coreplugin/idocument.h> #include <coreplugin/idocument.h>
@@ -147,7 +146,7 @@ public:
BazaarPluginPrivate(); BazaarPluginPrivate();
QString displayName() const final; QString displayName() const final;
Core::Id id() const final; Utils::Id id() const final;
bool isVcsFileOrDirectory(const Utils::FilePath &fileName) const final; bool isVcsFileOrDirectory(const Utils::FilePath &fileName) const final;
@@ -840,9 +839,9 @@ QString BazaarPluginPrivate::displayName() const
return tr("Bazaar"); return tr("Bazaar");
} }
Core::Id BazaarPluginPrivate::id() const Utils::Id BazaarPluginPrivate::id() const
{ {
return Core::Id(VcsBase::Constants::VCS_ID_BAZAAR); return Utils::Id(VcsBase::Constants::VCS_ID_BAZAAR);
} }
bool BazaarPluginPrivate::isVcsFileOrDirectory(const Utils::FilePath &fileName) const bool BazaarPluginPrivate::isVcsFileOrDirectory(const Utils::FilePath &fileName) const

2
src/plugins/bineditor/bineditorplugin.cpp
View File

@@ -46,12 +46,12 @@
#include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/coreconstants.h> #include <coreplugin/coreconstants.h>
#include <coreplugin/id.h>
#include <coreplugin/editormanager/editormanager.h> #include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/editormanager/ieditor.h> #include <coreplugin/editormanager/ieditor.h>
#include <coreplugin/find/ifindsupport.h> #include <coreplugin/find/ifindsupport.h>
#include <coreplugin/idocument.h> #include <coreplugin/idocument.h>
#include <extensionsystem/pluginmanager.h> #include <extensionsystem/pluginmanager.h>
#include <utils/reloadpromptutils.h> #include <utils/reloadpromptutils.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>

1
src/plugins/bookmarks/bookmarksplugin.cpp
View File

@@ -48,6 +48,7 @@
using namespace Core; using namespace Core;
using namespace TextEditor; using namespace TextEditor;
using namespace Utils;
using namespace Bookmarks::Constants; using namespace Bookmarks::Constants;

2
src/plugins/boot2qt/device-detection/devicedetector.cpp
View File

@@ -95,7 +95,7 @@ void DeviceDetector::handleDeviceEvent(QdbDeviceTracker::DeviceEventType eventTy
return; return;
} }
const Core::Id deviceId = Constants::QdbHardwareDevicePrefix.withSuffix(':' + serial); const Utils::Id deviceId = Constants::QdbHardwareDevicePrefix.withSuffix(':' + serial);
const auto messagePrefix = tr("Device \"%1\" %2").arg(serial); const auto messagePrefix = tr("Device \"%1\" %2").arg(serial);
DeviceManager * const dm = DeviceManager::instance(); DeviceManager * const dm = DeviceManager::instance();

4
src/plugins/boot2qt/qdbconstants.h
View File

@@ -25,7 +25,7 @@
#pragma once #pragma once
#include <coreplugin/id.h> #include <utils/id.h>
namespace Qdb { namespace Qdb {
namespace Constants { namespace Constants {
@@ -37,7 +37,7 @@ const char QdbDeployConfigurationId[] = "Qt4ProjectManager.Qdb.QdbDeployConfigur
const char QdbStopApplicationStepId[] = "Qdb.StopApplicationStep"; const char QdbStopApplicationStepId[] = "Qdb.StopApplicationStep";
const char QdbMakeDefaultAppStepId[] = "Qdb.MakeDefaultAppStep"; const char QdbMakeDefaultAppStepId[] = "Qdb.MakeDefaultAppStep";
const Core::Id QdbHardwareDevicePrefix = "QdbHardwareDevice"; const Utils::Id QdbHardwareDevicePrefix = "QdbHardwareDevice";
const char AppcontrollerFilepath[] = "/usr/bin/appcontroller"; const char AppcontrollerFilepath[] = "/usr/bin/appcontroller";
} // namespace Constants } // namespace Constants

2
src/plugins/boot2qt/qdbdevice.cpp
View File

@@ -264,7 +264,7 @@ public:
QdbDevice::Ptr device = QdbDevice::create(); QdbDevice::Ptr device = QdbDevice::create();
device->setDisplayName(settingsPage.deviceName()); device->setDisplayName(settingsPage.deviceName());
device->setupId(ProjectExplorer::IDevice::ManuallyAdded, Core::Id()); device->setupId(ProjectExplorer::IDevice::ManuallyAdded, Utils::Id());
device->setType(Constants::QdbLinuxOsType); device->setType(Constants::QdbLinuxOsType);
device->setMachineType(ProjectExplorer::IDevice::Hardware); device->setMachineType(ProjectExplorer::IDevice::Hardware);

4
src/plugins/boot2qt/qdbmakedefaultappstep.cpp
View File

@@ -42,12 +42,12 @@ class QdbMakeDefaultAppStep final : public RemoteLinux::AbstractRemoteLinuxDeplo
Q_DECLARE_TR_FUNCTIONS(Qdb::Internal::QdbMakeDefaultAppStep) Q_DECLARE_TR_FUNCTIONS(Qdb::Internal::QdbMakeDefaultAppStep)
public: public:
QdbMakeDefaultAppStep(BuildStepList *bsl, Core::Id id); QdbMakeDefaultAppStep(BuildStepList *bsl, Utils::Id id);
static QString stepDisplayName() { return tr("Change default application"); } static QString stepDisplayName() { return tr("Change default application"); }
}; };
QdbMakeDefaultAppStep::QdbMakeDefaultAppStep(BuildStepList *bsl, Core::Id id) QdbMakeDefaultAppStep::QdbMakeDefaultAppStep(BuildStepList *bsl, Utils::Id id)
: AbstractRemoteLinuxDeployStep(bsl, id) : AbstractRemoteLinuxDeployStep(bsl, id)
{ {
setDefaultDisplayName(stepDisplayName()); setDefaultDisplayName(stepDisplayName());

4
src/plugins/boot2qt/qdbplugin.cpp
View File

@@ -155,7 +155,7 @@ template <class Step>
class QdbDeployStepFactory : public ProjectExplorer::BuildStepFactory class QdbDeployStepFactory : public ProjectExplorer::BuildStepFactory
{ {
public: public:
explicit QdbDeployStepFactory(Core::Id id) explicit QdbDeployStepFactory(Utils::Id id)
{ {
registerStep<Step>(id); registerStep<Step>(id);
setDisplayName(Step::displayName()); setDisplayName(Step::displayName());
@@ -183,7 +183,7 @@ public:
QdbDeployStepFactory<RemoteLinux::MakeInstallStep> QdbDeployStepFactory<RemoteLinux::MakeInstallStep>
m_makeInstallStepFactory{RemoteLinux::Constants::MakeInstallStepId}; m_makeInstallStepFactory{RemoteLinux::Constants::MakeInstallStepId};
const QList<Core::Id> supportedRunConfigs { const QList<Utils::Id> supportedRunConfigs {
m_runConfigFactory.runConfigurationId(), m_runConfigFactory.runConfigurationId(),
"QmlProjectManager.QmlRunConfiguration" "QmlProjectManager.QmlRunConfiguration"
}; };

6
src/plugins/boot2qt/qdbqtversion.cpp
View File

@@ -27,8 +27,6 @@
#include "qdbconstants.h" #include "qdbconstants.h"
#include <coreplugin/id.h>
namespace Qdb { namespace Qdb {
namespace Internal { namespace Internal {
@@ -37,9 +35,9 @@ QString QdbQtVersion::description() const
return QCoreApplication::translate("QtVersion", "Boot2Qt", "Qt version is used for Boot2Qt development"); return QCoreApplication::translate("QtVersion", "Boot2Qt", "Qt version is used for Boot2Qt development");
} }
QSet<Core::Id> QdbQtVersion::targetDeviceTypes() const QSet<Utils::Id> QdbQtVersion::targetDeviceTypes() const
{ {
return {Core::Id(Constants::QdbLinuxOsType)}; return {Utils::Id(Constants::QdbLinuxOsType)};
} }

2
src/plugins/boot2qt/qdbqtversion.h
View File

@@ -37,7 +37,7 @@ public:
~QdbQtVersion() = default; ~QdbQtVersion() = default;
QString description() const final; QString description() const final;
QSet<Core::Id> targetDeviceTypes() const final; QSet<Utils::Id> targetDeviceTypes() const final;
}; };
} // namespace Internal } // namespace Internal

4
src/plugins/boot2qt/qdbrunconfiguration.cpp
View File

@@ -77,14 +77,14 @@ class QdbRunConfiguration : public RunConfiguration
Q_DECLARE_TR_FUNCTIONS(Qdb::Internal::QdbRunConfiguration); Q_DECLARE_TR_FUNCTIONS(Qdb::Internal::QdbRunConfiguration);
public: public:
QdbRunConfiguration(Target *target, Core::Id id); QdbRunConfiguration(Target *target, Utils::Id id);
private: private:
Tasks checkForIssues() const override; Tasks checkForIssues() const override;
QString defaultDisplayName() const; QString defaultDisplayName() const;
}; };
QdbRunConfiguration::QdbRunConfiguration(Target *target, Core::Id id) QdbRunConfiguration::QdbRunConfiguration(Target *target, Utils::Id id)
: RunConfiguration(target, id) : RunConfiguration(target, id)
{ {
auto exeAspect = addAspect<ExecutableAspect>(); auto exeAspect = addAspect<ExecutableAspect>();

4
src/plugins/boot2qt/qdbstopapplicationstep.cpp
View File

@@ -42,12 +42,12 @@ class QdbStopApplicationStep final : public RemoteLinux::AbstractRemoteLinuxDepl
Q_DECLARE_TR_FUNCTIONS(Qdb::Internal::QdbStopApplicationStep) Q_DECLARE_TR_FUNCTIONS(Qdb::Internal::QdbStopApplicationStep)
public: public:
QdbStopApplicationStep(BuildStepList *bsl, Core::Id id); QdbStopApplicationStep(BuildStepList *bsl, Utils::Id id);
static QString stepDisplayName() { return tr("Stop already running application"); } static QString stepDisplayName() { return tr("Stop already running application"); }
}; };
QdbStopApplicationStep::QdbStopApplicationStep(BuildStepList *bsl, Core::Id id) QdbStopApplicationStep::QdbStopApplicationStep(BuildStepList *bsl, Utils::Id id)
: AbstractRemoteLinuxDeployStep(bsl, id) : AbstractRemoteLinuxDeployStep(bsl, id)
{ {
auto service = createDeployService<QdbStopApplicationService>(); auto service = createDeployService<QdbStopApplicationService>();

8
src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
View File

@@ -180,7 +180,7 @@ void ClangEditorDocumentProcessor::clearProjectPart()
m_projectPart.clear(); m_projectPart.clear();
} }
Core::Id ClangEditorDocumentProcessor::diagnosticConfigId() const ::Utils::Id ClangEditorDocumentProcessor::diagnosticConfigId() const
{ {
return m_diagnosticConfigId; return m_diagnosticConfigId;
} }
@@ -451,7 +451,7 @@ public:
} }
const QStringList &options() const { return m_options; } const QStringList &options() const { return m_options; }
const Core::Id &diagnosticConfigId() const { return m_diagnosticConfigId; } const ::Utils::Id &diagnosticConfigId() const { return m_diagnosticConfigId; }
CppTools::UseBuildSystemWarnings useBuildSystemWarnings() const CppTools::UseBuildSystemWarnings useBuildSystemWarnings() const
{ {
return m_useBuildSystemWarnings; return m_useBuildSystemWarnings;
@@ -479,7 +479,7 @@ private:
if (m_projectPart.project) { if (m_projectPart.project) {
ClangProjectSettings &projectSettings = getProjectSettings(m_projectPart.project); ClangProjectSettings &projectSettings = getProjectSettings(m_projectPart.project);
if (!projectSettings.useGlobalConfig()) { if (!projectSettings.useGlobalConfig()) {
const Core::Id warningConfigId = projectSettings.warningConfigId(); const ::Utils::Id warningConfigId = projectSettings.warningConfigId();
const CppTools::ClangDiagnosticConfigsModel configsModel const CppTools::ClangDiagnosticConfigsModel configsModel
= CppTools::diagnosticConfigsModel(); = CppTools::diagnosticConfigsModel();
if (configsModel.hasConfigWithId(warningConfigId)) { if (configsModel.hasConfigWithId(warningConfigId)) {
@@ -538,7 +538,7 @@ private:
const QString &m_filePath; const QString &m_filePath;
const CppTools::ProjectPart &m_projectPart; const CppTools::ProjectPart &m_projectPart;
Core::Id m_diagnosticConfigId; ::Utils::Id m_diagnosticConfigId;
CppTools::UseBuildSystemWarnings m_useBuildSystemWarnings = CppTools::UseBuildSystemWarnings::No; CppTools::UseBuildSystemWarnings m_useBuildSystemWarnings = CppTools::UseBuildSystemWarnings::No;
CppTools::CompilerOptionsBuilder m_builder; CppTools::CompilerOptionsBuilder m_builder;
bool m_isClMode = false; bool m_isClMode = false;

7
src/plugins/clangcodemodel/clangeditordocumentprocessor.h
View File

@@ -28,10 +28,11 @@
#include "clangdiagnosticmanager.h" #include "clangdiagnosticmanager.h"
#include "clangeditordocumentparser.h" #include "clangeditordocumentparser.h"
#include <coreplugin/id.h>
#include <cpptools/builtineditordocumentprocessor.h> #include <cpptools/builtineditordocumentprocessor.h>
#include <cpptools/semantichighlighter.h> #include <cpptools/semantichighlighter.h>
#include <utils/id.h>
#include <QFutureWatcher> #include <QFutureWatcher>
#include <QTimer> #include <QTimer>
@@ -68,7 +69,7 @@ public:
CppTools::ProjectPart::Ptr projectPart() const; CppTools::ProjectPart::Ptr projectPart() const;
void clearProjectPart(); void clearProjectPart();
Core::Id diagnosticConfigId() const; ::Utils::Id diagnosticConfigId() const;
void updateCodeWarnings(const QVector<ClangBackEnd::DiagnosticContainer> &diagnostics, void updateCodeWarnings(const QVector<ClangBackEnd::DiagnosticContainer> &diagnostics,
const ClangBackEnd::DiagnosticContainer &firstHeaderErrorDiagnostic, const ClangBackEnd::DiagnosticContainer &firstHeaderErrorDiagnostic,
@@ -134,7 +135,7 @@ private:
BackendCommunicator &m_communicator; BackendCommunicator &m_communicator;
QSharedPointer<ClangEditorDocumentParser> m_parser; QSharedPointer<ClangEditorDocumentParser> m_parser;
CppTools::ProjectPart::Ptr m_projectPart; CppTools::ProjectPart::Ptr m_projectPart;
Core::Id m_diagnosticConfigId; ::Utils::Id m_diagnosticConfigId;
bool m_isProjectFile = false; bool m_isProjectFile = false;
QFutureWatcher<void> m_parserWatcher; QFutureWatcher<void> m_parserWatcher;
QTimer m_updateBackendDocumentTimer; QTimer m_updateBackendDocumentTimer;

4
src/plugins/clangcodemodel/clangmodelmanagersupport.cpp
View File

@@ -425,14 +425,14 @@ void ClangModelManagerSupport::onProjectPartsRemoved(const QStringList &projectP
} }
static ClangEditorDocumentProcessors clangProcessorsWithDiagnosticConfig( static ClangEditorDocumentProcessors clangProcessorsWithDiagnosticConfig(
const QVector<Core::Id> &configIds) const QVector<::Utils::Id> &configIds)
{ {
return ::Utils::filtered(clangProcessors(), [configIds](ClangEditorDocumentProcessor *p) { return ::Utils::filtered(clangProcessors(), [configIds](ClangEditorDocumentProcessor *p) {
return configIds.contains(p->diagnosticConfigId()); return configIds.contains(p->diagnosticConfigId());
}); });
} }
void ClangModelManagerSupport::onDiagnosticConfigsInvalidated(const QVector<Core::Id> &configIds) void ClangModelManagerSupport::onDiagnosticConfigsInvalidated(const QVector<::Utils::Id> &configIds)
{ {
updateProcessors(clangProcessorsWithDiagnosticConfig(configIds)); updateProcessors(clangProcessorsWithDiagnosticConfig(configIds));
} }

8
src/plugins/clangcodemodel/clangmodelmanagersupport.h
View File

@@ -30,8 +30,9 @@
#include <cpptools/cppmodelmanagersupport.h> #include <cpptools/cppmodelmanagersupport.h>
#include <utils/id.h>
#include <QObject> #include <QObject>
#include <QScopedPointer>
#include <memory> #include <memory>
@@ -40,9 +41,6 @@ class QMenu;
class QWidget; class QWidget;
QT_END_NAMESPACE QT_END_NAMESPACE
namespace Core {
class IDocument;
} // namespace Core
namespace TextEditor { class TextEditorWidget; } namespace TextEditor { class TextEditorWidget; }
namespace CppTools { namespace CppTools {
class FollowSymbolInterface; class FollowSymbolInterface;
@@ -108,7 +106,7 @@ private:
void onProjectPartsUpdated(ProjectExplorer::Project *project); void onProjectPartsUpdated(ProjectExplorer::Project *project);
void onProjectPartsRemoved(const QStringList &projectPartIds); void onProjectPartsRemoved(const QStringList &projectPartIds);
void onDiagnosticConfigsInvalidated(const QVector<Core::Id> &configIds); void onDiagnosticConfigsInvalidated(const QVector<::Utils::Id> &configIds);
void reinitializeBackendDocuments(const QStringList &projectPartIds); void reinitializeBackendDocuments(const QStringList &projectPartIds);

8
src/plugins/clangcodemodel/clangprojectsettings.cpp
View File

@@ -51,9 +51,9 @@ static bool useGlobalConfigFromSettings(ProjectExplorer::Project *project)
return useGlobalConfigVariant.isValid() ? useGlobalConfigVariant.toBool() : true; return useGlobalConfigVariant.isValid() ? useGlobalConfigVariant.toBool() : true;
} }
static Core::Id warningConfigIdFromSettings(ProjectExplorer::Project *project) static Utils::Id warningConfigIdFromSettings(ProjectExplorer::Project *project)
{ {
return Core::Id::fromSetting(project->namedSettings(warningConfigIdKey())); return Utils::Id::fromSetting(project->namedSettings(warningConfigIdKey()));
} }
static QStringList customCommandLineFromSettings(ProjectExplorer::Project *project) static QStringList customCommandLineFromSettings(ProjectExplorer::Project *project)
@@ -75,7 +75,7 @@ ClangProjectSettings::ClangProjectSettings(ProjectExplorer::Project *project)
this, &ClangProjectSettings::store); this, &ClangProjectSettings::store);
} }
Core::Id ClangProjectSettings::warningConfigId() const Utils::Id ClangProjectSettings::warningConfigId() const
{ {
const CppTools::ClangDiagnosticConfigsModel model = CppTools::diagnosticConfigsModel(); const CppTools::ClangDiagnosticConfigsModel model = CppTools::diagnosticConfigsModel();
if (!model.hasConfigWithId(m_warningConfigId)) if (!model.hasConfigWithId(m_warningConfigId))
@@ -83,7 +83,7 @@ Core::Id ClangProjectSettings::warningConfigId() const
return m_warningConfigId; return m_warningConfigId;
} }
void ClangProjectSettings::setWarningConfigId(const Core::Id &customConfigId) void ClangProjectSettings::setWarningConfigId(const Utils::Id &customConfigId)
{ {
m_warningConfigId = customConfigId; m_warningConfigId = customConfigId;
} }

9
src/plugins/clangcodemodel/clangprojectsettings.h
View File

@@ -25,9 +25,10 @@
#pragma once #pragma once
#include <coreplugin/id.h>
#include <projectexplorer/project.h> #include <projectexplorer/project.h>
#include <utils/id.h>
#include <QObject> #include <QObject>
#include <QString> #include <QString>
@@ -48,8 +49,8 @@ public:
bool useGlobalConfig() const; bool useGlobalConfig() const;
void setUseGlobalConfig(bool useGlobalConfig); void setUseGlobalConfig(bool useGlobalConfig);
Core::Id warningConfigId() const; ::Utils::Id warningConfigId() const;
void setWarningConfigId(const Core::Id &warningConfigId); void setWarningConfigId(const ::Utils::Id &warningConfigId);
QStringList commandLineOptions() const; QStringList commandLineOptions() const;
void setCommandLineOptions(const QStringList &options); void setCommandLineOptions(const QStringList &options);
@@ -65,7 +66,7 @@ signals:
private: private:
ProjectExplorer::Project *m_project; ProjectExplorer::Project *m_project;
bool m_useGlobalConfig = true; bool m_useGlobalConfig = true;
Core::Id m_warningConfigId; ::Utils::Id m_warningConfigId;
QStringList m_customCommandLineOptions; QStringList m_customCommandLineOptions;
}; };

6
src/plugins/clangcodemodel/clangprojectsettingswidget.cpp
View File

@@ -41,7 +41,7 @@
namespace ClangCodeModel { namespace ClangCodeModel {
namespace Internal { namespace Internal {
static Core::Id configIdForProject(ClangProjectSettings &projectSettings) static Utils::Id configIdForProject(ClangProjectSettings &projectSettings)
{ {
if (projectSettings.useGlobalConfig()) if (projectSettings.useGlobalConfig())
return CppTools::codeModelSettings()->clangDiagnosticConfigId(); return CppTools::codeModelSettings()->clangDiagnosticConfigId();
@@ -67,7 +67,7 @@ ClangProjectSettingsWidget::ClangProjectSettingsWidget(ProjectExplorer::Project
this, this,
[this]() { [this]() {
// Save project's config id // Save project's config id
const Core::Id currentConfigId = m_ui.clangDiagnosticConfigsSelectionWidget const Utils::Id currentConfigId = m_ui.clangDiagnosticConfigsSelectionWidget
->currentConfigId(); ->currentConfigId();
m_projectSettings.setWarningConfigId(currentConfigId); m_projectSettings.setWarningConfigId(currentConfigId);
@@ -150,7 +150,7 @@ void ClangProjectSettingsWidget::syncOtherWidgetsToComboBox()
->refresh(CppTools::diagnosticConfigsModel(), ->refresh(CppTools::diagnosticConfigsModel(),
configIdForProject(m_projectSettings), configIdForProject(m_projectSettings),
[](const CppTools::ClangDiagnosticConfigs &configs, [](const CppTools::ClangDiagnosticConfigs &configs,
const Core::Id &configToSelect) { const Utils::Id &configToSelect) {
return new CppTools::ClangDiagnosticConfigsWidget(configs, configToSelect); return new CppTools::ClangDiagnosticConfigsWidget(configs, configToSelect);
}); });
} }

4
src/plugins/clangcodemodel/clangtextmark.cpp
View File

@@ -71,7 +71,7 @@ bool isWarningOrNote(ClangBackEnd::DiagnosticSeverity severity)
Q_UNREACHABLE(); Q_UNREACHABLE();
} }
static Core::Id categoryForSeverity(ClangBackEnd::DiagnosticSeverity severity) static ::Utils::Id categoryForSeverity(ClangBackEnd::DiagnosticSeverity severity)
{ {
return isWarningOrNote(severity) ? Constants::CLANG_WARNING : Constants::CLANG_ERROR; return isWarningOrNote(severity) ? Constants::CLANG_WARNING : Constants::CLANG_ERROR;
} }
@@ -134,7 +134,7 @@ ClangDiagnosticConfig diagnosticConfig(const ClangProjectSettings &projectSettin
QTC_ASSERT(project, return {}); QTC_ASSERT(project, return {});
// Get config id // Get config id
Core::Id currentConfigId = projectSettings.warningConfigId(); ::Utils::Id currentConfigId = projectSettings.warningConfigId();
if (projectSettings.useGlobalConfig()) if (projectSettings.useGlobalConfig())
currentConfigId = globalSettings.clangDiagnosticConfigId(); currentConfigId = globalSettings.clangDiagnosticConfigId();

3
src/plugins/clangformat/clangformatutils.h
View File

@@ -25,8 +25,9 @@
#pragma once #pragma once
#include <coreplugin/id.h>
#include <utils/fileutils.h> #include <utils/fileutils.h>
#include <utils/id.h>
#include <clang/Format/Format.h> #include <clang/Format/Format.h>
#include <QFile> #include <QFile>

2
src/plugins/clangrefactoring/locatorfilter.h
View File

@@ -39,7 +39,7 @@ public:
LocatorFilter(SymbolQueryInterface &symbolQuery, LocatorFilter(SymbolQueryInterface &symbolQuery,
EditorManagerInterface &editorManager, EditorManagerInterface &editorManager,
ClangBackEnd::SymbolKinds &&symbolKinds, ClangBackEnd::SymbolKinds &&symbolKinds,
Core::Id id, Utils::Id id,
const QString &displayName, const QString &displayName,
const QString &shortCut, const QString &shortCut,
bool includedByDefault=false) bool includedByDefault=false)

6
src/plugins/clangtools/clangtool.cpp
View File

@@ -376,7 +376,7 @@ static RunSettings runSettings()
return ClangToolsSettings::instance()->runSettings(); return ClangToolsSettings::instance()->runSettings();
} }
static ClangDiagnosticConfig diagnosticConfig(const Core::Id &diagConfigId) static ClangDiagnosticConfig diagnosticConfig(const Utils::Id &diagConfigId)
{ {
const ClangDiagnosticConfigsModel configs = diagnosticConfigsModel(); const ClangDiagnosticConfigsModel configs = diagnosticConfigsModel();
QTC_ASSERT(configs.hasConfigWithId(diagConfigId), return ClangDiagnosticConfig()); QTC_ASSERT(configs.hasConfigWithId(diagConfigId), return ClangDiagnosticConfig());
@@ -879,8 +879,8 @@ void ClangTool::reset()
static bool canAnalyzeProject(Project *project) static bool canAnalyzeProject(Project *project)
{ {
if (const Target *target = project->activeTarget()) { if (const Target *target = project->activeTarget()) {
const Core::Id c = ProjectExplorer::Constants::C_LANGUAGE_ID; const Utils::Id c = ProjectExplorer::Constants::C_LANGUAGE_ID;
const Core::Id cxx = ProjectExplorer::Constants::CXX_LANGUAGE_ID; const Utils::Id cxx = ProjectExplorer::Constants::CXX_LANGUAGE_ID;
const bool projectSupportsLanguage = project->projectLanguages().contains(c) const bool projectSupportsLanguage = project->projectLanguages().contains(c)
|| project->projectLanguages().contains(cxx); || project->projectLanguages().contains(cxx);
return projectSupportsLanguage return projectSupportsLanguage

2
src/plugins/clangtools/clangtoolruncontrol.h
View File

@@ -116,7 +116,7 @@ private:
CppTools::ProjectInfo m_projectInfoBeforeBuild; CppTools::ProjectInfo m_projectInfoBeforeBuild;
CppTools::ProjectInfo m_projectInfo; CppTools::ProjectInfo m_projectInfo;
QString m_targetTriple; QString m_targetTriple;
Core::Id m_toolChainType; Utils::Id m_toolChainType;
QFutureInterface<void> m_progress; QFutureInterface<void> m_progress;
QueueItems m_queue; QueueItems m_queue;

2
src/plugins/clangtools/clangtoolsdiagnosticmodel.cpp
View File

@@ -382,7 +382,7 @@ static TextEditor::TextMark *generateDiagnosticTextMark(const Diagnostic &diag)
{ {
auto mark = new TextEditor::TextMark(Utils::FilePath::fromString(diag.location.filePath), auto mark = new TextEditor::TextMark(Utils::FilePath::fromString(diag.location.filePath),
diag.location.line, diag.location.line,
Core::Id("ClangTool.DiagnosticMark")); Utils::Id("ClangTool.DiagnosticMark"));
if (diag.type == "error" || diag.type == "fatal") if (diag.type == "error" || diag.type == "fatal")
mark->setColor(Utils::Theme::CodeModel_Error_TextMarkColor); mark->setColor(Utils::Theme::CodeModel_Error_TextMarkColor);
else else

1
src/plugins/clangtools/clangtoolsprojectsettings.h
View File

@@ -27,7 +27,6 @@
#include "clangtoolssettings.h" #include "clangtoolssettings.h"
#include <coreplugin/id.h>
#include <projectexplorer/project.h> #include <projectexplorer/project.h>
#include <utils/fileutils.h> #include <utils/fileutils.h>

6
src/plugins/clangtools/clangtoolssettings.cpp
View File

@@ -50,7 +50,7 @@ using namespace CppTools;
namespace ClangTools { namespace ClangTools {
namespace Internal { namespace Internal {
static Core::Id defaultDiagnosticId() static Utils::Id defaultDiagnosticId()
{ {
return ClangTools::Constants::DIAG_CONFIG_TIDY_AND_CLAZY; return ClangTools::Constants::DIAG_CONFIG_TIDY_AND_CLAZY;
} }
@@ -63,7 +63,7 @@ RunSettings::RunSettings()
void RunSettings::fromMap(const QVariantMap &map, const QString &prefix) void RunSettings::fromMap(const QVariantMap &map, const QString &prefix)
{ {
m_diagnosticConfigId = Core::Id::fromSetting(map.value(prefix + diagnosticConfigIdKey)); m_diagnosticConfigId = Utils::Id::fromSetting(map.value(prefix + diagnosticConfigIdKey));
m_parallelJobs = map.value(prefix + parallelJobsKey).toInt(); m_parallelJobs = map.value(prefix + parallelJobsKey).toInt();
m_buildBeforeAnalysis = map.value(prefix + buildBeforeAnalysisKey).toBool(); m_buildBeforeAnalysis = map.value(prefix + buildBeforeAnalysisKey).toBool();
} }
@@ -75,7 +75,7 @@ void RunSettings::toMap(QVariantMap &map, const QString &prefix) const
map.insert(prefix + buildBeforeAnalysisKey, m_buildBeforeAnalysis); map.insert(prefix + buildBeforeAnalysisKey, m_buildBeforeAnalysis);
} }
Core::Id RunSettings::diagnosticConfigId() const Utils::Id RunSettings::diagnosticConfigId() const
{ {
if (!diagnosticConfigsModel().hasConfigWithId(m_diagnosticConfigId)) if (!diagnosticConfigsModel().hasConfigWithId(m_diagnosticConfigId))
return defaultDiagnosticId(); return defaultDiagnosticId();

9
src/plugins/clangtools/clangtoolssettings.h
View File

@@ -25,9 +25,10 @@
#pragma once #pragma once
#include <coreplugin/id.h>
#include <cpptools/clangdiagnosticconfig.h> #include <cpptools/clangdiagnosticconfig.h>
#include <utils/id.h>
#include <QObject> #include <QObject>
#include <QString> #include <QString>
@@ -44,8 +45,8 @@ public:
void fromMap(const QVariantMap &map, const QString &prefix = QString()); void fromMap(const QVariantMap &map, const QString &prefix = QString());
void toMap(QVariantMap &map, const QString &prefix = QString()) const; void toMap(QVariantMap &map, const QString &prefix = QString()) const;
Core::Id diagnosticConfigId() const; Utils::Id diagnosticConfigId() const;
void setDiagnosticConfigId(const Core::Id &id) { m_diagnosticConfigId = id; } void setDiagnosticConfigId(const Utils::Id &id) { m_diagnosticConfigId = id; }
bool buildBeforeAnalysis() const { return m_buildBeforeAnalysis; } bool buildBeforeAnalysis() const { return m_buildBeforeAnalysis; }
void setBuildBeforeAnalysis(bool yesno) { m_buildBeforeAnalysis = yesno; } void setBuildBeforeAnalysis(bool yesno) { m_buildBeforeAnalysis = yesno; }
@@ -54,7 +55,7 @@ public:
void setParallelJobs(int jobs) { m_parallelJobs = jobs; } void setParallelJobs(int jobs) { m_parallelJobs = jobs; }
private: private:
Core::Id m_diagnosticConfigId; Utils::Id m_diagnosticConfigId;
int m_parallelJobs = -1; int m_parallelJobs = -1;
bool m_buildBeforeAnalysis = true; bool m_buildBeforeAnalysis = true;
}; };

1
src/plugins/clangtools/clangtoolsutils.h
View File

@@ -25,7 +25,6 @@
#pragma once #pragma once
#include <coreplugin/id.h>
#include <cpptools/clangdiagnosticconfig.h> #include <cpptools/clangdiagnosticconfig.h>
#include <QtGlobal> #include <QtGlobal>

2
src/plugins/clangtools/diagnosticconfigswidget.cpp
View File

@@ -694,7 +694,7 @@ static void setupTreeView(QTreeView *view, QAbstractItemModel *model, int expand
} }
DiagnosticConfigsWidget::DiagnosticConfigsWidget(const ClangDiagnosticConfigs &configs, DiagnosticConfigsWidget::DiagnosticConfigsWidget(const ClangDiagnosticConfigs &configs,
const Core::Id &configToSelect, const Utils::Id &configToSelect,
const ClangTidyInfo &tidyInfo, const ClangTidyInfo &tidyInfo,
const ClazyStandaloneInfo &clazyInfo) const ClazyStandaloneInfo &clazyInfo)
: ClangDiagnosticConfigsWidget(configs, configToSelect) : ClangDiagnosticConfigsWidget(configs, configToSelect)

2
src/plugins/clangtools/diagnosticconfigswidget.h
View File

@@ -50,7 +50,7 @@ class DiagnosticConfigsWidget : public CppTools::ClangDiagnosticConfigsWidget
public: public:
DiagnosticConfigsWidget(const CppTools::ClangDiagnosticConfigs &configs, DiagnosticConfigsWidget(const CppTools::ClangDiagnosticConfigs &configs,
const Core::Id &configToSelect, const Utils::Id &configToSelect,
const ClangTidyInfo &tidyInfo, const ClangTidyInfo &tidyInfo,
const ClazyStandaloneInfo &clazyInfo); const ClazyStandaloneInfo &clazyInfo);
~DiagnosticConfigsWidget(); ~DiagnosticConfigsWidget();

2
src/plugins/clangtools/runsettingswidget.cpp
View File

@@ -57,7 +57,7 @@ CppTools::ClangDiagnosticConfigsSelectionWidget *RunSettingsWidget::diagnosticSe
} }
static CppTools::ClangDiagnosticConfigsWidget *createEditWidget( static CppTools::ClangDiagnosticConfigsWidget *createEditWidget(
const CppTools::ClangDiagnosticConfigs &configs, const Core::Id &configToSelect) const CppTools::ClangDiagnosticConfigs &configs, const Utils::Id &configToSelect)
{ {
// Determine executable paths // Determine executable paths
QString clangTidyPath; QString clangTidyPath;

1
src/plugins/classview/classviewmanager.cpp
View File

@@ -45,6 +45,7 @@
#include <QMutexLocker> #include <QMutexLocker>
using namespace Core; using namespace Core;
using namespace Utils;
namespace ClassView { namespace ClassView {
namespace Internal { namespace Internal {

7
src/plugins/classview/classviewmanager.h
View File

@@ -29,9 +29,10 @@
#include <QSharedPointer> #include <QSharedPointer>
#include <QStandardItem> #include <QStandardItem>
#include <coreplugin/id.h>
#include <cplusplus/CppDocument.h> #include <cplusplus/CppDocument.h>
#include <utils/id.h>
namespace ClassView { namespace ClassView {
namespace Internal { namespace Internal {
@@ -87,8 +88,8 @@ protected:
void onStateChanged(bool state); void onStateChanged(bool state);
void onProjectListChanged(); void onProjectListChanged();
void onDocumentUpdated(CPlusPlus::Document::Ptr doc); void onDocumentUpdated(CPlusPlus::Document::Ptr doc);
void onTaskStarted(Core::Id type); void onTaskStarted(Utils::Id type);
void onAllTasksFinished(Core::Id type); void onAllTasksFinished(Utils::Id type);
void onTreeDataUpdate(QSharedPointer<QStandardItem> result); void onTreeDataUpdate(QSharedPointer<QStandardItem> result);
protected: protected:

Some files were not shown because too many files have changed in this diff Show More