From 83dd0319606bd1eb52d1af937e2dd559721214ef Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Wed, 6 Feb 2019 12:50:51 +0100 Subject: ProjectExplorer: Rename KitInformation to KitAspect The name "KitInformation" does not properly convey the fact that it represents a certain *aspect* of a kit. The same goes for "KitConfigWidget", which in addition was inconsistent with "KitInformation". We now use "KitAspect" and "KitAspectWidget". Change-Id: I9804ee4cedc4d61fad533ea1dd4e4720e67fde97 Reviewed-by: hjk --- src/plugins/android/androidbuildapkstep.cpp | 2 +- src/plugins/android/androidconfigurations.cpp | 26 +- src/plugins/android/androiddebugsupport.cpp | 2 +- src/plugins/android/androiddeployqtstep.cpp | 8 +- .../android/androidgdbserverkitinformation.cpp | 78 +++--- .../android/androidgdbserverkitinformation.h | 14 +- src/plugins/android/androidmanager.cpp | 8 +- .../android/androidmanifesteditorwidget.cpp | 4 +- .../android/androidpackageinstallationstep.cpp | 2 +- src/plugins/android/androidplugin.cpp | 6 +- src/plugins/android/androidpotentialkit.cpp | 4 +- src/plugins/android/androidrunnerworker.cpp | 4 +- .../android/createandroidmanifestwizard.cpp | 4 +- src/plugins/autotest/autotestunittests.cpp | 4 +- src/plugins/autotest/testconfiguration.cpp | 2 +- src/plugins/autotest/testrunner.cpp | 2 +- src/plugins/clangtools/clangtidyclazytool.cpp | 2 +- src/plugins/clangtools/clangtoolruncontrol.cpp | 2 +- .../clangtoolspreconfiguredsessiontests.cpp | 2 +- src/plugins/clangtools/clangtoolsunittests.cpp | 6 +- .../cmakeprojectmanager/builddirparameters.cpp | 18 +- .../cmakebuildconfiguration.cpp | 8 +- .../cmakebuildsettingswidget.cpp | 2 +- src/plugins/cmakeprojectmanager/cmakebuildstep.cpp | 4 +- .../cmakefilecompletionassist.cpp | 2 +- .../cmakeprojectmanager/cmakekitconfigwidget.cpp | 144 +++++------ .../cmakeprojectmanager/cmakekitconfigwidget.h | 30 +-- .../cmakeprojectmanager/cmakekitinformation.cpp | 130 +++++----- .../cmakeprojectmanager/cmakekitinformation.h | 24 +- src/plugins/cmakeprojectmanager/cmakeproject.cpp | 4 +- .../cmakeprojectmanager/cmakeprojectimporter.cpp | 38 +-- .../cmakeprojectmanager/cmakeprojectplugin.cpp | 6 +- .../cmakeprojectmanager/cmakerunconfiguration.cpp | 4 +- .../compilationdatabaseproject.cpp | 8 +- src/plugins/cpptools/cppkitinfo.cpp | 6 +- .../debugger/analyzer/startremotedialog.cpp | 4 +- src/plugins/debugger/debuggerdialogs.cpp | 14 +- src/plugins/debugger/debuggeritem.cpp | 10 +- src/plugins/debugger/debuggeritemmanager.cpp | 2 +- src/plugins/debugger/debuggerkitconfigwidget.cpp | 38 +-- src/plugins/debugger/debuggerkitconfigwidget.h | 10 +- src/plugins/debugger/debuggerkitinformation.cpp | 66 ++--- src/plugins/debugger/debuggerkitinformation.h | 8 +- src/plugins/debugger/debuggerplugin.cpp | 36 +-- .../debugger/debuggerrunconfigurationaspect.cpp | 2 +- src/plugins/debugger/debuggerruncontrol.cpp | 12 +- src/plugins/debugger/loadcoredialog.cpp | 6 +- src/plugins/debugger/unstartedappwatcherdialog.cpp | 4 +- .../genericbuildconfiguration.cpp | 2 +- src/plugins/ios/iosbuildconfiguration.cpp | 4 +- src/plugins/ios/iosbuildstep.cpp | 8 +- src/plugins/ios/iosconfigurations.cpp | 44 ++-- src/plugins/ios/iosdeploystep.cpp | 4 +- src/plugins/ios/iosdevice.cpp | 4 +- src/plugins/ios/iosdevice.h | 2 +- src/plugins/ios/iosrunconfiguration.cpp | 14 +- src/plugins/ios/iosrunner.cpp | 4 +- src/plugins/ios/iossimulator.cpp | 2 +- src/plugins/nim/project/nimcompilerbuildstep.cpp | 2 +- src/plugins/nim/project/nimproject.cpp | 2 +- src/plugins/perfprofiler/perfconfigwidget.cpp | 2 +- src/plugins/perfprofiler/perfdatareader.cpp | 6 +- src/plugins/perfprofiler/perfprofilertool.cpp | 4 +- src/plugins/perfprofiler/perftracepointdialog.cpp | 2 +- src/plugins/projectexplorer/buildconfiguration.cpp | 6 +- src/plugins/projectexplorer/buildstep.cpp | 2 +- .../projectexplorer/deployconfiguration.cpp | 2 +- .../devicesupport/devicecheckbuildstep.cpp | 6 +- .../devicesupport/deviceprocessesdialog.cpp | 2 +- .../projectexplorer/devicesupport/idevice.cpp | 2 +- src/plugins/projectexplorer/extracompiler.cpp | 2 +- src/plugins/projectexplorer/kit.cpp | 38 +-- src/plugins/projectexplorer/kit.h | 2 +- src/plugins/projectexplorer/kitchooser.cpp | 2 +- src/plugins/projectexplorer/kitconfigwidget.cpp | 14 +- src/plugins/projectexplorer/kitconfigwidget.h | 10 +- src/plugins/projectexplorer/kitinformation.cpp | 276 ++++++++++----------- src/plugins/projectexplorer/kitinformation.h | 34 +-- .../projectexplorer/kitinformationconfigwidget.cpp | 174 ++++++------- .../projectexplorer/kitinformationconfigwidget.h | 36 +-- src/plugins/projectexplorer/kitmanager.cpp | 32 +-- src/plugins/projectexplorer/kitmanager.h | 20 +- .../projectexplorer/kitmanagerconfigwidget.cpp | 10 +- .../projectexplorer/kitmanagerconfigwidget.h | 4 +- src/plugins/projectexplorer/makestep.cpp | 2 +- .../projectexplorer/miniprojecttargetselector.cpp | 12 +- .../projectexplorer/miniprojecttargetselector.h | 4 +- src/plugins/projectexplorer/projectexplorer.cpp | 22 +- src/plugins/projectexplorer/projectimporter.cpp | 16 +- src/plugins/projectexplorer/projectimporter.h | 2 +- src/plugins/projectexplorer/runconfiguration.cpp | 8 +- src/plugins/projectexplorer/target.cpp | 4 +- src/plugins/projectexplorer/targetsetupwidget.cpp | 2 +- .../qbsprojectmanager/defaultpropertyprovider.cpp | 10 +- .../qbsprojectmanager/qbsbuildconfiguration.cpp | 2 +- .../qbsprojectmanager/qbskitinformation.cpp | 42 ++-- src/plugins/qbsprojectmanager/qbskitinformation.h | 6 +- src/plugins/qbsprojectmanager/qbsproject.cpp | 2 +- .../qbsprojectmanager/qbsprojectimporter.cpp | 14 +- .../qbsprojectmanager/qbsprojectmanager.cpp | 2 +- .../qbsprojectmanager/qbsprojectmanagerplugin.cpp | 2 +- .../qmakeprojectmanager/externaleditors.cpp | 8 +- .../qmakebuildconfiguration.cpp | 30 +-- .../qmakeprojectmanager/qmakekitconfigwidget.cpp | 24 +- .../qmakeprojectmanager/qmakekitconfigwidget.h | 6 +- .../qmakeprojectmanager/qmakekitinformation.cpp | 52 ++-- .../qmakeprojectmanager/qmakekitinformation.h | 6 +- src/plugins/qmakeprojectmanager/qmakemakestep.cpp | 2 +- .../qmakeprojectmanager/qmakenodetreebuilder.cpp | 2 +- src/plugins/qmakeprojectmanager/qmakeproject.cpp | 24 +- .../qmakeprojectconfigwidget.cpp | 2 +- .../qmakeprojectmanager/qmakeprojectimporter.cpp | 10 +- .../qmakeprojectmanagerplugin.cpp | 2 +- src/plugins/qmakeprojectmanager/qmakestep.cpp | 16 +- .../qmakeprojectmanager/wizards/qtwizard.cpp | 8 +- .../designercore/instances/puppetcreator.cpp | 12 +- src/plugins/qmljstools/qmljsbundleprovider.cpp | 2 +- src/plugins/qmljstools/qmljsmodelmanager.cpp | 2 +- .../qmlpreview/qmlpreviewfileontargetfinder.cpp | 2 +- src/plugins/qmlpreview/qmlpreviewplugin.cpp | 2 +- .../qmlprofiler/qmlprofilerattachdialog.cpp | 2 +- src/plugins/qmlprofiler/qmlprofilerplugin.cpp | 2 +- src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp | 2 +- src/plugins/qmlprofiler/qmlprofilertool.cpp | 2 +- .../tests/qmlprofilerdetailsrewriter_test.cpp | 2 +- src/plugins/qmlprojectmanager/qmlproject.cpp | 8 +- .../qmlprojectenvironmentaspect.cpp | 2 +- .../qmlprojectrunconfiguration.cpp | 10 +- src/plugins/qnx/qnxconfiguration.cpp | 24 +- src/plugins/qnx/qnxdebugsupport.cpp | 8 +- src/plugins/qnx/qnxplugin.cpp | 6 +- src/plugins/qtsupport/baseqtversion.cpp | 58 ++--- src/plugins/qtsupport/exampleslistmodel.cpp | 2 +- src/plugins/qtsupport/qmldumptool.cpp | 2 +- src/plugins/qtsupport/qscxmlcgenerator.cpp | 4 +- src/plugins/qtsupport/qtcppkitinfo.cpp | 2 +- src/plugins/qtsupport/qtkitconfigwidget.cpp | 38 +-- src/plugins/qtsupport/qtkitconfigwidget.h | 6 +- src/plugins/qtsupport/qtkitinformation.cpp | 68 ++--- src/plugins/qtsupport/qtkitinformation.h | 6 +- src/plugins/qtsupport/qtprojectimporter.cpp | 46 ++-- src/plugins/qtsupport/qtsupportplugin.cpp | 4 +- src/plugins/qtsupport/uicgenerator.cpp | 4 +- .../abstractremotelinuxdeployservice.cpp | 2 +- src/plugins/remotelinux/deploymenttimeinfo.cpp | 4 +- .../remotelinux/remotelinuxdeployconfiguration.cpp | 4 +- .../remotelinuxenvironmentaspectwidget.cpp | 2 +- src/plugins/remotelinux/remotelinuxplugin.cpp | 2 +- .../typespecificdeviceconfigurationlistmodel.cpp | 2 +- src/plugins/valgrind/memchecktool.cpp | 6 +- src/plugins/winrt/winrtpackagedeploymentstep.cpp | 4 +- src/plugins/winrt/winrtplugin.cpp | 4 +- src/plugins/winrt/winrtrunconfiguration.cpp | 2 +- src/plugins/winrt/winrtruncontrol.cpp | 2 +- src/plugins/winrt/winrtrunnerhelper.cpp | 2 +- src/tools/sdktool/addkitoperation.cpp | 2 +- 156 files changed, 1156 insertions(+), 1156 deletions(-) diff --git a/src/plugins/android/androidbuildapkstep.cpp b/src/plugins/android/androidbuildapkstep.cpp index d4320b039a..85a8a02503 100644 --- a/src/plugins/android/androidbuildapkstep.cpp +++ b/src/plugins/android/androidbuildapkstep.cpp @@ -160,7 +160,7 @@ bool AndroidBuildApkStep::init() OutputFormat::ErrorMessage); } - QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(target()->kit()); + QtSupport::BaseQtVersion *version = QtSupport::QtKitAspect::qtVersion(target()->kit()); if (!version) return false; diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp index d26ca3c191..88c3e92a42 100644 --- a/src/plugins/android/androidconfigurations.cpp +++ b/src/plugins/android/androidconfigurations.cpp @@ -976,13 +976,13 @@ static bool matchToolChain(const ToolChain *atc, const ToolChain *btc) static bool matchKits(const Kit *a, const Kit *b) { - if (QtSupport::QtKitInformation::qtVersion(a) != QtSupport::QtKitInformation::qtVersion(b)) + if (QtSupport::QtKitAspect::qtVersion(a) != QtSupport::QtKitAspect::qtVersion(b)) return false; - return matchToolChain(ToolChainKitInformation::toolChain(a, ProjectExplorer::Constants::CXX_LANGUAGE_ID), - ToolChainKitInformation::toolChain(b, ProjectExplorer::Constants::CXX_LANGUAGE_ID)) - && matchToolChain(ToolChainKitInformation::toolChain(a, ProjectExplorer::Constants::C_LANGUAGE_ID), - ToolChainKitInformation::toolChain(b, ProjectExplorer::Constants::C_LANGUAGE_ID)); + return matchToolChain(ToolChainKitAspect::toolChain(a, ProjectExplorer::Constants::CXX_LANGUAGE_ID), + ToolChainKitAspect::toolChain(b, ProjectExplorer::Constants::CXX_LANGUAGE_ID)) + && matchToolChain(ToolChainKitAspect::toolChain(a, ProjectExplorer::Constants::C_LANGUAGE_ID), + ToolChainKitAspect::toolChain(b, ProjectExplorer::Constants::C_LANGUAGE_ID)); } void AndroidConfigurations::registerNewToolChains() @@ -1027,10 +1027,10 @@ static QVariant findOrRegisterDebugger(ToolChain *tc) void AndroidConfigurations::updateAutomaticKitList() { const QList existingKits = Utils::filtered(KitManager::kits(), [](Kit *k) { - Core::Id deviceTypeId = DeviceTypeKitInformation::deviceTypeId(k); + Core::Id deviceTypeId = DeviceTypeKitAspect::deviceTypeId(k); if (k->isAutoDetected() && !k->isSdkProvided() && deviceTypeId == Core::Id(Constants::ANDROID_DEVICE_TYPE)) { - if (!QtSupport::QtKitInformation::qtVersion(k)) + if (!QtSupport::QtKitAspect::qtVersion(k)) KitManager::deregisterKit(k); // Remove autoDetected kits without Qt. else return true; @@ -1076,11 +1076,11 @@ void AndroidConfigurations::updateAutomaticKitList() auto initBasicKitData = [allLanguages, device](Kit *k, const QtSupport::BaseQtVersion *qt) { k->setAutoDetected(true); k->setAutoDetectionSource("AndroidConfiguration"); - DeviceTypeKitInformation::setDeviceTypeId(k, Core::Id(Constants::ANDROID_DEVICE_TYPE)); + DeviceTypeKitAspect::setDeviceTypeId(k, Core::Id(Constants::ANDROID_DEVICE_TYPE)); for (ToolChain *tc : allLanguages) - ToolChainKitInformation::setToolChain(k, tc); - QtSupport::QtKitInformation::setQtVersion(k, qt); - DeviceKitInformation::setDevice(k, device); + ToolChainKitAspect::setToolChain(k, tc); + QtSupport::QtKitAspect::setQtVersion(k, qt); + DeviceKitAspect::setDevice(k, device); }; for (const QtSupport::BaseQtVersion *qt : qtVersionsForArch.value(tc->targetAbi())) { @@ -1098,9 +1098,9 @@ void AndroidConfigurations::updateAutomaticKitList() toSetup = existingKit; } - Debugger::DebuggerKitInformation::setDebugger(toSetup, findOrRegisterDebugger(tc)); + Debugger::DebuggerKitAspect::setDebugger(toSetup, findOrRegisterDebugger(tc)); - AndroidGdbServerKitInformation::setGdbSever(toSetup, currentConfig().gdbServer(tc->targetAbi())); + AndroidGdbServerKitAspect::setGdbSever(toSetup, currentConfig().gdbServer(tc->targetAbi())); toSetup->makeSticky(); toSetup->setUnexpandedDisplayName(tr("Android for %1 (Clang %2)") diff --git a/src/plugins/android/androiddebugsupport.cpp b/src/plugins/android/androiddebugsupport.cpp index 2af97bdffd..837a4dc537 100644 --- a/src/plugins/android/androiddebugsupport.cpp +++ b/src/plugins/android/androiddebugsupport.cpp @@ -167,7 +167,7 @@ void AndroidDebugSupport::start() setUseTargetAsync(true); } - QtSupport::BaseQtVersion *qtVersion = QtSupport::QtKitInformation::qtVersion(kit); + QtSupport::BaseQtVersion *qtVersion = QtSupport::QtKitAspect::qtVersion(kit); if (isCppDebugging()) { qCDebug(androidDebugSupportLog) << "C++ debugging enabled"; diff --git a/src/plugins/android/androiddeployqtstep.cpp b/src/plugins/android/androiddeployqtstep.cpp index 1a0d508a56..97b8e5de5b 100644 --- a/src/plugins/android/androiddeployqtstep.cpp +++ b/src/plugins/android/androiddeployqtstep.cpp @@ -149,7 +149,7 @@ AndroidDeployQtStep::AndroidDeployQtStep(ProjectExplorer::BuildStepList *parent) : ProjectExplorer::BuildStep(parent, stepId()) { setImmutable(true); - m_uninstallPreviousPackage = QtSupport::QtKitInformation::qtVersion(target()->kit())->qtVersion() < QtSupport::QtVersionNumber(5, 4, 0); + m_uninstallPreviousPackage = QtSupport::QtKitAspect::qtVersion(target()->kit())->qtVersion() < QtSupport::QtVersionNumber(5, 4, 0); //: AndroidDeployQtStep default display name setDefaultDisplayName(tr("Deploy to Android device")); @@ -224,7 +224,7 @@ bool AndroidDeployQtStep::init() emit addOutput(tr("Deploying to %1").arg(m_serialNumber), OutputFormat::Stdout); - QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(target()->kit()); + QtSupport::BaseQtVersion *version = QtSupport::QtKitAspect::qtVersion(target()->kit()); if (!version) return false; @@ -527,7 +527,7 @@ void AndroidDeployQtStep::gatherFilesToPull() if (m_deviceInfo.cpuAbi.contains(QLatin1String("arm64-v8a")) || m_deviceInfo.cpuAbi.contains(QLatin1String("x86_64"))) { const Core::Id cxxLanguageId = ProjectExplorer::Constants::CXX_LANGUAGE_ID; - ToolChain *tc = ToolChainKitInformation::toolChain(target()->kit(), cxxLanguageId); + ToolChain *tc = ToolChainKitAspect::toolChain(target()->kit(), cxxLanguageId); if (tc && tc->targetAbi().wordWidth() == 64) { m_filesToPull["/system/bin/app_process64"] = buildDir + "app_process"; libDirName = "lib64"; @@ -634,7 +634,7 @@ void AndroidDeployQtStep::setUninstallPreviousPackage(bool uninstall) AndroidDeployQtStep::UninstallType AndroidDeployQtStep::uninstallPreviousPackage() { - if (QtSupport::QtKitInformation::qtVersion(target()->kit())->qtVersion() < QtSupport::QtVersionNumber(5, 4, 0)) + if (QtSupport::QtKitAspect::qtVersion(target()->kit())->qtVersion() < QtSupport::QtVersionNumber(5, 4, 0)) return ForceUnintall; return m_uninstallPreviousPackage ? Uninstall : Keep; } diff --git a/src/plugins/android/androidgdbserverkitinformation.cpp b/src/plugins/android/androidgdbserverkitinformation.cpp index d4a7e17d85..2a8274dfb8 100644 --- a/src/plugins/android/androidgdbserverkitinformation.cpp +++ b/src/plugins/android/androidgdbserverkitinformation.cpp @@ -50,43 +50,43 @@ using namespace Utils; namespace Android { namespace Internal { -AndroidGdbServerKitInformation::AndroidGdbServerKitInformation() +AndroidGdbServerKitAspect::AndroidGdbServerKitAspect() { - setId(AndroidGdbServerKitInformation::id()); + setId(AndroidGdbServerKitAspect::id()); setPriority(27999); // Just one less than Debugger! } -QVariant AndroidGdbServerKitInformation::defaultValue(const Kit *kit) const +QVariant AndroidGdbServerKitAspect::defaultValue(const Kit *kit) const { return autoDetect(kit).toString(); } -QList AndroidGdbServerKitInformation::validate(const Kit *) const +QList AndroidGdbServerKitAspect::validate(const Kit *) const { return QList(); } -KitInformation::ItemList AndroidGdbServerKitInformation::toUserOutput(const Kit *kit) const +KitAspect::ItemList AndroidGdbServerKitAspect::toUserOutput(const Kit *kit) const { - return KitInformation::ItemList() - << qMakePair(tr("GDB server"), AndroidGdbServerKitInformation::gdbServer(kit).toUserOutput()); + return KitAspect::ItemList() + << qMakePair(tr("GDB server"), AndroidGdbServerKitAspect::gdbServer(kit).toUserOutput()); } -KitConfigWidget *AndroidGdbServerKitInformation::createConfigWidget(Kit *kit) const +KitAspectWidget *AndroidGdbServerKitAspect::createConfigWidget(Kit *kit) const { QTC_ASSERT(kit, return nullptr); - return new AndroidGdbServerKitInformationWidget(kit, this); + return new AndroidGdbServerKitAspectWidget(kit, this); } -Core::Id AndroidGdbServerKitInformation::id() +Core::Id AndroidGdbServerKitAspect::id() { return "Android.GdbServer.Information"; } -bool AndroidGdbServerKitInformation::isAndroidKit(const Kit *kit) +bool AndroidGdbServerKitAspect::isAndroidKit(const Kit *kit) { - QtSupport::BaseQtVersion *qt = QtSupport::QtKitInformation::qtVersion(kit); - ToolChain *tc = ToolChainKitInformation::toolChain(kit, ProjectExplorer::Constants::CXX_LANGUAGE_ID); + QtSupport::BaseQtVersion *qt = QtSupport::QtKitAspect::qtVersion(kit); + ToolChain *tc = ToolChainKitAspect::toolChain(kit, ProjectExplorer::Constants::CXX_LANGUAGE_ID); if (qt && tc) return qt->type() == QLatin1String(Constants::ANDROIDQT) && tc->typeId() == Constants::ANDROID_TOOLCHAIN_ID; @@ -94,21 +94,21 @@ bool AndroidGdbServerKitInformation::isAndroidKit(const Kit *kit) } -FileName AndroidGdbServerKitInformation::gdbServer(const Kit *kit) +FileName AndroidGdbServerKitAspect::gdbServer(const Kit *kit) { QTC_ASSERT(kit, return FileName()); - return FileName::fromString(kit->value(AndroidGdbServerKitInformation::id()).toString()); + return FileName::fromString(kit->value(AndroidGdbServerKitAspect::id()).toString()); } -void AndroidGdbServerKitInformation::setGdbSever(Kit *kit, const FileName &gdbServerCommand) +void AndroidGdbServerKitAspect::setGdbSever(Kit *kit, const FileName &gdbServerCommand) { QTC_ASSERT(kit, return); - kit->setValue(AndroidGdbServerKitInformation::id(), gdbServerCommand.toString()); + kit->setValue(AndroidGdbServerKitAspect::id(), gdbServerCommand.toString()); } -FileName AndroidGdbServerKitInformation::autoDetect(const Kit *kit) +FileName AndroidGdbServerKitAspect::autoDetect(const Kit *kit) { - ToolChain *tc = ToolChainKitInformation::toolChain(kit, ProjectExplorer::Constants::CXX_LANGUAGE_ID); + ToolChain *tc = ToolChainKitAspect::toolChain(kit, ProjectExplorer::Constants::CXX_LANGUAGE_ID); if (!tc || tc->typeId() != Constants::ANDROID_TOOLCHAIN_ID) return FileName(); auto atc = static_cast(tc); @@ -116,12 +116,12 @@ FileName AndroidGdbServerKitInformation::autoDetect(const Kit *kit) } /////////////// -// AndroidGdbServerKitInformationWidget +// AndroidGdbServerKitAspectWidget /////////////// -AndroidGdbServerKitInformationWidget::AndroidGdbServerKitInformationWidget(Kit *kit, const KitInformation *ki) : - KitConfigWidget(kit, ki), +AndroidGdbServerKitAspectWidget::AndroidGdbServerKitAspectWidget(Kit *kit, const KitAspect *ki) : + KitAspectWidget(kit, ki), m_label(new ElidingLabel), m_button(new QPushButton(tr("Manage..."))) { @@ -129,62 +129,62 @@ AndroidGdbServerKitInformationWidget::AndroidGdbServerKitInformationWidget(Kit * auto buttonMenu = new QMenu(m_button); QAction *autoDetectAction = buttonMenu->addAction(tr("Auto-detect")); connect(autoDetectAction, &QAction::triggered, - this, &AndroidGdbServerKitInformationWidget::autoDetectDebugger); + this, &AndroidGdbServerKitAspectWidget::autoDetectDebugger); QAction *changeAction = buttonMenu->addAction(tr("Edit...")); connect(changeAction, &QAction::triggered, - this, &AndroidGdbServerKitInformationWidget::showDialog); + this, &AndroidGdbServerKitAspectWidget::showDialog); m_button->setMenu(buttonMenu); refresh(); } -AndroidGdbServerKitInformationWidget::~AndroidGdbServerKitInformationWidget() +AndroidGdbServerKitAspectWidget::~AndroidGdbServerKitAspectWidget() { delete m_button; delete m_label; } -QString AndroidGdbServerKitInformationWidget::displayName() const +QString AndroidGdbServerKitAspectWidget::displayName() const { return tr("Android GDB server"); } -QString AndroidGdbServerKitInformationWidget::toolTip() const +QString AndroidGdbServerKitAspectWidget::toolTip() const { return tr("The GDB server to use for this kit."); } -void AndroidGdbServerKitInformationWidget::makeReadOnly() +void AndroidGdbServerKitAspectWidget::makeReadOnly() { m_button->setEnabled(false); } -void AndroidGdbServerKitInformationWidget::refresh() +void AndroidGdbServerKitAspectWidget::refresh() { - m_label->setText(AndroidGdbServerKitInformation::gdbServer(m_kit).toString()); + m_label->setText(AndroidGdbServerKitAspect::gdbServer(m_kit).toString()); } -bool AndroidGdbServerKitInformationWidget::visibleInKit() +bool AndroidGdbServerKitAspectWidget::visibleInKit() { - return DeviceKitInformation::deviceId(m_kit) == Constants::ANDROID_DEVICE_ID; + return DeviceKitAspect::deviceId(m_kit) == Constants::ANDROID_DEVICE_ID; } -QWidget *AndroidGdbServerKitInformationWidget::mainWidget() const +QWidget *AndroidGdbServerKitAspectWidget::mainWidget() const { return m_label; } -QWidget *AndroidGdbServerKitInformationWidget::buttonWidget() const +QWidget *AndroidGdbServerKitAspectWidget::buttonWidget() const { return m_button; } -void AndroidGdbServerKitInformationWidget::autoDetectDebugger() +void AndroidGdbServerKitAspectWidget::autoDetectDebugger() { - AndroidGdbServerKitInformation::setGdbSever(m_kit, AndroidGdbServerKitInformation::autoDetect(m_kit)); + AndroidGdbServerKitAspect::setGdbSever(m_kit, AndroidGdbServerKitAspect::autoDetect(m_kit)); } -void AndroidGdbServerKitInformationWidget::showDialog() +void AndroidGdbServerKitAspectWidget::showDialog() { QDialog dialog; auto layout = new QVBoxLayout(&dialog); @@ -194,7 +194,7 @@ void AndroidGdbServerKitInformationWidget::showDialog() auto binaryLabel = new QLabel(tr("&Binary:")); auto chooser = new PathChooser; chooser->setExpectedKind(PathChooser::ExistingCommand); - chooser->setPath(AndroidGdbServerKitInformation::gdbServer(m_kit).toString()); + chooser->setPath(AndroidGdbServerKitAspect::gdbServer(m_kit).toString()); binaryLabel->setBuddy(chooser); formLayout->addRow(binaryLabel, chooser); layout->addLayout(formLayout); @@ -207,7 +207,7 @@ void AndroidGdbServerKitInformationWidget::showDialog() dialog.setWindowTitle(tr("GDB Server for \"%1\"").arg(m_kit->displayName())); if (dialog.exec() == QDialog::Accepted) - AndroidGdbServerKitInformation::setGdbSever(m_kit, chooser->fileName()); + AndroidGdbServerKitAspect::setGdbSever(m_kit, chooser->fileName()); } } // namespace Internal diff --git a/src/plugins/android/androidgdbserverkitinformation.h b/src/plugins/android/androidgdbserverkitinformation.h index 8271926e30..6de6dd1008 100644 --- a/src/plugins/android/androidgdbserverkitinformation.h +++ b/src/plugins/android/androidgdbserverkitinformation.h @@ -36,13 +36,13 @@ QT_END_NAMESPACE namespace Android { namespace Internal { -class AndroidGdbServerKitInformationWidget : public ProjectExplorer::KitConfigWidget +class AndroidGdbServerKitAspectWidget : public ProjectExplorer::KitAspectWidget { Q_OBJECT public: - AndroidGdbServerKitInformationWidget(ProjectExplorer::Kit *kit, - const ProjectExplorer::KitInformation *ki); - ~AndroidGdbServerKitInformationWidget() override; + AndroidGdbServerKitAspectWidget(ProjectExplorer::Kit *kit, + const ProjectExplorer::KitAspect *ki); + ~AndroidGdbServerKitAspectWidget() override; QString displayName() const override; QString toolTip() const override; @@ -61,11 +61,11 @@ private: QPushButton *m_button; }; -class AndroidGdbServerKitInformation : public ProjectExplorer::KitInformation +class AndroidGdbServerKitAspect : public ProjectExplorer::KitAspect { Q_OBJECT public: - AndroidGdbServerKitInformation(); + AndroidGdbServerKitAspect(); QVariant defaultValue(const ProjectExplorer::Kit *) const override; @@ -73,7 +73,7 @@ public: ItemList toUserOutput(const ProjectExplorer::Kit *) const override; - ProjectExplorer::KitConfigWidget *createConfigWidget(ProjectExplorer::Kit *) const override; + ProjectExplorer::KitAspectWidget *createConfigWidget(ProjectExplorer::Kit *) const override; static Core::Id id(); static bool isAndroidKit(const ProjectExplorer::Kit *kit); diff --git a/src/plugins/android/androidmanager.cpp b/src/plugins/android/androidmanager.cpp index c31302f114..62e9f0591c 100644 --- a/src/plugins/android/androidmanager.cpp +++ b/src/plugins/android/androidmanager.cpp @@ -235,7 +235,7 @@ int AndroidManager::minimumSDK(ProjectExplorer::Target *target) int AndroidManager::minimumSDK(const ProjectExplorer::Kit *kit) { int minSDKVersion = -1; - QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(kit); + QtSupport::BaseQtVersion *version = QtSupport::QtKitAspect::qtVersion(kit); if (version && version->targetDeviceTypes().contains(Constants::ANDROID_DEVICE_TYPE)) { Utils::FileName stockManifestFilePath = Utils::FileName::fromUserInput(version->qmakeProperty("QT_INSTALL_PREFIX") + @@ -250,7 +250,7 @@ int AndroidManager::minimumSDK(const ProjectExplorer::Kit *kit) int AndroidManager::minimumNDK(const Kit *kit) { - auto qt = static_cast(QtSupport::QtKitInformation::qtVersion(kit)); + auto qt = static_cast(QtSupport::QtKitAspect::qtVersion(kit)); return qt->mininmumNDK(); } @@ -266,7 +266,7 @@ QString AndroidManager::buildTargetSDK(ProjectExplorer::Target *target) QString AndroidManager::targetArch(ProjectExplorer::Target *target) { - auto qt = static_cast(QtSupport::QtKitInformation::qtVersion(target->kit())); + auto qt = static_cast(QtSupport::QtKitAspect::qtVersion(target->kit())); return qt->targetArch(); } @@ -603,7 +603,7 @@ static bool mergeGradleProperties(const QString &path, GradleProperties properti bool AndroidManager::updateGradleProperties(ProjectExplorer::Target *target) { - QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(target->kit()); + QtSupport::BaseQtVersion *version = QtSupport::QtKitAspect::qtVersion(target->kit()); if (!version) return false; diff --git a/src/plugins/android/androidmanifesteditorwidget.cpp b/src/plugins/android/androidmanifesteditorwidget.cpp index e040c0db87..6d60a198c2 100644 --- a/src/plugins/android/androidmanifesteditorwidget.cpp +++ b/src/plugins/android/androidmanifesteditorwidget.cpp @@ -91,7 +91,7 @@ Project *androidProject(const Utils::FileName &fileName) if (!project->activeTarget()) continue; Kit *kit = project->activeTarget()->kit(); - if (DeviceTypeKitInformation::deviceTypeId(kit) == Android::Constants::ANDROID_DEVICE_TYPE + if (DeviceTypeKitAspect::deviceTypeId(kit) == Android::Constants::ANDROID_DEVICE_TYPE && fileName.isChildOf(project->projectDirectory())) return project; } @@ -492,7 +492,7 @@ void AndroidManifestEditorWidget::updateTargetComboBox() QStringList items; if (project) { Kit *kit = project->activeTarget()->kit(); - if (DeviceTypeKitInformation::deviceTypeId(kit) == Constants::ANDROID_DEVICE_TYPE) { + if (DeviceTypeKitAspect::deviceTypeId(kit) == Constants::ANDROID_DEVICE_TYPE) { ProjectNode *root = project->rootProjectNode(); root->forEachProjectNode([&items](const ProjectNode *projectNode) { items << projectNode->targetApplications(); diff --git a/src/plugins/android/androidpackageinstallationstep.cpp b/src/plugins/android/androidpackageinstallationstep.cpp index a5d81c2f87..58fb637240 100644 --- a/src/plugins/android/androidpackageinstallationstep.cpp +++ b/src/plugins/android/androidpackageinstallationstep.cpp @@ -66,7 +66,7 @@ bool AndroidPackageInstallationStep::init() if (bc->environment().searchInPath("sh.exe").isEmpty()) dirPath = QDir::toNativeSeparators(dirPath); - ToolChain *tc = ToolChainKitInformation::toolChain(target()->kit(), + ToolChain *tc = ToolChainKitAspect::toolChain(target()->kit(), ProjectExplorer::Constants::CXX_LANGUAGE_ID); ProcessParameters *pp = processParameters(); diff --git a/src/plugins/android/androidplugin.cpp b/src/plugins/android/androidplugin.cpp index 2b19da438f..966dbc94e5 100644 --- a/src/plugins/android/androidplugin.cpp +++ b/src/plugins/android/androidplugin.cpp @@ -107,7 +107,7 @@ public: void handleNewTarget(Target *target) { - if (DeviceTypeKitInformation::deviceTypeId(target->kit()) != Android::Constants::ANDROID_DEVICE_TYPE) + if (DeviceTypeKitAspect::deviceTypeId(target->kit()) != Android::Constants::ANDROID_DEVICE_TYPE) return; for (BuildConfiguration *bc : target->buildConfigurations()) @@ -155,13 +155,13 @@ bool AndroidPlugin::initialize(const QStringList &arguments, QString *errorMessa }, [](RunConfiguration *runConfig) { return runConfig->isEnabled() && runConfig->id().name().startsWith("QmlProjectManager.QmlRunConfiguration") - && DeviceTypeKitInformation::deviceTypeId(runConfig->target()->kit()) + && DeviceTypeKitAspect::deviceTypeId(runConfig->target()->kit()) == Android::Constants::ANDROID_DEVICE_TYPE; }); d = new AndroidPluginPrivate; - KitManager::registerKitInformation(); + KitManager::registerKitAspect(); connect(KitManager::instance(), &KitManager::kitsLoaded, this, &AndroidPlugin::kitsRestored); diff --git a/src/plugins/android/androidpotentialkit.cpp b/src/plugins/android/androidpotentialkit.cpp index 8264415a12..f755551b28 100644 --- a/src/plugins/android/androidpotentialkit.cpp +++ b/src/plugins/android/androidpotentialkit.cpp @@ -68,7 +68,7 @@ bool AndroidPotentialKit::isEnabled() const { QList kits = ProjectExplorer::KitManager::kits(); foreach (ProjectExplorer::Kit *kit, kits) { - Core::Id deviceId = ProjectExplorer::DeviceKitInformation::deviceId(kit); + Core::Id deviceId = ProjectExplorer::DeviceKitAspect::deviceId(kit); if (kit->isAutoDetected() && deviceId == Core::Id(Constants::ANDROID_DEVICE_ID) && !kit->isSdkProvided()) { @@ -120,7 +120,7 @@ void AndroidPotentialKitWidget::recheck() { QList kits = ProjectExplorer::KitManager::kits(); foreach (ProjectExplorer::Kit *kit, kits) { - Core::Id deviceId = ProjectExplorer::DeviceKitInformation::deviceId(kit); + Core::Id deviceId = ProjectExplorer::DeviceKitAspect::deviceId(kit); if (kit->isAutoDetected() && deviceId == Core::Id(Constants::ANDROID_DEVICE_ID) && !kit->isSdkProvided()) { diff --git a/src/plugins/android/androidrunnerworker.cpp b/src/plugins/android/androidrunnerworker.cpp index 6497f50d62..29dc0a3309 100644 --- a/src/plugins/android/androidrunnerworker.cpp +++ b/src/plugins/android/androidrunnerworker.cpp @@ -223,8 +223,8 @@ AndroidRunnerWorker::AndroidRunnerWorker(RunWorker *runner, const QString &packa << "Extra Start Args:" << m_amStartExtraArgs << "Before Start ADB cmds:" << m_beforeStartAdbCommands << "After finish ADB cmds:" << m_afterFinishAdbCommands; - m_gdbserverPath = AndroidGdbServerKitInformation::gdbServer(target->kit()).toString(); - QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(target->kit()); + m_gdbserverPath = AndroidGdbServerKitAspect::gdbServer(target->kit()).toString(); + QtSupport::BaseQtVersion *version = QtSupport::QtKitAspect::qtVersion(target->kit()); m_useAppParamsForQmlDebugger = version->qtVersion() >= QtSupport::QtVersionNumber(5, 12); } diff --git a/src/plugins/android/createandroidmanifestwizard.cpp b/src/plugins/android/createandroidmanifestwizard.cpp index 079fd5bd64..93959e371d 100644 --- a/src/plugins/android/createandroidmanifestwizard.cpp +++ b/src/plugins/android/createandroidmanifestwizard.cpp @@ -215,7 +215,7 @@ CreateAndroidManifestWizard::CreateAndroidManifestWizard(ProjectExplorer::Target setWindowTitle(tr("Create Android Template Files Wizard")); const BuildTargetInfoList buildTargets = target->applicationTargets(); - QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(target->kit()); + QtSupport::BaseQtVersion *version = QtSupport::QtKitAspect::qtVersion(target->kit()); m_copyGradle = version && version->qtVersion() >= QtSupport::QtVersionNumber(5, 4, 0); if (buildTargets.list.isEmpty()) { @@ -319,7 +319,7 @@ void CreateAndroidManifestWizard::createAndroidTemplateFiles() return; QStringList addedFiles; - QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(m_target->kit()); + QtSupport::BaseQtVersion *version = QtSupport::QtKitAspect::qtVersion(m_target->kit()); if (!version) return; if (version->qtVersion() < QtSupport::QtVersionNumber(5, 4, 0)) { diff --git a/src/plugins/autotest/autotestunittests.cpp b/src/plugins/autotest/autotestunittests.cpp index 706824566c..2b8624a834 100644 --- a/src/plugins/autotest/autotestunittests.cpp +++ b/src/plugins/autotest/autotestunittests.cpp @@ -64,11 +64,11 @@ void AutoTestUnitTests::initTestCase() const QList allKits = KitManager::kits(); if (allKits.count() != 1) QSKIP("This test requires exactly one kit to be present"); - if (auto qtVersion = QtSupport::QtKitInformation::qtVersion(allKits.first())) + if (auto qtVersion = QtSupport::QtKitAspect::qtVersion(allKits.first())) m_isQt4 = qtVersion->qtVersionString().startsWith('4'); else QSKIP("Could not figure out which Qt version is used for default kit."); - const ToolChain * const toolchain = ToolChainKitInformation::toolChain(allKits.first(), + const ToolChain * const toolchain = ToolChainKitAspect::toolChain(allKits.first(), ProjectExplorer::Constants::CXX_LANGUAGE_ID); if (!toolchain) QSKIP("This test requires that there is a kit with a toolchain."); diff --git a/src/plugins/autotest/testconfiguration.cpp b/src/plugins/autotest/testconfiguration.cpp index 1f9b73e77c..6e0efcd65a 100644 --- a/src/plugins/autotest/testconfiguration.cpp +++ b/src/plugins/autotest/testconfiguration.cpp @@ -57,7 +57,7 @@ static bool isLocal(RunConfiguration *runConfiguration) { Target *target = runConfiguration ? runConfiguration->target() : nullptr; Kit *kit = target ? target->kit() : nullptr; - return DeviceTypeKitInformation::deviceTypeId(kit) == ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE; + return DeviceTypeKitAspect::deviceTypeId(kit) == ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE; } static QString ensureExeEnding(const QString& file) diff --git a/src/plugins/autotest/testrunner.cpp b/src/plugins/autotest/testrunner.cpp index 6792b96cb3..b19e54e4c3 100644 --- a/src/plugins/autotest/testrunner.cpp +++ b/src/plugins/autotest/testrunner.cpp @@ -579,7 +579,7 @@ void TestRunner::debugTests() bool useOutputProcessor = true; if (ProjectExplorer::Target *targ = config->project()->activeTarget()) { - if (Debugger::DebuggerKitInformation::engineType(targ->kit()) == Debugger::CdbEngineType) { + if (Debugger::DebuggerKitAspect::engineType(targ->kit()) == Debugger::CdbEngineType) { emit testResultReady(TestResultPtr(new FaultyTestResult(Result::MessageWarn, TestRunner::tr("Unable to display test results when using CDB.")))); useOutputProcessor = false; diff --git a/src/plugins/clangtools/clangtidyclazytool.cpp b/src/plugins/clangtools/clangtidyclazytool.cpp index aa9853825c..9056b64367 100644 --- a/src/plugins/clangtools/clangtidyclazytool.cpp +++ b/src/plugins/clangtools/clangtidyclazytool.cpp @@ -423,7 +423,7 @@ void ClangTidyClazyTool::updateRunActions() Target *target = project ? project->activeTarget() : nullptr; const Core::Id cxx = ProjectExplorer::Constants::CXX_LANGUAGE_ID; bool canRun = target && project->projectLanguages().contains(cxx) - && ToolChainKitInformation::toolChain(target->kit(), cxx); + && ToolChainKitAspect::toolChain(target->kit(), cxx); if (!canRun) toolTip = tr("This is not a C++ project."); diff --git a/src/plugins/clangtools/clangtoolruncontrol.cpp b/src/plugins/clangtools/clangtoolruncontrol.cpp index c4ca8a4abb..c92a446484 100644 --- a/src/plugins/clangtools/clangtoolruncontrol.cpp +++ b/src/plugins/clangtools/clangtoolruncontrol.cpp @@ -258,7 +258,7 @@ void ClangToolRunControl::init() QTC_ASSERT(buildConfiguration, return); m_environment = buildConfiguration->environment(); - ToolChain *toolChain = ToolChainKitInformation::toolChain(m_target->kit(), + ToolChain *toolChain = ToolChainKitAspect::toolChain(m_target->kit(), ProjectExplorer::Constants::CXX_LANGUAGE_ID); QTC_ASSERT(toolChain, return); m_targetTriple = toolChain->originalTargetTriple(); diff --git a/src/plugins/clangtools/clangtoolspreconfiguredsessiontests.cpp b/src/plugins/clangtools/clangtoolspreconfiguredsessiontests.cpp index e31522f371..86dc36e186 100644 --- a/src/plugins/clangtools/clangtoolspreconfiguredsessiontests.cpp +++ b/src/plugins/clangtools/clangtoolspreconfiguredsessiontests.cpp @@ -166,7 +166,7 @@ static QList validTargets(Project *project) return false; } - const ToolChain * const toolchain = ToolChainKitInformation::toolChain(kit, ProjectExplorer::Constants::CXX_LANGUAGE_ID); + const ToolChain * const toolchain = ToolChainKitAspect::toolChain(kit, ProjectExplorer::Constants::CXX_LANGUAGE_ID); QTC_ASSERT(toolchain, return false); if (Core::ICore::clangExecutable(CLANG_BINDIR).isEmpty()) { diff --git a/src/plugins/clangtools/clangtoolsunittests.cpp b/src/plugins/clangtools/clangtoolsunittests.cpp index 3e5d716116..ff1e7ab77c 100644 --- a/src/plugins/clangtools/clangtoolsunittests.cpp +++ b/src/plugins/clangtools/clangtoolsunittests.cpp @@ -58,7 +58,7 @@ void ClangToolsUnitTests::initTestCase() const QList allKits = KitManager::kits(); if (allKits.count() != 1) QSKIP("This test requires exactly one kit to be present"); - const ToolChain * const toolchain = ToolChainKitInformation::toolChain(allKits.first(), + const ToolChain * const toolchain = ToolChainKitAspect::toolChain(allKits.first(), Constants::CXX_LANGUAGE_ID); if (!toolchain) QSKIP("This test requires that there is a kit with a toolchain."); @@ -94,8 +94,8 @@ void ClangToolsUnitTests::testProject() QFETCH(int, expectedDiagCount); if (projectFilePath.contains("mingw")) { const ToolChain * const toolchain - = ToolChainKitInformation::toolChain(KitManager::kits().constFirst(), - Constants::CXX_LANGUAGE_ID); + = ToolChainKitAspect::toolChain(KitManager::kits().constFirst(), + Constants::CXX_LANGUAGE_ID); if (toolchain->typeId() != ProjectExplorer::Constants::MINGW_TOOLCHAIN_TYPEID) QSKIP("This test is mingw specific, does not run for other toolchains"); } diff --git a/src/plugins/cmakeprojectmanager/builddirparameters.cpp b/src/plugins/cmakeprojectmanager/builddirparameters.cpp index f4377d42ae..144234a9bc 100644 --- a/src/plugins/cmakeprojectmanager/builddirparameters.cpp +++ b/src/plugins/cmakeprojectmanager/builddirparameters.cpp @@ -61,25 +61,25 @@ BuildDirParameters::BuildDirParameters(CMakeBuildConfiguration *bc) if (Utils::HostOsInfo::isAnyUnixHost()) environment.set("ICECC", "no"); - cmakeToolId = CMakeKitInformation::cmakeToolId(k); + cmakeToolId = CMakeKitAspect::cmakeToolId(k); - auto tc = ToolChainKitInformation::toolChain(k, Constants::CXX_LANGUAGE_ID); + auto tc = ToolChainKitAspect::toolChain(k, Constants::CXX_LANGUAGE_ID); if (tc) cxxToolChainId = tc->id(); - tc = ToolChainKitInformation::toolChain(k, Constants::C_LANGUAGE_ID); + tc = ToolChainKitAspect::toolChain(k, Constants::C_LANGUAGE_ID); if (tc) cToolChainId = tc->id(); - sysRoot = SysRootKitInformation::sysRoot(k); + sysRoot = SysRootKitAspect::sysRoot(k); expander = k->macroExpander(); configuration = bc->configurationForCMake(); - generator = CMakeGeneratorKitInformation::generator(k); - extraGenerator = CMakeGeneratorKitInformation::extraGenerator(k); - platform = CMakeGeneratorKitInformation::platform(k); - toolset = CMakeGeneratorKitInformation::toolset(k); - generatorArguments = CMakeGeneratorKitInformation::generatorArguments(k); + generator = CMakeGeneratorKitAspect::generator(k); + extraGenerator = CMakeGeneratorKitAspect::extraGenerator(k); + platform = CMakeGeneratorKitAspect::platform(k); + toolset = CMakeGeneratorKitAspect::toolset(k); + generatorArguments = CMakeGeneratorKitAspect::generatorArguments(k); } bool BuildDirParameters::isValid() const { return buildConfiguration && cmakeTool(); } diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp index b518888d50..4d0261e920 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp @@ -344,7 +344,7 @@ void CMakeBuildConfiguration::setConfigurationForCMake(const CMakeConfig &config m_configurationForCMake = removeDuplicates(config); const Kit *k = target()->kit(); - CMakeConfig kitConfig = CMakeConfigurationKitInformation::configuration(k); + CMakeConfig kitConfig = CMakeConfigurationKitAspect::configuration(k); bool hasKitOverride = false; foreach (const CMakeConfigItem &i, m_configurationForCMake) { const QString b = CMakeConfigItem::expandedValueOf(k, i.key, kitConfig); @@ -364,7 +364,7 @@ void CMakeBuildConfiguration::setConfigurationForCMake(const CMakeConfig &config CMakeConfig CMakeBuildConfiguration::configurationForCMake() const { - return removeDuplicates(CMakeConfigurationKitInformation::configuration(target()->kit()) + m_configurationForCMake); + return removeDuplicates(CMakeConfigurationKitAspect::configuration(target()->kit()) + m_configurationForCMake); } void CMakeBuildConfiguration::setError(const QString &message) @@ -516,10 +516,10 @@ BuildInfo CMakeBuildConfigurationFactory::createBuildInfo(const Kit *k, if (!buildTypeItem.isNull()) extra.configuration.append(buildTypeItem); - const QString sysRoot = SysRootKitInformation::sysRoot(k).toString(); + const QString sysRoot = SysRootKitAspect::sysRoot(k).toString(); if (!sysRoot.isEmpty()) { extra.configuration.append(CMakeConfigItem("CMAKE_SYSROOT", sysRoot.toUtf8())); - ProjectExplorer::ToolChain *tc = ProjectExplorer::ToolChainKitInformation::toolChain( + ProjectExplorer::ToolChain *tc = ProjectExplorer::ToolChainKitAspect::toolChain( k, ProjectExplorer::Constants::CXX_LANGUAGE_ID); if (tc) { const QByteArray targetTriple = tc->originalTargetTriple().toUtf8(); diff --git a/src/plugins/cmakeprojectmanager/cmakebuildsettingswidget.cpp b/src/plugins/cmakeprojectmanager/cmakebuildsettingswidget.cpp index 3ee12eeb3b..0271a02787 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildsettingswidget.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildsettingswidget.cpp @@ -391,7 +391,7 @@ void CMakeBuildSettingsWidget::updateAdvancedCheckBox() void CMakeBuildSettingsWidget::updateFromKit() { const ProjectExplorer::Kit *k = m_buildConfiguration->target()->kit(); - const CMakeConfig config = CMakeConfigurationKitInformation::configuration(k); + const CMakeConfig config = CMakeConfigurationKitAspect::configuration(k); QHash configHash; for (const CMakeConfigItem &i : config) diff --git a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp index 40a809f581..7d2ef903c9 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp @@ -164,7 +164,7 @@ bool CMakeBuildStep::init() canInit = false; } - CMakeTool *tool = CMakeKitInformation::cmakeTool(target()->kit()); + CMakeTool *tool = CMakeKitAspect::cmakeTool(target()->kit()); if (!tool || !tool->isValid()) { emit addTask(Task(Task::Error, tr("A CMake tool must be set up for building. " @@ -375,7 +375,7 @@ QString CMakeBuildStep::allArguments(const CMakeRunConfiguration *rc) const QString CMakeBuildStep::cmakeCommand() const { - CMakeTool *tool = CMakeKitInformation::cmakeTool(target()->kit()); + CMakeTool *tool = CMakeKitAspect::cmakeTool(target()->kit()); return tool ? tool->cmakeExecutable().toString() : QString(); } diff --git a/src/plugins/cmakeprojectmanager/cmakefilecompletionassist.cpp b/src/plugins/cmakeprojectmanager/cmakefilecompletionassist.cpp index 2a5cf769a8..6d3ef82933 100644 --- a/src/plugins/cmakeprojectmanager/cmakefilecompletionassist.cpp +++ b/src/plugins/cmakeprojectmanager/cmakefilecompletionassist.cpp @@ -64,7 +64,7 @@ IAssistProposal *CMakeFileCompletionAssist::perform(const AssistInterface *inter if (!fileName.isEmpty() && QFileInfo(fileName).isFile()) { Project *p = SessionManager::projectForFile(Utils::FileName::fromString(fileName)); if (p && p->activeTarget()) { - CMakeTool *cmake = CMakeKitInformation::cmakeTool(p->activeTarget()->kit()); + CMakeTool *cmake = CMakeKitAspect::cmakeTool(p->activeTarget()->kit()); if (cmake && cmake->isValid()) kw = cmake->keywords(); } diff --git a/src/plugins/cmakeprojectmanager/cmakekitconfigwidget.cpp b/src/plugins/cmakeprojectmanager/cmakekitconfigwidget.cpp index d264f1324f..1d3f4e53cd 100644 --- a/src/plugins/cmakeprojectmanager/cmakekitconfigwidget.cpp +++ b/src/plugins/cmakeprojectmanager/cmakekitconfigwidget.cpp @@ -54,14 +54,14 @@ namespace CMakeProjectManager { namespace Internal { // -------------------------------------------------------------------- -// CMakeKitConfigWidget: +// CMakeKitAspectWidget: // -------------------------------------------------------------------- -CMakeKitConfigWidget::CMakeKitConfigWidget(Kit *kit, - const KitInformation *ki) : - KitConfigWidget(kit, ki), +CMakeKitAspectWidget::CMakeKitAspectWidget(Kit *kit, + const KitAspect *ki) : + KitAspectWidget(kit, ki), m_comboBox(new QComboBox), - m_manageButton(new QPushButton(KitConfigWidget::msgManage())) + m_manageButton(new QPushButton(KitAspectWidget::msgManage())) { m_comboBox->setSizePolicy(QSizePolicy::Ignored, m_comboBox->sizePolicy().verticalPolicy()); m_comboBox->setEnabled(false); @@ -74,60 +74,60 @@ CMakeKitConfigWidget::CMakeKitConfigWidget(Kit *kit, refresh(); connect(m_comboBox, static_cast(&QComboBox::currentIndexChanged), - this, &CMakeKitConfigWidget::currentCMakeToolChanged); + this, &CMakeKitAspectWidget::currentCMakeToolChanged); m_manageButton->setContentsMargins(0, 0, 0, 0); connect(m_manageButton, &QPushButton::clicked, - this, &CMakeKitConfigWidget::manageCMakeTools); + this, &CMakeKitAspectWidget::manageCMakeTools); CMakeToolManager *cmakeMgr = CMakeToolManager::instance(); connect(cmakeMgr, &CMakeToolManager::cmakeAdded, - this, &CMakeKitConfigWidget::cmakeToolAdded); + this, &CMakeKitAspectWidget::cmakeToolAdded); connect(cmakeMgr, &CMakeToolManager::cmakeRemoved, - this, &CMakeKitConfigWidget::cmakeToolRemoved); + this, &CMakeKitAspectWidget::cmakeToolRemoved); connect(cmakeMgr, &CMakeToolManager::cmakeUpdated, - this, &CMakeKitConfigWidget::cmakeToolUpdated); + this, &CMakeKitAspectWidget::cmakeToolUpdated); } -CMakeKitConfigWidget::~CMakeKitConfigWidget() +CMakeKitAspectWidget::~CMakeKitAspectWidget() { delete m_comboBox; delete m_manageButton; } -QString CMakeKitConfigWidget::displayName() const +QString CMakeKitAspectWidget::displayName() const { return tr("CMake Tool"); } -void CMakeKitConfigWidget::makeReadOnly() +void CMakeKitAspectWidget::makeReadOnly() { m_comboBox->setEnabled(false); } -void CMakeKitConfigWidget::refresh() +void CMakeKitAspectWidget::refresh() { - CMakeTool *tool = CMakeKitInformation::cmakeTool(m_kit); + CMakeTool *tool = CMakeKitAspect::cmakeTool(m_kit); m_comboBox->setCurrentIndex(tool ? indexOf(tool->id()) : -1); } -QWidget *CMakeKitConfigWidget::mainWidget() const +QWidget *CMakeKitAspectWidget::mainWidget() const { return m_comboBox; } -QWidget *CMakeKitConfigWidget::buttonWidget() const +QWidget *CMakeKitAspectWidget::buttonWidget() const { return m_manageButton; } -QString CMakeKitConfigWidget::toolTip() const +QString CMakeKitAspectWidget::toolTip() const { return tr("The CMake Tool to use when building a project with CMake.
" "This setting is ignored when using other build systems."); } -int CMakeKitConfigWidget::indexOf(const Core::Id &id) +int CMakeKitAspectWidget::indexOf(const Core::Id &id) { for (int i = 0; i < m_comboBox->count(); ++i) { if (id == Core::Id::fromSetting(m_comboBox->itemData(i))) @@ -136,7 +136,7 @@ int CMakeKitConfigWidget::indexOf(const Core::Id &id) return -1; } -void CMakeKitConfigWidget::cmakeToolAdded(const Core::Id &id) +void CMakeKitAspectWidget::cmakeToolAdded(const Core::Id &id) { const CMakeTool *tool = CMakeToolManager::findById(id); QTC_ASSERT(tool, return); @@ -146,7 +146,7 @@ void CMakeKitConfigWidget::cmakeToolAdded(const Core::Id &id) refresh(); } -void CMakeKitConfigWidget::cmakeToolUpdated(const Core::Id &id) +void CMakeKitAspectWidget::cmakeToolUpdated(const Core::Id &id) { const int pos = indexOf(id); QTC_ASSERT(pos >= 0, return); @@ -157,7 +157,7 @@ void CMakeKitConfigWidget::cmakeToolUpdated(const Core::Id &id) m_comboBox->setItemText(pos, tool->displayName()); } -void CMakeKitConfigWidget::cmakeToolRemoved(const Core::Id &id) +void CMakeKitAspectWidget::cmakeToolRemoved(const Core::Id &id) { const int pos = indexOf(id); QTC_ASSERT(pos >= 0, return); @@ -172,7 +172,7 @@ void CMakeKitConfigWidget::cmakeToolRemoved(const Core::Id &id) refresh(); } -void CMakeKitConfigWidget::updateComboBox() +void CMakeKitAspectWidget::updateComboBox() { // remove unavailable cmake tool: int pos = indexOf(Core::Id()); @@ -188,29 +188,29 @@ void CMakeKitConfigWidget::updateComboBox() } } -void CMakeKitConfigWidget::currentCMakeToolChanged(int index) +void CMakeKitAspectWidget::currentCMakeToolChanged(int index) { if (m_removingItem) return; const Core::Id id = Core::Id::fromSetting(m_comboBox->itemData(index)); - CMakeKitInformation::setCMakeTool(m_kit, id); + CMakeKitAspect::setCMakeTool(m_kit, id); } -void CMakeKitConfigWidget::manageCMakeTools() +void CMakeKitAspectWidget::manageCMakeTools() { Core::ICore::showOptionsDialog(Constants::CMAKE_SETTINGSPAGE_ID, buttonWidget()); } // -------------------------------------------------------------------- -// CMakeGeneratorKitConfigWidget: +// CMakeGeneratorKitAspectWidget: // -------------------------------------------------------------------- -CMakeGeneratorKitConfigWidget::CMakeGeneratorKitConfigWidget(Kit *kit, - const KitInformation *ki) : - KitConfigWidget(kit, ki), +CMakeGeneratorKitAspectWidget::CMakeGeneratorKitAspectWidget(Kit *kit, + const KitAspect *ki) : + KitAspectWidget(kit, ki), m_label(new QLabel), m_changeButton(new QPushButton) { @@ -219,39 +219,39 @@ CMakeGeneratorKitConfigWidget::CMakeGeneratorKitConfigWidget(Kit *kit, refresh(); connect(m_changeButton, &QPushButton::clicked, - this, &CMakeGeneratorKitConfigWidget::changeGenerator); + this, &CMakeGeneratorKitAspectWidget::changeGenerator); } -CMakeGeneratorKitConfigWidget::~CMakeGeneratorKitConfigWidget() +CMakeGeneratorKitAspectWidget::~CMakeGeneratorKitAspectWidget() { delete m_label; delete m_changeButton; } -QString CMakeGeneratorKitConfigWidget::displayName() const +QString CMakeGeneratorKitAspectWidget::displayName() const { return tr("CMake generator"); } -void CMakeGeneratorKitConfigWidget::makeReadOnly() +void CMakeGeneratorKitAspectWidget::makeReadOnly() { m_changeButton->setEnabled(false); } -void CMakeGeneratorKitConfigWidget::refresh() +void CMakeGeneratorKitAspectWidget::refresh() { if (m_ignoreChange) return; - CMakeTool *const tool = CMakeKitInformation::cmakeTool(m_kit); + CMakeTool *const tool = CMakeKitAspect::cmakeTool(m_kit); if (tool != m_currentTool) m_currentTool = tool; m_changeButton->setEnabled(m_currentTool); - const QString generator = CMakeGeneratorKitInformation::generator(kit()); - const QString extraGenerator = CMakeGeneratorKitInformation::extraGenerator(kit()); - const QString platform = CMakeGeneratorKitInformation::platform(kit()); - const QString toolset = CMakeGeneratorKitInformation::toolset(kit()); + const QString generator = CMakeGeneratorKitAspect::generator(kit()); + const QString extraGenerator = CMakeGeneratorKitAspect::extraGenerator(kit()); + const QString platform = CMakeGeneratorKitAspect::platform(kit()); + const QString toolset = CMakeGeneratorKitAspect::toolset(kit()); const QString message = tr("%1 - %2, Platform: %3, Toolset: %4") .arg(extraGenerator.isEmpty() ? tr("") : extraGenerator) @@ -261,23 +261,23 @@ void CMakeGeneratorKitConfigWidget::refresh() m_label->setText(message); } -QWidget *CMakeGeneratorKitConfigWidget::mainWidget() const +QWidget *CMakeGeneratorKitAspectWidget::mainWidget() const { return m_label; } -QWidget *CMakeGeneratorKitConfigWidget::buttonWidget() const +QWidget *CMakeGeneratorKitAspectWidget::buttonWidget() const { return m_changeButton; } -QString CMakeGeneratorKitConfigWidget::toolTip() const +QString CMakeGeneratorKitAspectWidget::toolTip() const { return tr("CMake generator defines how a project is built when using CMake.
" "This setting is ignored when using other build systems."); } -void CMakeGeneratorKitConfigWidget::changeGenerator() +void CMakeGeneratorKitAspectWidget::changeGenerator() { QPointer changeDialog = new QDialog(m_changeButton); @@ -352,12 +352,12 @@ void CMakeGeneratorKitConfigWidget::changeGenerator() toolsetEdit->setEnabled(it->supportsToolset); }; - updateDialog(CMakeGeneratorKitInformation::generator(kit())); + updateDialog(CMakeGeneratorKitAspect::generator(kit())); - generatorCombo->setCurrentText(CMakeGeneratorKitInformation::generator(kit())); - extraGeneratorCombo->setCurrentText(CMakeGeneratorKitInformation::extraGenerator(kit())); - platformEdit->setText(platformEdit->isEnabled() ? CMakeGeneratorKitInformation::platform(kit()) : QLatin1String("")); - toolsetEdit->setText(toolsetEdit->isEnabled() ? CMakeGeneratorKitInformation::toolset(kit()) : QLatin1String("")); + generatorCombo->setCurrentText(CMakeGeneratorKitAspect::generator(kit())); + extraGeneratorCombo->setCurrentText(CMakeGeneratorKitAspect::extraGenerator(kit())); + platformEdit->setText(platformEdit->isEnabled() ? CMakeGeneratorKitAspect::platform(kit()) : QLatin1String("")); + toolsetEdit->setText(toolsetEdit->isEnabled() ? CMakeGeneratorKitAspect::toolset(kit()) : QLatin1String("")); connect(generatorCombo, &QComboBox::currentTextChanged, updateDialog); @@ -365,7 +365,7 @@ void CMakeGeneratorKitConfigWidget::changeGenerator() if (!changeDialog) return; - CMakeGeneratorKitInformation::set(kit(), generatorCombo->currentText(), + CMakeGeneratorKitAspect::set(kit(), generatorCombo->currentText(), extraGeneratorCombo->currentData().toString(), platformEdit->isEnabled() ? platformEdit->text() : QString(), toolsetEdit->isEnabled() ? toolsetEdit->text() : QString()); @@ -373,58 +373,58 @@ void CMakeGeneratorKitConfigWidget::changeGenerator() } // -------------------------------------------------------------------- -// CMakeConfigurationKitConfigWidget: +// CMakeConfigurationKitAspectWidget: // -------------------------------------------------------------------- -CMakeConfigurationKitConfigWidget::CMakeConfigurationKitConfigWidget(Kit *kit, - const KitInformation *ki) : - KitConfigWidget(kit, ki), +CMakeConfigurationKitAspectWidget::CMakeConfigurationKitAspectWidget(Kit *kit, + const KitAspect *ki) : + KitAspectWidget(kit, ki), m_summaryLabel(new Utils::ElidingLabel), m_manageButton(new QPushButton) { refresh(); m_manageButton->setText(tr("Change...")); connect(m_manageButton, &QAbstractButton::clicked, - this, &CMakeConfigurationKitConfigWidget::editConfigurationChanges); + this, &CMakeConfigurationKitAspectWidget::editConfigurationChanges); } -QString CMakeConfigurationKitConfigWidget::displayName() const +QString CMakeConfigurationKitAspectWidget::displayName() const { return tr("CMake Configuration"); } -void CMakeConfigurationKitConfigWidget::makeReadOnly() +void CMakeConfigurationKitAspectWidget::makeReadOnly() { m_manageButton->setEnabled(false); if (m_dialog) m_dialog->reject(); } -void CMakeConfigurationKitConfigWidget::refresh() +void CMakeConfigurationKitAspectWidget::refresh() { - const QStringList current = CMakeConfigurationKitInformation::toStringList(kit()); + const QStringList current = CMakeConfigurationKitAspect::toStringList(kit()); m_summaryLabel->setText(current.join("; ")); if (m_editor) m_editor->setPlainText(current.join('\n')); } -QWidget *CMakeConfigurationKitConfigWidget::mainWidget() const +QWidget *CMakeConfigurationKitAspectWidget::mainWidget() const { return m_summaryLabel; } -QWidget *CMakeConfigurationKitConfigWidget::buttonWidget() const +QWidget *CMakeConfigurationKitAspectWidget::buttonWidget() const { return m_manageButton; } -QString CMakeConfigurationKitConfigWidget::toolTip() const +QString CMakeConfigurationKitAspectWidget::toolTip() const { return tr("Default configuration passed to CMake when setting up a project."); } -void CMakeConfigurationKitConfigWidget::editConfigurationChanges() +void CMakeConfigurationKitAspectWidget::editConfigurationChanges() { if (m_dialog) { m_dialog->activateWindow(); @@ -458,32 +458,32 @@ void CMakeConfigurationKitConfigWidget::editConfigurationChanges() connect(buttons, &QDialogButtonBox::clicked, m_dialog, [buttons, this](QAbstractButton *button) { if (button != buttons->button(QDialogButtonBox::Reset)) return; - CMakeConfigurationKitInformation::setConfiguration(kit(), - CMakeConfigurationKitInformation::defaultConfiguration(kit())); + CMakeConfigurationKitAspect::setConfiguration(kit(), + CMakeConfigurationKitAspect::defaultConfiguration(kit())); }); - connect(m_dialog, &QDialog::accepted, this, &CMakeConfigurationKitConfigWidget::acceptChangesDialog); - connect(m_dialog, &QDialog::rejected, this, &CMakeConfigurationKitConfigWidget::closeChangesDialog); + connect(m_dialog, &QDialog::accepted, this, &CMakeConfigurationKitAspectWidget::acceptChangesDialog); + connect(m_dialog, &QDialog::rejected, this, &CMakeConfigurationKitAspectWidget::closeChangesDialog); connect(buttons->button(QDialogButtonBox::Apply), &QAbstractButton::clicked, - this, &CMakeConfigurationKitConfigWidget::applyChanges); + this, &CMakeConfigurationKitAspectWidget::applyChanges); refresh(); m_dialog->show(); } -void CMakeConfigurationKitConfigWidget::applyChanges() +void CMakeConfigurationKitAspectWidget::applyChanges() { QTC_ASSERT(m_editor, return); - CMakeConfigurationKitInformation::fromStringList(kit(), m_editor->toPlainText().split(QLatin1Char('\n'))); + CMakeConfigurationKitAspect::fromStringList(kit(), m_editor->toPlainText().split(QLatin1Char('\n'))); } -void CMakeConfigurationKitConfigWidget::closeChangesDialog() +void CMakeConfigurationKitAspectWidget::closeChangesDialog() { m_dialog->deleteLater(); m_dialog = nullptr; m_editor = nullptr; } -void CMakeConfigurationKitConfigWidget::acceptChangesDialog() +void CMakeConfigurationKitAspectWidget::acceptChangesDialog() { applyChanges(); closeChangesDialog(); diff --git a/src/plugins/cmakeprojectmanager/cmakekitconfigwidget.h b/src/plugins/cmakeprojectmanager/cmakekitconfigwidget.h index 3839750f66..04d34a9fb4 100644 --- a/src/plugins/cmakeprojectmanager/cmakekitconfigwidget.h +++ b/src/plugins/cmakeprojectmanager/cmakekitconfigwidget.h @@ -37,7 +37,7 @@ QT_END_NAMESPACE namespace ProjectExplorer { class Kit; - class KitInformation; + class KitAspect; } // namespace ProjectExplorer namespace CMakeProjectManager { @@ -47,17 +47,17 @@ class CMakeTool; namespace Internal { // -------------------------------------------------------------------- -// CMakeKitConfigWidget: +// CMakeKitAspectWidget: // -------------------------------------------------------------------- -class CMakeKitConfigWidget : public ProjectExplorer::KitConfigWidget +class CMakeKitAspectWidget : public ProjectExplorer::KitAspectWidget { Q_OBJECT public: - CMakeKitConfigWidget(ProjectExplorer::Kit *kit, const ProjectExplorer::KitInformation *ki); - ~CMakeKitConfigWidget() override; + CMakeKitAspectWidget(ProjectExplorer::Kit *kit, const ProjectExplorer::KitAspect *ki); + ~CMakeKitAspectWidget() override; - // KitConfigWidget interface + // KitAspectWidget interface QString displayName() const override; void makeReadOnly() override; void refresh() override; @@ -80,17 +80,17 @@ private: }; // -------------------------------------------------------------------- -// CMakeGeneratorKitConfigWidget: +// CMakeGeneratorKitAspectWidget: // -------------------------------------------------------------------- -class CMakeGeneratorKitConfigWidget : public ProjectExplorer::KitConfigWidget +class CMakeGeneratorKitAspectWidget : public ProjectExplorer::KitAspectWidget { Q_OBJECT public: - CMakeGeneratorKitConfigWidget(ProjectExplorer::Kit *kit, const ProjectExplorer::KitInformation *ki); - ~CMakeGeneratorKitConfigWidget() override; + CMakeGeneratorKitAspectWidget(ProjectExplorer::Kit *kit, const ProjectExplorer::KitAspect *ki); + ~CMakeGeneratorKitAspectWidget() override; - // KitConfigWidget interface + // KitAspectWidget interface QString displayName() const override; void makeReadOnly() override; void refresh() override; @@ -108,16 +108,16 @@ private: }; // -------------------------------------------------------------------- -// CMakeConfigurationKitConfigWidget: +// CMakeConfigurationKitAspectWidget: // -------------------------------------------------------------------- -class CMakeConfigurationKitConfigWidget : public ProjectExplorer::KitConfigWidget +class CMakeConfigurationKitAspectWidget : public ProjectExplorer::KitAspectWidget { Q_OBJECT public: - CMakeConfigurationKitConfigWidget(ProjectExplorer::Kit *kit, const ProjectExplorer::KitInformation *ki); + CMakeConfigurationKitAspectWidget(ProjectExplorer::Kit *kit, const ProjectExplorer::KitAspect *ki); - // KitConfigWidget interface + // KitAspectWidget interface QString displayName() const override; void makeReadOnly() override; void refresh() override; diff --git a/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp b/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp index 4dc49ce630..24f578b557 100644 --- a/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp +++ b/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp @@ -48,7 +48,7 @@ using namespace ProjectExplorer; namespace CMakeProjectManager { // -------------------------------------------------------------------- -// CMakeKitInformation: +// CMakeKitAspect: // -------------------------------------------------------------------- static Core::Id defaultCMakeToolId() @@ -60,12 +60,12 @@ static Core::Id defaultCMakeToolId() static const char TOOL_ID[] = "CMakeProjectManager.CMakeKitInformation"; // -------------------------------------------------------------------- -// CMakeKitInformation: +// CMakeKitAspect: // -------------------------------------------------------------------- -CMakeKitInformation::CMakeKitInformation() +CMakeKitAspect::CMakeKitAspect() { - setObjectName(QLatin1String("CMakeKitInformation")); + setObjectName(QLatin1String("CMakeKitAspect")); setId(TOOL_ID); setPriority(20000); @@ -78,24 +78,24 @@ CMakeKitInformation::CMakeKitInformation() [this]() { foreach (Kit *k, KitManager::kits()) fix(k); }); } -Core::Id CMakeKitInformation::id() +Core::Id CMakeKitAspect::id() { return TOOL_ID; } -Core::Id CMakeKitInformation::cmakeToolId(const Kit *k) +Core::Id CMakeKitAspect::cmakeToolId(const Kit *k) { if (!k) return {}; return Core::Id::fromSetting(k->value(TOOL_ID)); } -CMakeTool *CMakeKitInformation::cmakeTool(const Kit *k) +CMakeTool *CMakeKitAspect::cmakeTool(const Kit *k) { return CMakeToolManager::findById(cmakeToolId(k)); } -void CMakeKitInformation::setCMakeTool(Kit *k, const Core::Id id) +void CMakeKitAspect::setCMakeTool(Kit *k, const Core::Id id) { const Core::Id toSet = id.isValid() ? id : defaultCMakeToolId(); QTC_ASSERT(!id.isValid() || CMakeToolManager::findById(toSet), return); @@ -103,16 +103,16 @@ void CMakeKitInformation::setCMakeTool(Kit *k, const Core::Id id) k->setValue(TOOL_ID, toSet.toSetting()); } -QVariant CMakeKitInformation::defaultValue(const Kit *k) const +QVariant CMakeKitAspect::defaultValue(const Kit *k) const { const Core::Id id = k ? defaultCMakeToolId() : Core::Id(); return id.toSetting(); } -QList CMakeKitInformation::validate(const Kit *k) const +QList CMakeKitAspect::validate(const Kit *k) const { QList result; - CMakeTool *tool = CMakeKitInformation::cmakeTool(k); + CMakeTool *tool = CMakeKitAspect::cmakeTool(k); if (tool) { CMakeTool::Version version = tool->version(); if (version.major < 3) { @@ -124,42 +124,42 @@ QList CMakeKitInformation::validate(const Kit *k) const return result; } -void CMakeKitInformation::setup(Kit *k) +void CMakeKitAspect::setup(Kit *k) { - CMakeTool *tool = CMakeKitInformation::cmakeTool(k); + CMakeTool *tool = CMakeKitAspect::cmakeTool(k); if (!tool) setCMakeTool(k, defaultCMakeToolId()); } -void CMakeKitInformation::fix(Kit *k) +void CMakeKitAspect::fix(Kit *k) { - if (!CMakeKitInformation::cmakeTool(k)) + if (!CMakeKitAspect::cmakeTool(k)) setup(k); } -KitInformation::ItemList CMakeKitInformation::toUserOutput(const Kit *k) const +KitAspect::ItemList CMakeKitAspect::toUserOutput(const Kit *k) const { const CMakeTool *const tool = cmakeTool(k); return ItemList() << qMakePair(tr("CMake"), tool ? tool->displayName() : tr("Unconfigured")); } -KitConfigWidget *CMakeKitInformation::createConfigWidget(Kit *k) const +KitAspectWidget *CMakeKitAspect::createConfigWidget(Kit *k) const { QTC_ASSERT(k, return nullptr); - return new Internal::CMakeKitConfigWidget(k, this); + return new Internal::CMakeKitAspectWidget(k, this); } -void CMakeKitInformation::addToMacroExpander(Kit *k, Utils::MacroExpander *expander) const +void CMakeKitAspect::addToMacroExpander(Kit *k, Utils::MacroExpander *expander) const { QTC_ASSERT(k, return); expander->registerFileVariables("CMake:Executable", tr("Path to the cmake executable"), [k]() -> QString { - CMakeTool *tool = CMakeKitInformation::cmakeTool(k); + CMakeTool *tool = CMakeKitAspect::cmakeTool(k); return tool ? tool->cmakeExecutable().toString() : QString(); }); } -QSet CMakeKitInformation::availableFeatures(const Kit *k) const +QSet CMakeKitAspect::availableFeatures(const Kit *k) const { if (cmakeTool(k)) return { CMakeProjectManager::Constants::CMAKE_FEATURE_ID }; @@ -167,7 +167,7 @@ QSet CMakeKitInformation::availableFeatures(const Kit *k) const } // -------------------------------------------------------------------- -// CMakeGeneratorKitInformation: +// CMakeGeneratorKitAspect: // -------------------------------------------------------------------- static const char GENERATOR_ID[] = "CMake.GeneratorKitInformation"; @@ -222,62 +222,62 @@ static void setGeneratorInfo(Kit *k, const GeneratorInfo &info) k->setValue(GENERATOR_ID, info.toVariant()); } -CMakeGeneratorKitInformation::CMakeGeneratorKitInformation() +CMakeGeneratorKitAspect::CMakeGeneratorKitAspect() { - setObjectName(QLatin1String("CMakeGeneratorKitInformation")); + setObjectName(QLatin1String("CMakeGeneratorKitAspect")); setId(GENERATOR_ID); setPriority(19000); } -QString CMakeGeneratorKitInformation::generator(const Kit *k) +QString CMakeGeneratorKitAspect::generator(const Kit *k) { return generatorInfo(k).generator; } -QString CMakeGeneratorKitInformation::extraGenerator(const Kit *k) +QString CMakeGeneratorKitAspect::extraGenerator(const Kit *k) { return generatorInfo(k).extraGenerator; } -QString CMakeGeneratorKitInformation::platform(const Kit *k) +QString CMakeGeneratorKitAspect::platform(const Kit *k) { return generatorInfo(k).platform; } -QString CMakeGeneratorKitInformation::toolset(const Kit *k) +QString CMakeGeneratorKitAspect::toolset(const Kit *k) { return generatorInfo(k).toolset; } -void CMakeGeneratorKitInformation::setGenerator(Kit *k, const QString &generator) +void CMakeGeneratorKitAspect::setGenerator(Kit *k, const QString &generator) { GeneratorInfo info = generatorInfo(k); info.generator = generator; setGeneratorInfo(k, info); } -void CMakeGeneratorKitInformation::setExtraGenerator(Kit *k, const QString &extraGenerator) +void CMakeGeneratorKitAspect::setExtraGenerator(Kit *k, const QString &extraGenerator) { GeneratorInfo info = generatorInfo(k); info.extraGenerator = extraGenerator; setGeneratorInfo(k, info); } -void CMakeGeneratorKitInformation::setPlatform(Kit *k, const QString &platform) +void CMakeGeneratorKitAspect::setPlatform(Kit *k, const QString &platform) { GeneratorInfo info = generatorInfo(k); info.platform = platform; setGeneratorInfo(k, info); } -void CMakeGeneratorKitInformation::setToolset(Kit *k, const QString &toolset) +void CMakeGeneratorKitAspect::setToolset(Kit *k, const QString &toolset) { GeneratorInfo info = generatorInfo(k); info.toolset = toolset; setGeneratorInfo(k, info); } -void CMakeGeneratorKitInformation::set(Kit *k, +void CMakeGeneratorKitAspect::set(Kit *k, const QString &generator, const QString &extraGenerator, const QString &platform, const QString &toolset) { @@ -285,7 +285,7 @@ void CMakeGeneratorKitInformation::set(Kit *k, setGeneratorInfo(k, info); } -QStringList CMakeGeneratorKitInformation::generatorArguments(const Kit *k) +QStringList CMakeGeneratorKitAspect::generatorArguments(const Kit *k) { QStringList result; GeneratorInfo info = generatorInfo(k); @@ -307,11 +307,11 @@ QStringList CMakeGeneratorKitInformation::generatorArguments(const Kit *k) return result; } -QVariant CMakeGeneratorKitInformation::defaultValue(const Kit *k) const +QVariant CMakeGeneratorKitAspect::defaultValue(const Kit *k) const { QTC_ASSERT(k, return QVariant()); - CMakeTool *tool = CMakeKitInformation::cmakeTool(k); + CMakeTool *tool = CMakeKitAspect::cmakeTool(k); if (!tool) return QVariant(); @@ -332,7 +332,7 @@ QVariant CMakeGeneratorKitInformation::defaultValue(const Kit *k) const if (Utils::HostOsInfo::isWindowsHost()) { // *sigh* Windows with its zoo of incompatible stuff again... - ToolChain *tc = ToolChainKitInformation::toolChain(k, ProjectExplorer::Constants::CXX_LANGUAGE_ID); + ToolChain *tc = ToolChainKitAspect::toolChain(k, ProjectExplorer::Constants::CXX_LANGUAGE_ID); if (tc && tc->typeId() == ProjectExplorer::Constants::MINGW_TOOLCHAIN_TYPEID) { it = std::find_if(known.constBegin(), known.constEnd(), [extraGenerator](const CMakeTool::Generator &g) { @@ -360,9 +360,9 @@ QVariant CMakeGeneratorKitInformation::defaultValue(const Kit *k) const return GeneratorInfo({it->name, extraGenerator, QString(), QString()}).toVariant(); } -QList CMakeGeneratorKitInformation::validate(const Kit *k) const +QList CMakeGeneratorKitAspect::validate(const Kit *k) const { - CMakeTool *tool = CMakeKitInformation::cmakeTool(k); + CMakeTool *tool = CMakeKitAspect::cmakeTool(k); GeneratorInfo info = generatorInfo(k); QList result; @@ -400,16 +400,16 @@ QList CMakeGeneratorKitInformation::validate(const Kit *k) const return result; } -void CMakeGeneratorKitInformation::setup(Kit *k) +void CMakeGeneratorKitAspect::setup(Kit *k) { GeneratorInfo info; info.fromVariant(defaultValue(k)); setGeneratorInfo(k, info); } -void CMakeGeneratorKitInformation::fix(Kit *k) +void CMakeGeneratorKitAspect::fix(Kit *k) { - const CMakeTool *tool = CMakeKitInformation::cmakeTool(k); + const CMakeTool *tool = CMakeKitAspect::cmakeTool(k); const GeneratorInfo info = generatorInfo(k); if (!tool) @@ -431,7 +431,7 @@ void CMakeGeneratorKitInformation::fix(Kit *k) } } -void CMakeGeneratorKitInformation::upgrade(Kit *k) +void CMakeGeneratorKitAspect::upgrade(Kit *k) { QTC_ASSERT(k, return); @@ -450,7 +450,7 @@ void CMakeGeneratorKitInformation::upgrade(Kit *k) } } -KitInformation::ItemList CMakeGeneratorKitInformation::toUserOutput(const Kit *k) const +KitAspect::ItemList CMakeGeneratorKitAspect::toUserOutput(const Kit *k) const { const GeneratorInfo info = generatorInfo(k); QString message; @@ -466,13 +466,13 @@ KitInformation::ItemList CMakeGeneratorKitInformation::toUserOutput(const Kit *k return ItemList() << qMakePair(tr("CMake Generator"), message); } -KitConfigWidget *CMakeGeneratorKitInformation::createConfigWidget(Kit *k) const +KitAspectWidget *CMakeGeneratorKitAspect::createConfigWidget(Kit *k) const { - return new Internal::CMakeGeneratorKitConfigWidget(k, this); + return new Internal::CMakeGeneratorKitAspectWidget(k, this); } // -------------------------------------------------------------------- -// CMakeConfigurationKitInformation: +// CMakeConfigurationKitAspect: // -------------------------------------------------------------------- static const char CONFIGURATION_ID[] = "CMake.ConfigurationKitInformation"; @@ -482,14 +482,14 @@ static const char CMAKE_CXX_TOOLCHAIN_KEY[] = "CMAKE_CXX_COMPILER"; static const char CMAKE_QMAKE_KEY[] = "QT_QMAKE_EXECUTABLE"; static const char CMAKE_PREFIX_PATH_KEY[] = "CMAKE_PREFIX_PATH"; -CMakeConfigurationKitInformation::CMakeConfigurationKitInformation() +CMakeConfigurationKitAspect::CMakeConfigurationKitAspect() { - setObjectName(QLatin1String("CMakeConfigurationKitInformation")); + setObjectName(QLatin1String("CMakeConfigurationKitAspect")); setId(CONFIGURATION_ID); setPriority(18000); } -CMakeConfig CMakeConfigurationKitInformation::configuration(const Kit *k) +CMakeConfig CMakeConfigurationKitAspect::configuration(const Kit *k) { if (!k) return CMakeConfig(); @@ -497,7 +497,7 @@ CMakeConfig CMakeConfigurationKitInformation::configuration(const Kit *k) return Utils::transform(tmp, &CMakeConfigItem::fromString); } -void CMakeConfigurationKitInformation::setConfiguration(Kit *k, const CMakeConfig &config) +void CMakeConfigurationKitAspect::setConfiguration(Kit *k, const CMakeConfig &config) { if (!k) return; @@ -505,17 +505,17 @@ void CMakeConfigurationKitInformation::setConfiguration(Kit *k, const CMakeConfi k->setValue(CONFIGURATION_ID, tmp); } -QStringList CMakeConfigurationKitInformation::toStringList(const Kit *k) +QStringList CMakeConfigurationKitAspect::toStringList(const Kit *k) { QStringList current - = Utils::transform(CMakeConfigurationKitInformation::configuration(k), + = Utils::transform(CMakeConfigurationKitAspect::configuration(k), [](const CMakeConfigItem &i) { return i.toString(); }); current = Utils::filtered(current, [](const QString &s) { return !s.isEmpty(); }); Utils::sort(current); return current; } -void CMakeConfigurationKitInformation::fromStringList(Kit *k, const QStringList &in) +void CMakeConfigurationKitAspect::fromStringList(Kit *k, const QStringList &in) { CMakeConfig result; foreach (const QString &s, in) { @@ -526,7 +526,7 @@ void CMakeConfigurationKitInformation::fromStringList(Kit *k, const QStringList setConfiguration(k, result); } -CMakeConfig CMakeConfigurationKitInformation::defaultConfiguration(const Kit *k) +CMakeConfig CMakeConfigurationKitAspect::defaultConfiguration(const Kit *k) { Q_UNUSED(k); CMakeConfig config; @@ -541,7 +541,7 @@ CMakeConfig CMakeConfigurationKitInformation::defaultConfiguration(const Kit *k) return config; } -QVariant CMakeConfigurationKitInformation::defaultValue(const Kit *k) const +QVariant CMakeConfigurationKitAspect::defaultValue(const Kit *k) const { Q_UNUSED(k); @@ -552,13 +552,13 @@ QVariant CMakeConfigurationKitInformation::defaultValue(const Kit *k) const return tmp; } -QList CMakeConfigurationKitInformation::validate(const Kit *k) const +QList CMakeConfigurationKitAspect::validate(const Kit *k) const { QTC_ASSERT(k, return QList()); - const QtSupport::BaseQtVersion *const version = QtSupport::QtKitInformation::qtVersion(k); - const ToolChain *const tcC = ToolChainKitInformation::toolChain(k, ProjectExplorer::Constants::C_LANGUAGE_ID); - const ToolChain *const tcCxx = ToolChainKitInformation::toolChain(k, ProjectExplorer::Constants::CXX_LANGUAGE_ID); + const QtSupport::BaseQtVersion *const version = QtSupport::QtKitAspect::qtVersion(k); + const ToolChain *const tcC = ToolChainKitAspect::toolChain(k, ProjectExplorer::Constants::C_LANGUAGE_ID); + const ToolChain *const tcCxx = ToolChainKitAspect::toolChain(k, ProjectExplorer::Constants::CXX_LANGUAGE_ID); const CMakeConfig config = configuration(k); const bool isQt4 = version && version->qtVersion() < QtSupport::QtVersionNumber(5, 0, 0); @@ -650,28 +650,28 @@ QList CMakeConfigurationKitInformation::validate(const Kit *k) const return result; } -void CMakeConfigurationKitInformation::setup(Kit *k) +void CMakeConfigurationKitAspect::setup(Kit *k) { if (k && !k->hasValue(CONFIGURATION_ID)) k->setValue(CONFIGURATION_ID, defaultValue(k)); } -void CMakeConfigurationKitInformation::fix(Kit *k) +void CMakeConfigurationKitAspect::fix(Kit *k) { Q_UNUSED(k); } -KitInformation::ItemList CMakeConfigurationKitInformation::toUserOutput(const Kit *k) const +KitAspect::ItemList CMakeConfigurationKitAspect::toUserOutput(const Kit *k) const { const QStringList current = toStringList(k); return ItemList() << qMakePair(tr("CMake Configuration"), current.join(QLatin1String("
"))); } -KitConfigWidget *CMakeConfigurationKitInformation::createConfigWidget(Kit *k) const +KitAspectWidget *CMakeConfigurationKitAspect::createConfigWidget(Kit *k) const { if (!k) return nullptr; - return new Internal::CMakeConfigurationKitConfigWidget(k, this); + return new Internal::CMakeConfigurationKitAspectWidget(k, this); } } // namespace CMakeProjectManager diff --git a/src/plugins/cmakeprojectmanager/cmakekitinformation.h b/src/plugins/cmakeprojectmanager/cmakekitinformation.h index 3da3f7d7b2..fa8fb3658a 100644 --- a/src/plugins/cmakeprojectmanager/cmakekitinformation.h +++ b/src/plugins/cmakeprojectmanager/cmakekitinformation.h @@ -35,11 +35,11 @@ namespace CMakeProjectManager { class CMakeTool; -class CMAKE_EXPORT CMakeKitInformation : public ProjectExplorer::KitInformation +class CMAKE_EXPORT CMakeKitAspect : public ProjectExplorer::KitAspect { Q_OBJECT public: - CMakeKitInformation(); + CMakeKitAspect(); static Core::Id id(); @@ -47,24 +47,24 @@ public: static CMakeTool *cmakeTool(const ProjectExplorer::Kit *k); static void setCMakeTool(ProjectExplorer::Kit *k, const Core::Id id); - // KitInformation interface + // KitAspect interface QVariant defaultValue(const ProjectExplorer::Kit *k) const final; QList validate(const ProjectExplorer::Kit *k) const final; void setup(ProjectExplorer::Kit *k) final; void fix(ProjectExplorer::Kit *k) final; ItemList toUserOutput(const ProjectExplorer::Kit *k) const final; - ProjectExplorer::KitConfigWidget *createConfigWidget(ProjectExplorer::Kit *k) const final; + ProjectExplorer::KitAspectWidget *createConfigWidget(ProjectExplorer::Kit *k) const final; void addToMacroExpander(ProjectExplorer::Kit *k, Utils::MacroExpander *expander) const final; QSet availableFeatures(const ProjectExplorer::Kit *k) const final; }; -class CMAKE_EXPORT CMakeGeneratorKitInformation : public ProjectExplorer::KitInformation +class CMAKE_EXPORT CMakeGeneratorKitAspect : public ProjectExplorer::KitAspect { Q_OBJECT public: - CMakeGeneratorKitInformation(); + CMakeGeneratorKitAspect(); static QString generator(const ProjectExplorer::Kit *k); static QString extraGenerator(const ProjectExplorer::Kit *k); @@ -78,21 +78,21 @@ public: const QString &extraGenerator, const QString &platform, const QString &toolset); static QStringList generatorArguments(const ProjectExplorer::Kit *k); - // KitInformation interface + // KitAspect interface QVariant defaultValue(const ProjectExplorer::Kit *k) const final; QList validate(const ProjectExplorer::Kit *k) const final; void setup(ProjectExplorer::Kit *k) final; void fix(ProjectExplorer::Kit *k) final; void upgrade(ProjectExplorer::Kit *k) final; ItemList toUserOutput(const ProjectExplorer::Kit *k) const final; - ProjectExplorer::KitConfigWidget *createConfigWidget(ProjectExplorer::Kit *k) const final; + ProjectExplorer::KitAspectWidget *createConfigWidget(ProjectExplorer::Kit *k) const final; }; -class CMAKE_EXPORT CMakeConfigurationKitInformation : public ProjectExplorer::KitInformation +class CMAKE_EXPORT CMakeConfigurationKitAspect : public ProjectExplorer::KitAspect { Q_OBJECT public: - CMakeConfigurationKitInformation(); + CMakeConfigurationKitAspect(); static CMakeConfig configuration(const ProjectExplorer::Kit *k); static void setConfiguration(ProjectExplorer::Kit *k, const CMakeConfig &config); @@ -102,13 +102,13 @@ public: static CMakeConfig defaultConfiguration(const ProjectExplorer::Kit *k); - // KitInformation interface + // KitAspect interface QVariant defaultValue(const ProjectExplorer::Kit *k) const final; QList validate(const ProjectExplorer::Kit *k) const final; void setup(ProjectExplorer::Kit *k) final; void fix(ProjectExplorer::Kit *k) final; ItemList toUserOutput(const ProjectExplorer::Kit *k) const final; - ProjectExplorer::KitConfigWidget *createConfigWidget(ProjectExplorer::Kit *k) const final; + ProjectExplorer::KitAspectWidget *createConfigWidget(ProjectExplorer::Kit *k) const final; }; } // namespace CMakeProjectManager diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.cpp b/src/plugins/cmakeprojectmanager/cmakeproject.cpp index ec8e0d076d..989cc7b446 100644 --- a/src/plugins/cmakeprojectmanager/cmakeproject.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeproject.cpp @@ -360,9 +360,9 @@ QList CMakeProject::projectIssues(const Kit *k) const { QList result = Project::projectIssues(k); - if (!CMakeKitInformation::cmakeTool(k)) + if (!CMakeKitAspect::cmakeTool(k)) result.append(createProjectTask(Task::TaskType::Error, tr("No cmake tool set."))); - if (ToolChainKitInformation::toolChains(k).isEmpty()) + if (ToolChainKitAspect::toolChains(k).isEmpty()) result.append(createProjectTask(Task::TaskType::Warning, tr("No compilers set in kit."))); return result; diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp index 170e52e933..77ae1887bd 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp @@ -107,7 +107,7 @@ namespace Internal { CMakeProjectImporter::CMakeProjectImporter(const Utils::FileName &path) : QtProjectImporter(path) { - useTemporaryKitInformation(CMakeKitInformation::id(), + useTemporaryKitAspect(CMakeKitAspect::id(), [this](Kit *k, const QVariantList &vl) { cleanupTemporaryCMake(k, vl); }, [this](Kit *k, const QVariantList &vl) { persistTemporaryCMake(k, vl); }); @@ -286,24 +286,24 @@ bool CMakeProjectImporter::matchKit(void *directoryData, const Kit *k) const { const DirectoryData *data = static_cast(directoryData); - CMakeTool *cm = CMakeKitInformation::cmakeTool(k); + CMakeTool *cm = CMakeKitAspect::cmakeTool(k); if (!cm || cm->cmakeExecutable() != data->cmakeBinary) return false; - if (CMakeGeneratorKitInformation::generator(k) != QString::fromUtf8(data->generator) - || CMakeGeneratorKitInformation::extraGenerator(k) != QString::fromUtf8(data->extraGenerator) - || CMakeGeneratorKitInformation::platform(k) != QString::fromUtf8(data->platform) - || CMakeGeneratorKitInformation::toolset(k) != QString::fromUtf8(data->toolset)) + if (CMakeGeneratorKitAspect::generator(k) != QString::fromUtf8(data->generator) + || CMakeGeneratorKitAspect::extraGenerator(k) != QString::fromUtf8(data->extraGenerator) + || CMakeGeneratorKitAspect::platform(k) != QString::fromUtf8(data->platform) + || CMakeGeneratorKitAspect::toolset(k) != QString::fromUtf8(data->toolset)) return false; - if (SysRootKitInformation::sysRoot(k) != Utils::FileName::fromUtf8(data->sysroot)) + if (SysRootKitAspect::sysRoot(k) != Utils::FileName::fromUtf8(data->sysroot)) return false; - if (data->qt.qt && QtSupport::QtKitInformation::qtVersionId(k) != data->qt.qt->uniqueId()) + if (data->qt.qt && QtSupport::QtKitAspect::qtVersionId(k) != data->qt.qt->uniqueId()) return false; for (const CMakeToolChainData &tcd : data->toolChains) { - ToolChain *tc = ToolChainKitInformation::toolChain(k, tcd.mapLanguageIdToQtC()); + ToolChain *tc = ToolChainKitAspect::toolChain(k, tcd.mapLanguageIdToQtC()); if (!tc || tc->compilerCommand() != tcd.compilerPath) return false; } @@ -321,14 +321,14 @@ Kit *CMakeProjectImporter::createKit(void *directoryData) const const CMakeToolData cmtd = findOrCreateCMakeTool(data->cmakeBinary); QTC_ASSERT(cmtd.cmakeTool, return); if (cmtd.isTemporary) - addTemporaryData(CMakeKitInformation::id(), cmtd.cmakeTool->id().toSetting(), k); + addTemporaryData(CMakeKitAspect::id(), cmtd.cmakeTool->id().toSetting(), k); - CMakeGeneratorKitInformation::setGenerator(k, QString::fromUtf8(data->generator)); - CMakeGeneratorKitInformation::setExtraGenerator(k, QString::fromUtf8(data->extraGenerator)); - CMakeGeneratorKitInformation::setPlatform(k, QString::fromUtf8(data->platform)); - CMakeGeneratorKitInformation::setToolset(k, QString::fromUtf8(data->toolset)); + CMakeGeneratorKitAspect::setGenerator(k, QString::fromUtf8(data->generator)); + CMakeGeneratorKitAspect::setExtraGenerator(k, QString::fromUtf8(data->extraGenerator)); + CMakeGeneratorKitAspect::setPlatform(k, QString::fromUtf8(data->platform)); + CMakeGeneratorKitAspect::setToolset(k, QString::fromUtf8(data->toolset)); - SysRootKitInformation::setSysRoot(k, Utils::FileName::fromUtf8(data->sysroot)); + SysRootKitAspect::setSysRoot(k, Utils::FileName::fromUtf8(data->sysroot)); for (const CMakeToolChainData &cmtcd : data->toolChains) { const ToolChainData tcd @@ -337,10 +337,10 @@ Kit *CMakeProjectImporter::createKit(void *directoryData) const if (tcd.areTemporary) { for (ToolChain *tc : tcd.tcs) - addTemporaryData(ToolChainKitInformation::id(), tc->id(), k); + addTemporaryData(ToolChainKitAspect::id(), tc->id(), k); } - ToolChainKitInformation::setToolChain(k, tcd.tcs.at(0)); + ToolChainKitAspect::setToolChain(k, tcd.tcs.at(0)); } qCInfo(cmInputLog()) << "Temporary Kit created."; @@ -388,7 +388,7 @@ void CMakeProjectImporter::cleanupTemporaryCMake(Kit *k, const QVariantList &vl) if (vl.isEmpty()) return; // No temporary CMake QTC_ASSERT(vl.count() == 1, return); - CMakeKitInformation::setCMakeTool(k, Core::Id()); // Always mark Kit as not using this Qt + CMakeKitAspect::setCMakeTool(k, Core::Id()); // Always mark Kit as not using this Qt CMakeToolManager::deregisterCMakeTool(Core::Id::fromSetting(vl.at(0))); qCDebug(cmInputLog()) << "Temporary CMake tool cleaned up."; } @@ -400,7 +400,7 @@ void CMakeProjectImporter::persistTemporaryCMake(Kit *k, const QVariantList &vl) QTC_ASSERT(vl.count() == 1, return); const QVariant data = vl.at(0); CMakeTool *tmpCmake = CMakeToolManager::findById(Core::Id::fromSetting(data)); - CMakeTool *actualCmake = CMakeKitInformation::cmakeTool(k); + CMakeTool *actualCmake = CMakeKitAspect::cmakeTool(k); // User changed Kit away from temporary CMake that was set up: if (tmpCmake && actualCmake != tmpCmake) diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp index ebd5d44d42..c5085199f9 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp @@ -106,9 +106,9 @@ bool CMakeProjectPlugin::initialize(const QStringList & /*arguments*/, QString * new CMakeToolManager(this); - KitManager::registerKitInformation(); - KitManager::registerKitInformation(); - KitManager::registerKitInformation(); + KitManager::registerKitAspect(); + KitManager::registerKitAspect(); + KitManager::registerKitAspect(); //menus ActionContainer *msubproject = diff --git a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp index 3872fe90f4..073a147dd7 100644 --- a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp +++ b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp @@ -49,7 +49,7 @@ CMakeRunConfiguration::CMakeRunConfiguration(Target *target, Core::Id id) return; const Kit *k = target->kit(); - const QtSupport::BaseQtVersion *qt = QtSupport::QtKitInformation::qtVersion(k); + const QtSupport::BaseQtVersion *qt = QtSupport::QtKitAspect::qtVersion(k); if (qt) env.prependOrSetPath(qt->qmakeProperty("QT_INSTALL_BINS")); }; @@ -63,7 +63,7 @@ CMakeRunConfiguration::CMakeRunConfiguration(Target *target, Core::Id id) connect(target->project(), &Project::parsingFinished, this, &CMakeRunConfiguration::updateTargetInformation); - if (QtSupport::QtKitInformation::qtVersion(target->kit())) + if (QtSupport::QtKitAspect::qtVersion(target->kit())) setOutputFormatter(); } diff --git a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp index f4865d7edf..f29749a210 100644 --- a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp +++ b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp @@ -134,7 +134,7 @@ QString compilerPath(QString pathFlag) ToolChain *toolchainFromFlags(const Kit *kit, const QStringList &flags, const Core::Id &language) { if (flags.empty()) - return ToolChainKitInformation::toolChain(kit, language); + return ToolChainKitAspect::toolChain(kit, language); // Try exact compiler match. const Utils::FileName compiler = Utils::FileName::fromString(compilerPath(flags.front())); @@ -157,7 +157,7 @@ ToolChain *toolchainFromFlags(const Kit *kit, const QStringList &flags, const Co return toolchain; } - toolchain = ToolChainKitInformation::toolChain(kit, language); + toolchain = ToolChainKitAspect::toolChain(kit, language); qWarning() << "No matching toolchain found, use the default."; return toolchain; } @@ -216,7 +216,7 @@ CppTools::RawProjectPart makeRawProjectPart(const Utils::FileName &projectFile, if (!cToolchain) { cToolchain = toolchainFromFlags(kit, originalFlags, ProjectExplorer::Constants::C_LANGUAGE_ID); - ToolChainKitInformation::setToolChain(kit, cToolchain); + ToolChainKitAspect::setToolChain(kit, cToolchain); } addDriverModeFlagIfNeeded(cToolchain, flags); rpp.setFlagsForC({cToolchain, flags}); @@ -224,7 +224,7 @@ CppTools::RawProjectPart makeRawProjectPart(const Utils::FileName &projectFile, if (!cxxToolchain) { cxxToolchain = toolchainFromFlags(kit, originalFlags, ProjectExplorer::Constants::CXX_LANGUAGE_ID); - ToolChainKitInformation::setToolChain(kit, cxxToolchain); + ToolChainKitAspect::setToolChain(kit, cxxToolchain); } addDriverModeFlagIfNeeded(cxxToolchain, flags); rpp.setFlagsForCxx({cxxToolchain, flags}); diff --git a/src/plugins/cpptools/cppkitinfo.cpp b/src/plugins/cpptools/cppkitinfo.cpp index 6cdf7d52df..e57a4dbd73 100644 --- a/src/plugins/cpptools/cppkitinfo.cpp +++ b/src/plugins/cpptools/cppkitinfo.cpp @@ -48,12 +48,12 @@ KitInfo::KitInfo(Project *project) // Toolchains if (kit) { - cToolChain = ToolChainKitInformation::toolChain(kit, Constants::C_LANGUAGE_ID); - cxxToolChain = ToolChainKitInformation::toolChain(kit, Constants::CXX_LANGUAGE_ID); + cToolChain = ToolChainKitAspect::toolChain(kit, Constants::C_LANGUAGE_ID); + cxxToolChain = ToolChainKitAspect::toolChain(kit, Constants::CXX_LANGUAGE_ID); } // Sysroot - sysRootPath = ProjectExplorer::SysRootKitInformation::sysRoot(kit).toString(); + sysRootPath = ProjectExplorer::SysRootKitAspect::sysRoot(kit).toString(); } bool KitInfo::isValid() const diff --git a/src/plugins/debugger/analyzer/startremotedialog.cpp b/src/plugins/debugger/analyzer/startremotedialog.cpp index 0702536262..3d0b9d253d 100644 --- a/src/plugins/debugger/analyzer/startremotedialog.cpp +++ b/src/plugins/debugger/analyzer/startremotedialog.cpp @@ -63,7 +63,7 @@ StartRemoteDialog::StartRemoteDialog(QWidget *parent) d->kitChooser = new KitChooser(this); d->kitChooser->setKitPredicate([](const Kit *kit) { - const IDevice::ConstPtr device = DeviceKitInformation::device(kit); + const IDevice::ConstPtr device = DeviceKitAspect::device(kit); return kit->isValid() && device && !device->sshParameters().host().isEmpty(); }); d->executable = new QLineEdit(this); @@ -132,7 +132,7 @@ Runnable StartRemoteDialog::runnable() const { Kit *kit = d->kitChooser->currentKit(); Runnable r; - r.device = DeviceKitInformation::device(kit); + r.device = DeviceKitAspect::device(kit); r.executable = d->executable->text(); r.commandLineArguments = d->arguments->text(); r.workingDirectory = d->workingDirectory->text(); diff --git a/src/plugins/debugger/debuggerdialogs.cpp b/src/plugins/debugger/debuggerdialogs.cpp index db5731a5aa..00f34e6952 100644 --- a/src/plugins/debugger/debuggerdialogs.cpp +++ b/src/plugins/debugger/debuggerdialogs.cpp @@ -109,21 +109,21 @@ DebuggerKitChooser::DebuggerKitChooser(Mode mode, QWidget *parent) { setKitPredicate([this](const Kit *k) { // Match valid debuggers and restrict local debugging to compatible toolchains. - auto errors = DebuggerKitInformation::configurationErrors(k); + auto errors = DebuggerKitAspect::configurationErrors(k); // we do not care for mismatched ABI if we want *any* debugging - if (m_mode == AnyDebugging && errors == DebuggerKitInformation::DebuggerDoesNotMatch) - errors = DebuggerKitInformation::NoConfigurationError; + if (m_mode == AnyDebugging && errors == DebuggerKitAspect::DebuggerDoesNotMatch) + errors = DebuggerKitAspect::NoConfigurationError; if (errors) return false; if (m_mode == LocalDebugging) - return ToolChainKitInformation::targetAbi(k).os() == m_hostAbi.os(); + return ToolChainKitAspect::targetAbi(k).os() == m_hostAbi.os(); return true; }); } QString DebuggerKitChooser::kitToolTip(Kit *k) const { - return DebuggerKitInformation::displayString(k); + return DebuggerKitAspect::displayString(k); } /////////////////////////////////////////////////////////////////////// @@ -229,7 +229,7 @@ StartApplicationDialog::StartApplicationDialog(QWidget *parent) d->kitChooser = new KitChooser(this); d->kitChooser->setKitPredicate([](const Kit *k) { - return !DebuggerKitInformation::configurationErrors(k); + return !DebuggerKitAspect::configurationErrors(k); }); d->kitChooser->populate(); @@ -403,7 +403,7 @@ void StartApplicationDialog::run(bool attachRemote) return; Kit *k = dialog.d->kitChooser->currentKit(); - IDevice::ConstPtr dev = DeviceKitInformation::device(k); + IDevice::ConstPtr dev = DeviceKitAspect::device(k); auto runControl = new RunControl(nullptr, ProjectExplorer::Constants::DEBUG_RUN_MODE); auto debugger = new DebuggerRunTool(runControl, k); diff --git a/src/plugins/debugger/debuggeritem.cpp b/src/plugins/debugger/debuggeritem.cpp index 2c889a016b..c985931ecb 100644 --- a/src/plugins/debugger/debuggeritem.cpp +++ b/src/plugins/debugger/debuggeritem.cpp @@ -303,14 +303,14 @@ QString DebuggerItem::displayName() const return m_unexpandedDisplayName; MacroExpander expander; - expander.registerVariable("Debugger:Type", DebuggerKitInformation::tr("Type of Debugger Backend"), + expander.registerVariable("Debugger:Type", DebuggerKitAspect::tr("Type of Debugger Backend"), [this] { return engineTypeName(); }); - expander.registerVariable("Debugger:Version", DebuggerKitInformation::tr("Debugger"), + expander.registerVariable("Debugger:Version", DebuggerKitAspect::tr("Debugger"), [this] { return !m_version.isEmpty() ? m_version : - DebuggerKitInformation::tr("Unknown debugger version"); }); - expander.registerVariable("Debugger:Abi", DebuggerKitInformation::tr("Debugger"), + DebuggerKitAspect::tr("Unknown debugger version"); }); + expander.registerVariable("Debugger:Abi", DebuggerKitAspect::tr("Debugger"), [this] { return !m_abis.isEmpty() ? abiNames().join(' ') : - DebuggerKitInformation::tr("Unknown debugger ABI"); }); + DebuggerKitAspect::tr("Unknown debugger ABI"); }); return expander.expand(m_unexpandedDisplayName); } diff --git a/src/plugins/debugger/debuggeritemmanager.cpp b/src/plugins/debugger/debuggeritemmanager.cpp index 1cd8b3ec09..d0eebeebd2 100644 --- a/src/plugins/debugger/debuggeritemmanager.cpp +++ b/src/plugins/debugger/debuggeritemmanager.cpp @@ -790,7 +790,7 @@ void DebuggerItemManagerPrivate::readLegacyDebuggers(const FileName &file) QVariantMap data1 = v.toMap(); QString kitName = data1.value("PE.Profile.Name").toString(); QVariantMap data2 = data1.value("PE.Profile.Data").toMap(); - QVariant v3 = data2.value(DebuggerKitInformation::id().toString()); + QVariant v3 = data2.value(DebuggerKitAspect::id().toString()); QString fn; if (v3.type() == QVariant::String) fn = v3.toString(); diff --git a/src/plugins/debugger/debuggerkitconfigwidget.cpp b/src/plugins/debugger/debuggerkitconfigwidget.cpp index d95a2861ac..6d21b1915b 100644 --- a/src/plugins/debugger/debuggerkitconfigwidget.cpp +++ b/src/plugins/debugger/debuggerkitconfigwidget.cpp @@ -60,11 +60,11 @@ namespace Debugger { namespace Internal { // ----------------------------------------------------------------------- -// DebuggerKitConfigWidget +// DebuggerKitAspectWidget // ----------------------------------------------------------------------- -DebuggerKitConfigWidget::DebuggerKitConfigWidget(Kit *workingCopy, const KitInformation *ki) - : KitConfigWidget(workingCopy, ki) +DebuggerKitAspectWidget::DebuggerKitAspectWidget(Kit *workingCopy, const KitAspect *ki) + : KitAspectWidget(workingCopy, ki) { m_comboBox = new QComboBox; m_comboBox->setSizePolicy(QSizePolicy::Ignored, m_comboBox->sizePolicy().verticalPolicy()); @@ -72,37 +72,37 @@ DebuggerKitConfigWidget::DebuggerKitConfigWidget(Kit *workingCopy, const KitInfo refresh(); connect(m_comboBox, static_cast(&QComboBox::currentIndexChanged), - this, &DebuggerKitConfigWidget::currentDebuggerChanged); + this, &DebuggerKitAspectWidget::currentDebuggerChanged); - m_manageButton = new QPushButton(KitConfigWidget::msgManage()); + m_manageButton = new QPushButton(KitAspectWidget::msgManage()); m_manageButton->setContentsMargins(0, 0, 0, 0); connect(m_manageButton, &QAbstractButton::clicked, - this, &DebuggerKitConfigWidget::manageDebuggers); + this, &DebuggerKitAspectWidget::manageDebuggers); } -DebuggerKitConfigWidget::~DebuggerKitConfigWidget() +DebuggerKitAspectWidget::~DebuggerKitAspectWidget() { delete m_comboBox; delete m_manageButton; } -QString DebuggerKitConfigWidget::toolTip() const +QString DebuggerKitAspectWidget::toolTip() const { return tr("The debugger to use for this kit."); } -QString DebuggerKitConfigWidget::displayName() const +QString DebuggerKitAspectWidget::displayName() const { return tr("Debugger"); } -void DebuggerKitConfigWidget::makeReadOnly() +void DebuggerKitAspectWidget::makeReadOnly() { m_manageButton->setEnabled(false); m_comboBox->setEnabled(false); } -void DebuggerKitConfigWidget::refresh() +void DebuggerKitAspectWidget::refresh() { m_ignoreChanges = true; m_comboBox->clear(); @@ -111,43 +111,43 @@ void DebuggerKitConfigWidget::refresh() for (const DebuggerItem &item : DebuggerItemManager::debuggers()) m_comboBox->addItem(item.displayName(), item.id()); - const DebuggerItem *item = DebuggerKitInformation::debugger(m_kit); + const DebuggerItem *item = DebuggerKitAspect::debugger(m_kit); updateComboBox(item ? item->id() : QVariant()); m_ignoreChanges = false; } -QWidget *DebuggerKitConfigWidget::buttonWidget() const +QWidget *DebuggerKitAspectWidget::buttonWidget() const { return m_manageButton; } -QWidget *DebuggerKitConfigWidget::mainWidget() const +QWidget *DebuggerKitAspectWidget::mainWidget() const { return m_comboBox; } -void DebuggerKitConfigWidget::manageDebuggers() +void DebuggerKitAspectWidget::manageDebuggers() { Core::ICore::showOptionsDialog(ProjectExplorer::Constants::DEBUGGER_SETTINGS_PAGE_ID, buttonWidget()); } -void DebuggerKitConfigWidget::currentDebuggerChanged(int) +void DebuggerKitAspectWidget::currentDebuggerChanged(int) { if (m_ignoreChanges) return; int currentIndex = m_comboBox->currentIndex(); QVariant id = m_comboBox->itemData(currentIndex); - m_kit->setValue(DebuggerKitInformation::id(), id); + m_kit->setValue(DebuggerKitAspect::id(), id); } -QVariant DebuggerKitConfigWidget::currentId() const +QVariant DebuggerKitAspectWidget::currentId() const { return m_comboBox->itemData(m_comboBox->currentIndex()); } -void DebuggerKitConfigWidget::updateComboBox(const QVariant &id) +void DebuggerKitAspectWidget::updateComboBox(const QVariant &id) { for (int i = 0; i < m_comboBox->count(); ++i) { if (id == m_comboBox->itemData(i)) { diff --git a/src/plugins/debugger/debuggerkitconfigwidget.h b/src/plugins/debugger/debuggerkitconfigwidget.h index e424481bef..43141289be 100644 --- a/src/plugins/debugger/debuggerkitconfigwidget.h +++ b/src/plugins/debugger/debuggerkitconfigwidget.h @@ -45,17 +45,17 @@ namespace Debugger { namespace Internal { // ----------------------------------------------------------------------- -// DebuggerKitConfigWidget +// DebuggerKitAspectWidget // ----------------------------------------------------------------------- -class DebuggerKitConfigWidget : public ProjectExplorer::KitConfigWidget +class DebuggerKitAspectWidget : public ProjectExplorer::KitAspectWidget { Q_OBJECT public: - DebuggerKitConfigWidget(ProjectExplorer::Kit *workingCopy, - const ProjectExplorer::KitInformation *ki); - ~DebuggerKitConfigWidget() override; + DebuggerKitAspectWidget(ProjectExplorer::Kit *workingCopy, + const ProjectExplorer::KitAspect *ki); + ~DebuggerKitAspectWidget() override; QString displayName() const override; QString toolTip() const override; diff --git a/src/plugins/debugger/debuggerkitinformation.cpp b/src/plugins/debugger/debuggerkitinformation.cpp index 426df5dfa7..4efec5dd3a 100644 --- a/src/plugins/debugger/debuggerkitinformation.cpp +++ b/src/plugins/debugger/debuggerkitinformation.cpp @@ -46,19 +46,19 @@ using namespace Utils; namespace Debugger { // -------------------------------------------------------------------------- -// DebuggerKitInformation +// DebuggerKitAspect // -------------------------------------------------------------------------- -DebuggerKitInformation::DebuggerKitInformation() +DebuggerKitAspect::DebuggerKitAspect() { - setObjectName("DebuggerKitInformation"); - setId(DebuggerKitInformation::id()); + setObjectName("DebuggerKitAspect"); + setId(DebuggerKitAspect::id()); setPriority(28000); } -QVariant DebuggerKitInformation::defaultValue(const Kit *k) const +QVariant DebuggerKitAspect::defaultValue(const Kit *k) const { - const Abi toolChainAbi = ToolChainKitInformation::targetAbi(k); + const Abi toolChainAbi = ToolChainKitAspect::targetAbi(k); const Utils::FileNameList paths = Environment::systemEnvironment().path(); QVariant nextBestFit; for (const DebuggerItem &item : DebuggerItemManager::debuggers()) { @@ -75,7 +75,7 @@ QVariant DebuggerKitInformation::defaultValue(const Kit *k) const return nextBestFit; } -void DebuggerKitInformation::setup(Kit *k) +void DebuggerKitAspect::setup(Kit *k) { QTC_ASSERT(k, return); @@ -92,9 +92,9 @@ void DebuggerKitInformation::setup(Kit *k) // auto // 4 // - const QVariant rawId = k->value(DebuggerKitInformation::id()); + const QVariant rawId = k->value(DebuggerKitAspect::id()); - const Abi tcAbi = ToolChainKitInformation::targetAbi(k); + const Abi tcAbi = ToolChainKitAspect::targetAbi(k); // Get the best of the available debugger matching the kit's toolchain. // The general idea is to find an item that exactly matches what @@ -160,17 +160,17 @@ void DebuggerKitInformation::setup(Kit *k) } // Use the best id we found, or an invalid one. - k->setValue(DebuggerKitInformation::id(), bestLevel != DebuggerItem::DoesNotMatch ? bestItem.id() : QVariant()); + k->setValue(DebuggerKitAspect::id(), bestLevel != DebuggerItem::DoesNotMatch ? bestItem.id() : QVariant()); } // This handles the upgrade path from 2.8 to 3.0 -void DebuggerKitInformation::fix(Kit *k) +void DebuggerKitAspect::fix(Kit *k) { QTC_ASSERT(k, return); // This can be Id, binary path, but not "auto" anymore. - const QVariant rawId = k->value(DebuggerKitInformation::id()); + const QVariant rawId = k->value(DebuggerKitAspect::id()); if (rawId.isNull()) // No debugger set, that is fine. return; @@ -179,7 +179,7 @@ void DebuggerKitInformation::fix(Kit *k) if (!DebuggerItemManager::findById(rawId)) { qWarning("Unknown debugger id %s in kit %s", qPrintable(rawId.toString()), qPrintable(k->displayName())); - k->setValue(DebuggerKitInformation::id(), QVariant()); + k->setValue(DebuggerKitAspect::id(), QVariant()); } return; // All fine (now). } @@ -189,7 +189,7 @@ void DebuggerKitInformation::fix(Kit *k) if (binary == "auto") { // This should not happen as "auto" is handled by setup() already. QTC_CHECK(false); - k->setValue(DebuggerKitInformation::id(), QVariant()); + k->setValue(DebuggerKitAspect::id(), QVariant()); return; } @@ -198,21 +198,21 @@ void DebuggerKitInformation::fix(Kit *k) if (!item) { qWarning("Debugger command %s invalid in kit %s", qPrintable(binary), qPrintable(k->displayName())); - k->setValue(DebuggerKitInformation::id(), QVariant()); + k->setValue(DebuggerKitAspect::id(), QVariant()); return; } - k->setValue(DebuggerKitInformation::id(), item->id()); + k->setValue(DebuggerKitAspect::id(), item->id()); } // Check the configuration errors and return a flag mask. Provide a quick check and // a verbose one with a list of errors. -DebuggerKitInformation::ConfigurationErrors DebuggerKitInformation::configurationErrors(const Kit *k) +DebuggerKitAspect::ConfigurationErrors DebuggerKitAspect::configurationErrors(const Kit *k) { QTC_ASSERT(k, return NoDebugger); - const DebuggerItem *item = DebuggerKitInformation::debugger(k); + const DebuggerItem *item = DebuggerKitAspect::debugger(k); if (!item) return NoDebugger; @@ -226,10 +226,10 @@ DebuggerKitInformation::ConfigurationErrors DebuggerKitInformation::configuratio else if (!fi.isExecutable()) result |= DebuggerNotExecutable; - const Abi tcAbi = ToolChainKitInformation::targetAbi(k); + const Abi tcAbi = ToolChainKitAspect::targetAbi(k); if (item->matchTarget(tcAbi) == DebuggerItem::DoesNotMatch) { // currently restricting the check to desktop devices, may be extended to all device types - const IDevice::ConstPtr device = DeviceKitInformation::device(k); + const IDevice::ConstPtr device = DeviceKitAspect::device(k); if (device && device->type() == ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE) result |= DebuggerDoesNotMatch; } @@ -247,14 +247,14 @@ DebuggerKitInformation::ConfigurationErrors DebuggerKitInformation::configuratio return result; } -const DebuggerItem *DebuggerKitInformation::debugger(const Kit *kit) +const DebuggerItem *DebuggerKitAspect::debugger(const Kit *kit) { QTC_ASSERT(kit, return nullptr); - const QVariant id = kit->value(DebuggerKitInformation::id()); + const QVariant id = kit->value(DebuggerKitAspect::id()); return DebuggerItemManager::findById(id); } -Runnable DebuggerKitInformation::runnable(const Kit *kit) +Runnable DebuggerKitAspect::runnable(const Kit *kit) { Runnable runnable; if (const DebuggerItem *item = debugger(kit)) { @@ -266,7 +266,7 @@ Runnable DebuggerKitInformation::runnable(const Kit *kit) return runnable; } -QList DebuggerKitInformation::validateDebugger(const Kit *k) +QList DebuggerKitAspect::validateDebugger(const Kit *k) { QList result; @@ -303,12 +303,12 @@ QList DebuggerKitInformation::validateDebugger(const Kit *k) return result; } -KitConfigWidget *DebuggerKitInformation::createConfigWidget(Kit *k) const +KitAspectWidget *DebuggerKitAspect::createConfigWidget(Kit *k) const { - return new Internal::DebuggerKitConfigWidget(k, this); + return new Internal::DebuggerKitAspectWidget(k, this); } -void DebuggerKitInformation::addToMacroExpander(Kit *kit, MacroExpander *expander) const +void DebuggerKitAspect::addToMacroExpander(Kit *kit, MacroExpander *expander) const { QTC_ASSERT(kit, return); expander->registerVariable("Debugger:Name", tr("Name of Debugger"), @@ -339,19 +339,19 @@ void DebuggerKitInformation::addToMacroExpander(Kit *kit, MacroExpander *expande }); } -KitInformation::ItemList DebuggerKitInformation::toUserOutput(const Kit *k) const +KitAspect::ItemList DebuggerKitAspect::toUserOutput(const Kit *k) const { return ItemList() << qMakePair(tr("Debugger"), displayString(k)); } -DebuggerEngineType DebuggerKitInformation::engineType(const Kit *k) +DebuggerEngineType DebuggerKitAspect::engineType(const Kit *k) { const DebuggerItem *item = debugger(k); QTC_ASSERT(item, return NoEngineType); return item->engineType(); } -QString DebuggerKitInformation::displayString(const Kit *k) +QString DebuggerKitAspect::displayString(const Kit *k) { const DebuggerItem *item = debugger(k); if (!item) @@ -361,15 +361,15 @@ QString DebuggerKitInformation::displayString(const Kit *k) return binary.isEmpty() ? tr("%1 ").arg(name) : tr("%1 using \"%2\"").arg(name, binary); } -void DebuggerKitInformation::setDebugger(Kit *k, const QVariant &id) +void DebuggerKitAspect::setDebugger(Kit *k, const QVariant &id) { // Only register reasonably complete debuggers. QTC_ASSERT(DebuggerItemManager::findById(id), return); QTC_ASSERT(k, return); - k->setValue(DebuggerKitInformation::id(), id); + k->setValue(DebuggerKitAspect::id(), id); } -Core::Id DebuggerKitInformation::id() +Core::Id DebuggerKitAspect::id() { return "Debugger.Information"; } diff --git a/src/plugins/debugger/debuggerkitinformation.h b/src/plugins/debugger/debuggerkitinformation.h index 035f00dedf..34bb85e79d 100644 --- a/src/plugins/debugger/debuggerkitinformation.h +++ b/src/plugins/debugger/debuggerkitinformation.h @@ -34,17 +34,17 @@ namespace Debugger { class DebuggerItem; -class DEBUGGER_EXPORT DebuggerKitInformation : public ProjectExplorer::KitInformation +class DEBUGGER_EXPORT DebuggerKitAspect : public ProjectExplorer::KitAspect { Q_OBJECT public: - DebuggerKitInformation(); + DebuggerKitAspect(); QVariant defaultValue(const ProjectExplorer::Kit *k) const override; QList validate(const ProjectExplorer::Kit *k) const override - { return DebuggerKitInformation::validateDebugger(k); } + { return DebuggerKitAspect::validateDebugger(k); } void setup(ProjectExplorer::Kit *k) override; void fix(ProjectExplorer::Kit *k) override; @@ -66,7 +66,7 @@ public: static QList validateDebugger(const ProjectExplorer::Kit *k); static ConfigurationErrors configurationErrors(const ProjectExplorer::Kit *k); - ProjectExplorer::KitConfigWidget *createConfigWidget(ProjectExplorer::Kit *k) const override; + ProjectExplorer::KitAspectWidget *createConfigWidget(ProjectExplorer::Kit *k) const override; void addToMacroExpander(ProjectExplorer::Kit *kit, Utils::MacroExpander *expander) const override; ItemList toUserOutput(const ProjectExplorer::Kit *k) const override; diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index e52cb72314..03cc11a0c8 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/src/plugins/debugger/debuggerplugin.cpp @@ -549,12 +549,12 @@ QWidget *addSearch(BaseTreeView *treeView) static Kit::Predicate cdbPredicate(char wordWidth = 0) { return [wordWidth](const Kit *k) -> bool { - if (DebuggerKitInformation::engineType(k) != CdbEngineType - || DebuggerKitInformation::configurationErrors(k)) { + if (DebuggerKitAspect::engineType(k) != CdbEngineType + || DebuggerKitAspect::configurationErrors(k)) { return false; } if (wordWidth) - return ToolChainKitInformation::targetAbi(k).wordWidth() == wordWidth; + return ToolChainKitAspect::targetAbi(k).wordWidth() == wordWidth; return true; }; } @@ -810,14 +810,14 @@ static Kit *guessKitFromAbis(const QList &abis) if (!abis.isEmpty()) { // Try exact abis. kit = KitManager::kit([abis](const Kit *k) { - const Abi tcAbi = ToolChainKitInformation::targetAbi(k); - return abis.contains(tcAbi) && !DebuggerKitInformation::configurationErrors(k); + const Abi tcAbi = ToolChainKitAspect::targetAbi(k); + return abis.contains(tcAbi) && !DebuggerKitAspect::configurationErrors(k); }); if (!kit) { // Or something compatible. kit = KitManager::kit([abis](const Kit *k) { - const Abi tcAbi = ToolChainKitInformation::targetAbi(k); - return !DebuggerKitInformation::configurationErrors(k) + const Abi tcAbi = ToolChainKitAspect::targetAbi(k); + return !DebuggerKitAspect::configurationErrors(k) && Utils::contains(abis, [tcAbi](const Abi &a) { return a.isCompatibleWith(tcAbi); }); }); } @@ -882,7 +882,7 @@ bool DebuggerPluginPrivate::parseArgument(QStringList::const_iterator &it, if (!kit) kit = guessKitFromAbis(Abi::abisOfBinary(FileName::fromString(executable))); - IDevice::ConstPtr device = DeviceKitInformation::device(kit); + IDevice::ConstPtr device = DeviceKitAspect::device(kit); auto runControl = new RunControl(device, ProjectExplorer::Constants::DEBUG_RUN_MODE); auto debugger = new DebuggerRunTool(runControl, kit); debugger->setInferiorExecutable(executable); @@ -1577,7 +1577,7 @@ void DebuggerPluginPrivate::attachCore() setConfigValue("LastExternalStartScript", dlg.overrideStartScript()); setConfigValue("LastForceLocalCoreFile", dlg.forcesLocalCoreFile()); - IDevice::ConstPtr device = DeviceKitInformation::device(dlg.kit()); + IDevice::ConstPtr device = DeviceKitAspect::device(dlg.kit()); auto runControl = new RunControl(device, ProjectExplorer::Constants::DEBUG_RUN_MODE); auto debugger = new DebuggerRunTool(runControl, dlg.kit()); debugger->setInferiorExecutable(dlg.symbolFile()); @@ -1605,7 +1605,7 @@ void DebuggerPluginPrivate::startRemoteCdbSession() return; setConfigValue(connectionKey, dlg.connection()); - IDevice::ConstPtr device = DeviceKitInformation::device(kit); + IDevice::ConstPtr device = DeviceKitAspect::device(kit); auto runControl = new RunControl(device, ProjectExplorer::Constants::DEBUG_RUN_MODE); auto debugger = new DebuggerRunTool(runControl, kit); debugger->setStartMode(AttachToRemoteServer); @@ -1620,7 +1620,7 @@ public: RemoteAttachRunner(RunControl *runControl, Kit *kit, int pid) : DebuggerRunTool(runControl, kit) { - IDevice::ConstPtr device = DeviceKitInformation::device(kit); + IDevice::ConstPtr device = DeviceKitAspect::device(kit); setId("AttachToRunningProcess"); setUsePortsGatherer(true, false); portsGatherer()->setDevice(device); @@ -1656,7 +1656,7 @@ void DebuggerPluginPrivate::attachToRunningApplication() dlg->setAttribute(Qt::WA_DeleteOnClose); Kit *kit = kitChooser->currentKit(); QTC_ASSERT(kit, return); - IDevice::ConstPtr device = DeviceKitInformation::device(kit); + IDevice::ConstPtr device = DeviceKitAspect::device(kit); QTC_ASSERT(device, return); DeviceProcessItem process = dlg->currentProcess(); @@ -1693,14 +1693,14 @@ RunControl *DebuggerPluginPrivate::attachToRunningProcess(Kit *kit, DeviceProcessItem process, bool contAfterAttach) { QTC_ASSERT(kit, return nullptr); - IDevice::ConstPtr device = DeviceKitInformation::device(kit); + IDevice::ConstPtr device = DeviceKitAspect::device(kit); QTC_ASSERT(device, return nullptr); if (process.pid == 0) { AsynchronousMessageBox::warning(tr("Warning"), tr("Cannot attach to process with PID 0")); return nullptr; } - const Abi tcAbi = ToolChainKitInformation::targetAbi(kit); + const Abi tcAbi = ToolChainKitAspect::targetAbi(kit); const bool isWindows = (tcAbi.os() == Abi::WindowsOS); if (isWindows && isWinProcessBeingDebugged(process.pid)) { AsynchronousMessageBox::warning( @@ -1795,7 +1795,7 @@ void DebuggerPluginPrivate::attachToQmlPort() setConfigValue("LastQmlServerPort", dlg.port()); setConfigValue("LastProfile", kit->id().toSetting()); - IDevice::ConstPtr device = DeviceKitInformation::device(kit); + IDevice::ConstPtr device = DeviceKitAspect::device(kit); QTC_ASSERT(device, return); auto runControl = new RunControl(nullptr, ProjectExplorer::Constants::DEBUG_RUN_MODE); @@ -2073,7 +2073,7 @@ void DebuggerPluginPrivate::extensionsInitialized() if (runnable.device && runnable.device->type() == ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE) return true; - if (DeviceTypeKitInformation::deviceTypeId(runConfig->target()->kit()) + if (DeviceTypeKitAspect::deviceTypeId(runConfig->target()->kit()) == ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE) return true; @@ -2251,7 +2251,7 @@ bool DebuggerPlugin::initialize(const QStringList &arguments, QString *errorMess mstart->addSeparator(Constants::G_GENERAL); mstart->addSeparator(Constants::G_SPECIAL); - KitManager::registerKitInformation(); + KitManager::registerKitAspect(); // Task integration. //: Category under which Analyzer tasks are listed in Issues view @@ -2460,7 +2460,7 @@ void DebuggerUnitTests::initTestCase() // const QList allKits = KitManager::kits(); // if (allKits.count() != 1) // QSKIP("This test requires exactly one kit to be present"); -// const ToolChain * const toolchain = ToolChainKitInformation::toolChain(allKits.first()); +// const ToolChain * const toolchain = ToolChainKitAspect::toolChain(allKits.first()); // if (!toolchain) // QSKIP("This test requires that there is a kit with a toolchain."); // bool hasClangExecutable; diff --git a/src/plugins/debugger/debuggerrunconfigurationaspect.cpp b/src/plugins/debugger/debuggerrunconfigurationaspect.cpp index bd4b09060f..6e59ee00b2 100644 --- a/src/plugins/debugger/debuggerrunconfigurationaspect.cpp +++ b/src/plugins/debugger/debuggerrunconfigurationaspect.cpp @@ -278,7 +278,7 @@ void DebuggerRunConfigurationAspect::setUseMultiProcess(bool value) bool DebuggerRunConfigurationAspect::isQmlDebuggingSpinboxSuppressed() const { Kit *k = m_target->kit(); - IDevice::ConstPtr dev = DeviceKitInformation::device(k); + IDevice::ConstPtr dev = DeviceKitAspect::device(k); if (dev.isNull()) return false; return dev->canAutoDetectPorts(); diff --git a/src/plugins/debugger/debuggerruncontrol.cpp b/src/plugins/debugger/debuggerruncontrol.cpp index a664d30c40..6379b9a526 100644 --- a/src/plugins/debugger/debuggerruncontrol.cpp +++ b/src/plugins/debugger/debuggerruncontrol.cpp @@ -912,12 +912,12 @@ DebuggerRunTool::DebuggerRunTool(RunControl *runControl, Kit *kit, bool allowTer kit = runConfig->target()->kit(); QTC_ASSERT(kit, return); - m_runParameters.sysRoot = SysRootKitInformation::sysRoot(kit); + m_runParameters.sysRoot = SysRootKitAspect::sysRoot(kit); m_runParameters.macroExpander = kit->macroExpander(); - m_runParameters.debugger = DebuggerKitInformation::runnable(kit); - m_runParameters.cppEngineType = DebuggerKitInformation::engineType(kit); + m_runParameters.debugger = DebuggerKitAspect::runnable(kit); + m_runParameters.cppEngineType = DebuggerKitAspect::engineType(kit); - if (QtSupport::BaseQtVersion *qtVersion = QtSupport::QtKitInformation::qtVersion(kit)) + if (QtSupport::BaseQtVersion *qtVersion = QtSupport::QtKitAspect::qtVersion(kit)) m_runParameters.qtPackageSourceLocation = qtVersion->qtPackageSourcePath().toString(); if (auto aspect = runConfig ? runConfig->aspect() : nullptr) { @@ -943,7 +943,7 @@ DebuggerRunTool::DebuggerRunTool(RunControl *runControl, Kit *kit, bool allowTer m_runParameters.projectSourceFiles = project->files(Project::SourceFiles); } - m_runParameters.toolChainAbi = ToolChainKitInformation::targetAbi(kit); + m_runParameters.toolChainAbi = ToolChainKitAspect::targetAbi(kit); bool ok = false; int nativeMixedOverride = qgetenv("QTC_DEBUGGER_NATIVE_MIXED").toInt(&ok); @@ -952,7 +952,7 @@ DebuggerRunTool::DebuggerRunTool(RunControl *runControl, Kit *kit, bool allowTer // This will only be shown in some cases, but we don't want to access // the kit at that time anymore. - const QList tasks = DebuggerKitInformation::validateDebugger(kit); + const QList tasks = DebuggerKitAspect::validateDebugger(kit); for (const Task &t : tasks) { if (t.type != Task::Warning) m_runParameters.validationErrors.append(t.description); diff --git a/src/plugins/debugger/loadcoredialog.cpp b/src/plugins/debugger/loadcoredialog.cpp index 8bd68aa791..82d26e4ae7 100644 --- a/src/plugins/debugger/loadcoredialog.cpp +++ b/src/plugins/debugger/loadcoredialog.cpp @@ -137,7 +137,7 @@ void SelectRemoteFileDialog::attachToDevice(Kit *k) { m_buttonBox->button(QDialogButtonBox::Ok)->setEnabled(true); QTC_ASSERT(k, return); - IDevice::ConstPtr device = DeviceKitInformation::device(k); + IDevice::ConstPtr device = DeviceKitAspect::device(k); QTC_ASSERT(device, return); SshConnectionParameters sshParams = device->sshParameters(); m_fileSystemModel.setSshConnection(sshParams); @@ -352,7 +352,7 @@ bool AttachCoreDialog::isLocalKit() const { Kit *k = d->kitChooser->currentKit(); QTC_ASSERT(k, return false); - IDevice::ConstPtr device = DeviceKitInformation::device(k); + IDevice::ConstPtr device = DeviceKitAspect::device(k); QTC_ASSERT(device, return false); return device->type() == ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE; } @@ -367,7 +367,7 @@ void AttachCoreDialog::coreFileChanged(const QString &core) if (!HostOsInfo::isWindowsHost() && QFile::exists(core)) { Kit *k = d->kitChooser->currentKit(); QTC_ASSERT(k, return); - Runnable debugger = DebuggerKitInformation::runnable(k); + Runnable debugger = DebuggerKitAspect::runnable(k); CoreInfo cinfo = CoreInfo::readExecutableNameFromCore(debugger, core); if (!cinfo.foundExecutableName.isEmpty()) d->symbolFileName->setFileName(FileName::fromString(cinfo.foundExecutableName)); diff --git a/src/plugins/debugger/unstartedappwatcherdialog.cpp b/src/plugins/debugger/unstartedappwatcherdialog.cpp index 8a52c57e1d..25cfe10d7b 100644 --- a/src/plugins/debugger/unstartedappwatcherdialog.cpp +++ b/src/plugins/debugger/unstartedappwatcherdialog.cpp @@ -59,7 +59,7 @@ static bool isLocal(RunConfiguration *runConfiguration) { Target *target = runConfiguration ? runConfiguration->target() : nullptr; Kit *kit = target ? target->kit() : nullptr; - return DeviceTypeKitInformation::deviceTypeId(kit) == ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE; + return DeviceTypeKitAspect::deviceTypeId(kit) == ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE; } /*! @@ -275,7 +275,7 @@ void UnstartedAppWatcherDialog::stopAndCheckExecutable() void UnstartedAppWatcherDialog::kitChanged() { - const DebuggerItem *debugger = DebuggerKitInformation::debugger(m_kitChooser->currentKit()); + const DebuggerItem *debugger = DebuggerKitAspect::debugger(m_kitChooser->currentKit()); if (!debugger) return; if (debugger->engineType() == Debugger::CdbEngineType) { diff --git a/src/plugins/genericprojectmanager/genericbuildconfiguration.cpp b/src/plugins/genericprojectmanager/genericbuildconfiguration.cpp index 28dfdc86bb..40c7ea28d4 100644 --- a/src/plugins/genericprojectmanager/genericbuildconfiguration.cpp +++ b/src/plugins/genericprojectmanager/genericbuildconfiguration.cpp @@ -122,7 +122,7 @@ BuildConfiguration::BuildType GenericBuildConfiguration::buildType() const void GenericBuildConfiguration::addToEnvironment(Utils::Environment &env) const { prependCompilerPathToEnvironment(env); - const QtSupport::BaseQtVersion *qt = QtSupport::QtKitInformation::qtVersion(target()->kit()); + const QtSupport::BaseQtVersion *qt = QtSupport::QtKitAspect::qtVersion(target()->kit()); if (qt) env.prependOrSetPath(qt->binPath().toString()); } diff --git a/src/plugins/ios/iosbuildconfiguration.cpp b/src/plugins/ios/iosbuildconfiguration.cpp index 3f6de58d38..2d5b6022ca 100644 --- a/src/plugins/ios/iosbuildconfiguration.cpp +++ b/src/plugins/ios/iosbuildconfiguration.cpp @@ -58,7 +58,7 @@ QList IosBuildConfiguration::createSubConfigWidg { auto subConfigWidgets = QmakeBuildConfiguration::createSubConfigWidgets(); - Core::Id devType = ProjectExplorer::DeviceTypeKitInformation::deviceTypeId(target()->kit()); + Core::Id devType = ProjectExplorer::DeviceTypeKitAspect::deviceTypeId(target()->kit()); // Ownership of this widget is with BuildSettingsWidget auto buildSettingsWidget = new IosBuildSettingsWidget(devType, m_signingIdentifier, m_autoManagedSigning); @@ -113,7 +113,7 @@ void IosBuildConfiguration::updateQmakeCommand() if (!m_signingIdentifier.isEmpty() ) extraArgs << forceOverrideArg; - Core::Id devType = ProjectExplorer::DeviceTypeKitInformation::deviceTypeId(target()->kit()); + Core::Id devType = ProjectExplorer::DeviceTypeKitAspect::deviceTypeId(target()->kit()); if (devType == Constants::IOS_DEVICE_TYPE && !m_signingIdentifier.isEmpty()) { if (m_autoManagedSigning) { extraArgs << qmakeIosTeamSettings + m_signingIdentifier; diff --git a/src/plugins/ios/iosbuildstep.cpp b/src/plugins/ios/iosbuildstep.cpp index 8d78446c51..5b99ac6529 100644 --- a/src/plugins/ios/iosbuildstep.cpp +++ b/src/plugins/ios/iosbuildstep.cpp @@ -76,7 +76,7 @@ bool IosBuildStep::init() if (!bc) emit addTask(Task::buildConfigurationMissingTask()); - ToolChain *tc = ToolChainKitInformation::toolChain(target()->kit(), ProjectExplorer::Constants::CXX_LANGUAGE_ID); + ToolChain *tc = ToolChainKitAspect::toolChain(target()->kit(), ProjectExplorer::Constants::CXX_LANGUAGE_ID); if (!tc) emit addTask(Task::compilerMissingTask()); @@ -138,7 +138,7 @@ QStringList IosBuildStep::defaultArguments() const { QStringList res; Kit *kit = target()->kit(); - ToolChain *tc = ToolChainKitInformation::toolChain(kit, ProjectExplorer::Constants::CXX_LANGUAGE_ID); + ToolChain *tc = ToolChainKitAspect::toolChain(kit, ProjectExplorer::Constants::CXX_LANGUAGE_ID); switch (buildConfiguration()->buildType()) { case BuildConfiguration::Debug : res << "-configuration" << "Debug"; @@ -158,8 +158,8 @@ QStringList IosBuildStep::defaultArguments() const auto gtc = static_cast(tc); res << gtc->platformCodeGenFlags(); } - if (!SysRootKitInformation::sysRoot(kit).isEmpty()) - res << "-sdk" << SysRootKitInformation::sysRoot(kit).toString(); + if (!SysRootKitAspect::sysRoot(kit).isEmpty()) + res << "-sdk" << SysRootKitAspect::sysRoot(kit).toString(); res << "SYMROOT=" + buildConfiguration()->buildDirectory().toString(); return res; } diff --git a/src/plugins/ios/iosconfigurations.cpp b/src/plugins/ios/iosconfigurations.cpp index 3ceec86714..0cdb719852 100644 --- a/src/plugins/ios/iosconfigurations.cpp +++ b/src/plugins/ios/iosconfigurations.cpp @@ -168,7 +168,7 @@ static QHash findToolChains(const static QSet existingAutoDetectedIosKits() { return Utils::filtered(KitManager::kits(), [](Kit *kit) -> bool { - Core::Id deviceKind = DeviceTypeKitInformation::deviceTypeId(kit); + Core::Id deviceKind = DeviceTypeKitAspect::deviceTypeId(kit); return kit->isAutoDetected() && (deviceKind == Constants::IOS_DEVICE_TYPE || deviceKind == Constants::IOS_SIMULATOR_TYPE); }).toSet(); @@ -183,33 +183,33 @@ static void printKits(const QSet &kits) static void setupKit(Kit *kit, Core::Id pDeviceType, const ToolChainPair& toolChains, const QVariant &debuggerId, const Utils::FileName &sdkPath, BaseQtVersion *qtVersion) { - DeviceTypeKitInformation::setDeviceTypeId(kit, pDeviceType); + DeviceTypeKitAspect::setDeviceTypeId(kit, pDeviceType); if (toolChains.first) - ToolChainKitInformation::setToolChain(kit, toolChains.first); + ToolChainKitAspect::setToolChain(kit, toolChains.first); else - ToolChainKitInformation::clearToolChain(kit, ProjectExplorer::Constants::C_LANGUAGE_ID); + ToolChainKitAspect::clearToolChain(kit, ProjectExplorer::Constants::C_LANGUAGE_ID); if (toolChains.second) - ToolChainKitInformation::setToolChain(kit, toolChains.second); + ToolChainKitAspect::setToolChain(kit, toolChains.second); else - ToolChainKitInformation::clearToolChain(kit, ProjectExplorer::Constants::CXX_LANGUAGE_ID); + ToolChainKitAspect::clearToolChain(kit, ProjectExplorer::Constants::CXX_LANGUAGE_ID); - QtKitInformation::setQtVersion(kit, qtVersion); + QtKitAspect::setQtVersion(kit, qtVersion); // only replace debugger with the default one if we find an unusable one here // (since the user could have changed it) - if ((!DebuggerKitInformation::debugger(kit) - || !DebuggerKitInformation::debugger(kit)->isValid() - || DebuggerKitInformation::debugger(kit)->engineType() != LldbEngineType) + if ((!DebuggerKitAspect::debugger(kit) + || !DebuggerKitAspect::debugger(kit)->isValid() + || DebuggerKitAspect::debugger(kit)->engineType() != LldbEngineType) && debuggerId.isValid()) - DebuggerKitInformation::setDebugger(kit, debuggerId); + DebuggerKitAspect::setDebugger(kit, debuggerId); - kit->setMutable(DeviceKitInformation::id(), true); - kit->setSticky(QtKitInformation::id(), true); - kit->setSticky(ToolChainKitInformation::id(), true); - kit->setSticky(DeviceTypeKitInformation::id(), true); - kit->setSticky(SysRootKitInformation::id(), true); - kit->setSticky(DebuggerKitInformation::id(), false); + kit->setMutable(DeviceKitAspect::id(), true); + kit->setSticky(QtKitAspect::id(), true); + kit->setSticky(ToolChainKitAspect::id(), true); + kit->setSticky(DeviceTypeKitAspect::id(), true); + kit->setSticky(SysRootKitAspect::id(), true); + kit->setSticky(DebuggerKitAspect::id(), false); - SysRootKitInformation::setSysRoot(kit, sdkPath); + SysRootKitAspect::setSysRoot(kit, sdkPath); } static QVersionNumber findXcodeVersion(const Utils::FileName &developerPath) @@ -287,10 +287,10 @@ void IosConfigurations::updateAutomaticKitList() Kit *kit = Utils::findOrDefault(existingKits, [&pDeviceType, &platformToolchains, &qtVersion](const Kit *kit) { // we do not compare the sdk (thus automatically upgrading it in place if a // new Xcode is used). Change? - return DeviceTypeKitInformation::deviceTypeId(kit) == pDeviceType - && ToolChainKitInformation::toolChain(kit, ProjectExplorer::Constants::CXX_LANGUAGE_ID) == platformToolchains.second - && ToolChainKitInformation::toolChain(kit, ProjectExplorer::Constants::C_LANGUAGE_ID) == platformToolchains.first - && QtKitInformation::qtVersion(kit) == qtVersion; + return DeviceTypeKitAspect::deviceTypeId(kit) == pDeviceType + && ToolChainKitAspect::toolChain(kit, ProjectExplorer::Constants::CXX_LANGUAGE_ID) == platformToolchains.second + && ToolChainKitAspect::toolChain(kit, ProjectExplorer::Constants::C_LANGUAGE_ID) == platformToolchains.first + && QtKitAspect::qtVersion(kit) == qtVersion; }); QTC_ASSERT(!resultingKits.contains(kit), continue); if (kit) { diff --git a/src/plugins/ios/iosdeploystep.cpp b/src/plugins/ios/iosdeploystep.cpp index 65a225e7e6..d0a2b0c1fc 100644 --- a/src/plugins/ios/iosdeploystep.cpp +++ b/src/plugins/ios/iosdeploystep.cpp @@ -73,7 +73,7 @@ Core::Id IosDeployStep::stepId() void IosDeployStep::updateDisplayNames() { IDevice::ConstPtr dev = - DeviceKitInformation::device(target()->kit()); + DeviceKitAspect::device(target()->kit()); const QString devName = dev.isNull() ? IosDevice::name() : dev->displayName(); setDefaultDisplayName(tr("Deploy to %1").arg(devName)); setDisplayName(tr("Deploy to %1").arg(devName)); @@ -82,7 +82,7 @@ void IosDeployStep::updateDisplayNames() bool IosDeployStep::init() { QTC_ASSERT(m_transferStatus == NoTransfer, return false); - m_device = DeviceKitInformation::device(target()->kit()); + m_device = DeviceKitAspect::device(target()->kit()); auto runConfig = qobject_cast( this->target()->activeRunConfiguration()); QTC_ASSERT(runConfig, return false); diff --git a/src/plugins/ios/iosdevice.cpp b/src/plugins/ios/iosdevice.cpp index 0f8cd500a0..abb94ffe24 100644 --- a/src/plugins/ios/iosdevice.cpp +++ b/src/plugins/ios/iosdevice.cpp @@ -538,11 +538,11 @@ void IosDeviceManager::updateAvailableDevices(const QStringList &devices) } } -IosDevice::ConstPtr IosKitInformation::device(Kit *kit) +IosDevice::ConstPtr IosKitAspect::device(Kit *kit) { if (!kit) return IosDevice::ConstPtr(); - IDevice::ConstPtr dev = DeviceKitInformation::device(kit); + IDevice::ConstPtr dev = DeviceKitAspect::device(kit); IosDevice::ConstPtr res = dev.dynamicCast(); return res; } diff --git a/src/plugins/ios/iosdevice.h b/src/plugins/ios/iosdevice.h index 54f5785e70..990227827f 100644 --- a/src/plugins/ios/iosdevice.h +++ b/src/plugins/ios/iosdevice.h @@ -103,7 +103,7 @@ private: QStringList m_userModeDeviceIds; }; -namespace IosKitInformation { +namespace IosKitAspect { IosDevice::ConstPtr device(ProjectExplorer::Kit *); } diff --git a/src/plugins/ios/iosrunconfiguration.cpp b/src/plugins/ios/iosrunconfiguration.cpp index 0d26ba7e8f..435a67ef29 100644 --- a/src/plugins/ios/iosrunconfiguration.cpp +++ b/src/plugins/ios/iosrunconfiguration.cpp @@ -125,7 +125,7 @@ void IosDeviceTypeAspect::deviceChanges() void IosDeviceTypeAspect::updateDeviceType() { - if (DeviceTypeKitInformation::deviceTypeId(m_runConfiguration->target()->kit()) + if (DeviceTypeKitAspect::deviceTypeId(m_runConfiguration->target()->kit()) == Constants::IOS_DEVICE_TYPE) m_deviceType = IosDeviceType(IosDeviceType::IosDevice); else if (m_deviceType.type == IosDeviceType::IosDevice) @@ -134,7 +134,7 @@ void IosDeviceTypeAspect::updateDeviceType() void IosRunConfiguration::updateDisplayNames() { - IDevice::ConstPtr dev = DeviceKitInformation::device(target()->kit()); + IDevice::ConstPtr dev = DeviceKitAspect::device(target()->kit()); const QString devName = dev.isNull() ? IosDevice::name() : dev->displayName(); setDefaultDisplayName(tr("Run on %1").arg(devName)); setDisplayName(tr("Run %1 on %2").arg(applicationName()).arg(devName)); @@ -144,12 +144,12 @@ void IosRunConfiguration::updateDisplayNames() void IosRunConfiguration::updateEnabledState() { - Core::Id devType = DeviceTypeKitInformation::deviceTypeId(target()->kit()); + Core::Id devType = DeviceTypeKitAspect::deviceTypeId(target()->kit()); if (devType != Constants::IOS_DEVICE_TYPE && devType != Constants::IOS_SIMULATOR_TYPE) { setEnabled(false); return; } - IDevice::ConstPtr dev = DeviceKitInformation::device(target()->kit()); + IDevice::ConstPtr dev = DeviceKitAspect::device(target()->kit()); if (dev.isNull() || dev->deviceState() != IDevice::DeviceReadyToUse) { setEnabled(false); return; @@ -176,7 +176,7 @@ QString IosRunConfiguration::applicationName() const FileName IosRunConfiguration::bundleDirectory() const { FileName res; - Core::Id devType = DeviceTypeKitInformation::deviceTypeId(target()->kit()); + Core::Id devType = DeviceTypeKitAspect::deviceTypeId(target()->kit()); bool isDevice = (devType == Constants::IOS_DEVICE_TYPE); if (!isDevice && devType != Constants::IOS_SIMULATOR_TYPE) { qCWarning(iosLog) << "unexpected device type in bundleDirForTarget: " << devType.toString(); @@ -238,10 +238,10 @@ void IosDeviceTypeAspect::toMap(QVariantMap &map) const QString IosRunConfiguration::disabledReason() const { - Core::Id devType = DeviceTypeKitInformation::deviceTypeId(target()->kit()); + Core::Id devType = DeviceTypeKitAspect::deviceTypeId(target()->kit()); if (devType != Constants::IOS_DEVICE_TYPE && devType != Constants::IOS_SIMULATOR_TYPE) return tr("Kit has incorrect device type for running on iOS devices."); - IDevice::ConstPtr dev = DeviceKitInformation::device(target()->kit()); + IDevice::ConstPtr dev = DeviceKitAspect::device(target()->kit()); QString validDevName; bool hasConncetedDev = false; if (devType == Constants::IOS_DEVICE_TYPE) { diff --git a/src/plugins/ios/iosrunner.cpp b/src/plugins/ios/iosrunner.cpp index dc6d222e0f..5b3a21d136 100644 --- a/src/plugins/ios/iosrunner.cpp +++ b/src/plugins/ios/iosrunner.cpp @@ -81,7 +81,7 @@ static void stopRunningRunControl(RunControl *runControl) RunConfiguration *runConfig = runControl->runConfiguration(); Target *target = runConfig->target(); - Core::Id devId = DeviceKitInformation::deviceId(target->kit()); + Core::Id devId = DeviceKitAspect::deviceId(target->kit()); // The device can only run an application at a time, if an app is running stop it. if (activeRunControls.contains(devId)) { @@ -101,7 +101,7 @@ IosRunner::IosRunner(RunControl *runControl) auto runConfig = qobject_cast(runControl->runConfiguration()); m_bundleDir = runConfig->bundleDirectory().toString(); m_arguments = runConfig->aspect()->arguments(runConfig->macroExpander()); - m_device = DeviceKitInformation::device(runConfig->target()->kit()); + m_device = DeviceKitAspect::device(runConfig->target()->kit()); m_deviceType = runConfig->deviceType(); } diff --git a/src/plugins/ios/iossimulator.cpp b/src/plugins/ios/iossimulator.cpp index 6a8ad80735..259c5334f2 100644 --- a/src/plugins/ios/iossimulator.cpp +++ b/src/plugins/ios/iossimulator.cpp @@ -144,7 +144,7 @@ IosSimulator::ConstPtr IosKitInformation::simulator(Kit *kit) { if (!kit) return IosSimulator::ConstPtr(); - IDevice::ConstPtr dev = DeviceKitInformation::device(kit); + IDevice::ConstPtr dev = DeviceKitAspect::device(kit); IosSimulator::ConstPtr res = dev.dynamicCast(); return res; } diff --git a/src/plugins/nim/project/nimcompilerbuildstep.cpp b/src/plugins/nim/project/nimcompilerbuildstep.cpp index a959ddbb1a..e03ddc85cf 100644 --- a/src/plugins/nim/project/nimcompilerbuildstep.cpp +++ b/src/plugins/nim/project/nimcompilerbuildstep.cpp @@ -226,7 +226,7 @@ void NimCompilerBuildStep::updateCommand() QTC_ASSERT(target(), return); QTC_ASSERT(target()->kit(), return); Kit *kit = target()->kit(); - auto tc = dynamic_cast(ToolChainKitInformation::toolChain(kit, Constants::C_NIMLANGUAGE_ID)); + auto tc = dynamic_cast(ToolChainKitAspect::toolChain(kit, Constants::C_NIMLANGUAGE_ID)); QTC_ASSERT(tc, return); processParameters()->setCommand(tc->compilerCommand().toString()); } diff --git a/src/plugins/nim/project/nimproject.cpp b/src/plugins/nim/project/nimproject.cpp index 2af19e4d49..f5e61c611b 100644 --- a/src/plugins/nim/project/nimproject.cpp +++ b/src/plugins/nim/project/nimproject.cpp @@ -153,7 +153,7 @@ void NimProject::updateProject() QList NimProject::projectIssues(const Kit *k) const { QList result = Project::projectIssues(k); - auto tc = dynamic_cast(ToolChainKitInformation::toolChain(k, + auto tc = dynamic_cast(ToolChainKitAspect::toolChain(k, Constants::C_NIMLANGUAGE_ID)); if (!tc) { result.append(createProjectTask(Task::TaskType::Error, tr("No Nim compiler set."))); diff --git a/src/plugins/perfprofiler/perfconfigwidget.cpp b/src/plugins/perfprofiler/perfconfigwidget.cpp index 1aaefcd77d..287808244d 100644 --- a/src/plugins/perfprofiler/perfconfigwidget.cpp +++ b/src/plugins/perfprofiler/perfconfigwidget.cpp @@ -147,7 +147,7 @@ void PerfConfigWidget::setTarget(ProjectExplorer::Target *target) ProjectExplorer::IDevice::ConstPtr device; if (target) { if (ProjectExplorer::Kit *kit = target->kit()) - device = ProjectExplorer::DeviceKitInformation::device(kit); + device = ProjectExplorer::DeviceKitAspect::device(kit); } if (device.isNull()) { diff --git a/src/plugins/perfprofiler/perfdatareader.cpp b/src/plugins/perfprofiler/perfdatareader.cpp index 92541fd930..3fec773bad 100644 --- a/src/plugins/perfprofiler/perfdatareader.cpp +++ b/src/plugins/perfprofiler/perfdatareader.cpp @@ -291,7 +291,7 @@ QStringList PerfDataReader::collectArguments(const QString &executableDirPath, if (!executableDirPath.isEmpty()) arguments << QLatin1String("--app") << executableDirPath; - if (QtSupport::BaseQtVersion *qt = QtSupport::QtKitInformation::qtVersion(kit)) { + if (QtSupport::BaseQtVersion *qt = QtSupport::QtKitAspect::qtVersion(kit)) { arguments << QLatin1String("--extra") << QString::fromLatin1("%1%5%2%5%3%5%4") .arg(QDir::toNativeSeparators(qt->libraryPath().toString())) .arg(QDir::toNativeSeparators(qt->pluginPath().toString())) @@ -300,7 +300,7 @@ QStringList PerfDataReader::collectArguments(const QString &executableDirPath, .arg(QDir::listSeparator()); } - if (auto toolChain = ProjectExplorer::ToolChainKitInformation::toolChain( + if (auto toolChain = ProjectExplorer::ToolChainKitAspect::toolChain( kit, ProjectExplorer::Constants::CXX_LANGUAGE_ID)) { ProjectExplorer::Abi::Architecture architecture = toolChain->targetAbi().architecture(); if (architecture == ProjectExplorer::Abi::ArmArchitecture && @@ -311,7 +311,7 @@ QStringList PerfDataReader::collectArguments(const QString &executableDirPath, } } - QString sysroot = ProjectExplorer::SysRootKitInformation::sysRoot(kit).toString(); + QString sysroot = ProjectExplorer::SysRootKitAspect::sysRoot(kit).toString(); if (!sysroot.isEmpty()) arguments << QLatin1String("--sysroot") << sysroot; diff --git a/src/plugins/perfprofiler/perfprofilertool.cpp b/src/plugins/perfprofiler/perfprofilertool.cpp index 28bbe0feca..bbd35ac363 100644 --- a/src/plugins/perfprofiler/perfprofilertool.cpp +++ b/src/plugins/perfprofiler/perfprofilertool.cpp @@ -553,7 +553,7 @@ void PerfProfilerTool::gotoSourceLocation(QString filePath, int lineNumber, int static Utils::FileNameList collectQtIncludePaths(const ProjectExplorer::Kit *kit) { - QtSupport::BaseQtVersion *qt = QtSupport::QtKitInformation::qtVersion(kit); + QtSupport::BaseQtVersion *qt = QtSupport::QtKitAspect::qtVersion(kit); if (qt == nullptr) return Utils::FileNameList(); Utils::FileNameList paths{qt->headerPath()}; @@ -568,7 +568,7 @@ static Utils::FileNameList collectQtIncludePaths(const ProjectExplorer::Kit *kit static Utils::FileName sysroot(const Kit *kit) { - return SysRootKitInformation::sysRoot(kit); + return SysRootKitAspect::sysRoot(kit); } static Utils::FileNameList sourceFiles(const Project *currentProject = nullptr) diff --git a/src/plugins/perfprofiler/perftracepointdialog.cpp b/src/plugins/perfprofiler/perftracepointdialog.cpp index f42ec8a9a7..87e206b138 100644 --- a/src/plugins/perfprofiler/perftracepointdialog.cpp +++ b/src/plugins/perfprofiler/perftracepointdialog.cpp @@ -52,7 +52,7 @@ PerfTracePointDialog::PerfTracePointDialog() : const Kit *kit = target->kit(); QTC_ASSERT(kit, return); - m_device = DeviceKitInformation::device(kit); + m_device = DeviceKitAspect::device(kit); if (!m_device) { m_ui->textEdit->setPlainText(tr("Error: No device available for active target.")); return; diff --git a/src/plugins/projectexplorer/buildconfiguration.cpp b/src/plugins/projectexplorer/buildconfiguration.cpp index 7973ed4c05..0d5fb891c1 100644 --- a/src/plugins/projectexplorer/buildconfiguration.cpp +++ b/src/plugins/projectexplorer/buildconfiguration.cpp @@ -307,7 +307,7 @@ void BuildConfiguration::prependCompilerPathToEnvironment(Utils::Environment &en void BuildConfiguration::prependCompilerPathToEnvironment(Kit *k, Utils::Environment &env) { const ToolChain *tc - = ToolChainKitInformation::toolChain(k, ProjectExplorer::Constants::CXX_LANGUAGE_ID); + = ToolChainKitAspect::toolChain(k, ProjectExplorer::Constants::CXX_LANGUAGE_ID); if (!tc) return; @@ -363,7 +363,7 @@ bool BuildConfigurationFactory::supportsTargetDeviceType(Core::Id id) const BuildConfigurationFactory *BuildConfigurationFactory::find(const Kit *k, const QString &projectPath) { QTC_ASSERT(k, return nullptr); - const Core::Id deviceType = DeviceTypeKitInformation::deviceTypeId(k); + const Core::Id deviceType = DeviceTypeKitAspect::deviceTypeId(k); for (BuildConfigurationFactory *factory : g_buildConfigurationFactories) { if (Utils::mimeTypeForFile(projectPath).matchesName(factory->m_supportedProjectMimeTypeName) && factory->supportsTargetDeviceType(deviceType)) @@ -405,7 +405,7 @@ bool BuildConfigurationFactory::canHandle(const Target *target) const if (containsType(target->project()->projectIssues(target->kit()), Task::TaskType::Error)) return false; - if (!supportsTargetDeviceType(DeviceTypeKitInformation::deviceTypeId(target->kit()))) + if (!supportsTargetDeviceType(DeviceTypeKitAspect::deviceTypeId(target->kit()))) return false; return true; diff --git a/src/plugins/projectexplorer/buildstep.cpp b/src/plugins/projectexplorer/buildstep.cpp index d293b09290..e5bf324dcc 100644 --- a/src/plugins/projectexplorer/buildstep.cpp +++ b/src/plugins/projectexplorer/buildstep.cpp @@ -299,7 +299,7 @@ bool BuildStepFactory::canHandle(BuildStepList *bsl) const if (!m_supportedDeviceTypes.isEmpty()) { Target *target = bsl->target(); QTC_ASSERT(target, return false); - Core::Id deviceType = DeviceTypeKitInformation::deviceTypeId(target->kit()); + Core::Id deviceType = DeviceTypeKitAspect::deviceTypeId(target->kit()); if (!m_supportedDeviceTypes.contains(deviceType)) return false; } diff --git a/src/plugins/projectexplorer/deployconfiguration.cpp b/src/plugins/projectexplorer/deployconfiguration.cpp index 7619a06ca2..4d16599a12 100644 --- a/src/plugins/projectexplorer/deployconfiguration.cpp +++ b/src/plugins/projectexplorer/deployconfiguration.cpp @@ -162,7 +162,7 @@ bool DeployConfigurationFactory::canHandle(Target *target) const if (!m_supportedTargetDeviceTypes.isEmpty()) { if (!m_supportedTargetDeviceTypes.contains( - DeviceTypeKitInformation::deviceTypeId(target->kit()))) + DeviceTypeKitAspect::deviceTypeId(target->kit()))) return false; } diff --git a/src/plugins/projectexplorer/devicesupport/devicecheckbuildstep.cpp b/src/plugins/projectexplorer/devicesupport/devicecheckbuildstep.cpp index 7935efb5fc..29e95751f6 100644 --- a/src/plugins/projectexplorer/devicesupport/devicecheckbuildstep.cpp +++ b/src/plugins/projectexplorer/devicesupport/devicecheckbuildstep.cpp @@ -44,9 +44,9 @@ DeviceCheckBuildStep::DeviceCheckBuildStep(BuildStepList *bsl) bool DeviceCheckBuildStep::init() { - IDevice::ConstPtr device = DeviceKitInformation::device(target()->kit()); + IDevice::ConstPtr device = DeviceKitAspect::device(target()->kit()); if (!device) { - Core::Id deviceTypeId = DeviceTypeKitInformation::deviceTypeId(target()->kit()); + Core::Id deviceTypeId = DeviceTypeKitAspect::deviceTypeId(target()->kit()); IDeviceFactory *factory = IDeviceFactory::find(deviceTypeId); if (!factory || !factory->canCreate()) { emit addOutput(tr("No device configured."), BuildStep::OutputFormat::ErrorMessage); @@ -71,7 +71,7 @@ bool DeviceCheckBuildStep::init() DeviceManager *dm = DeviceManager::instance(); dm->addDevice(newDevice); - DeviceKitInformation::setDevice(target()->kit(), newDevice); + DeviceKitAspect::setDevice(target()->kit(), newDevice); } return true; diff --git a/src/plugins/projectexplorer/devicesupport/deviceprocessesdialog.cpp b/src/plugins/projectexplorer/devicesupport/deviceprocessesdialog.cpp index dd6a851929..8e68d6b21b 100644 --- a/src/plugins/projectexplorer/devicesupport/deviceprocessesdialog.cpp +++ b/src/plugins/projectexplorer/devicesupport/deviceprocessesdialog.cpp @@ -267,7 +267,7 @@ void DeviceProcessesDialogPrivate::killProcess() void DeviceProcessesDialogPrivate::updateDevice() { - setDevice(DeviceKitInformation::device(kitChooser->currentKit())); + setDevice(DeviceKitAspect::device(kitChooser->currentKit())); } void DeviceProcessesDialogPrivate::handleProcessKilled() diff --git a/src/plugins/projectexplorer/devicesupport/idevice.cpp b/src/plugins/projectexplorer/devicesupport/idevice.cpp index 54caab5f99..b681a56809 100644 --- a/src/plugins/projectexplorer/devicesupport/idevice.cpp +++ b/src/plugins/projectexplorer/devicesupport/idevice.cpp @@ -249,7 +249,7 @@ Core::Id IDevice::id() const */ bool IDevice::isCompatibleWith(const Kit *k) const { - return DeviceTypeKitInformation::deviceTypeId(k) == type(); + return DeviceTypeKitAspect::deviceTypeId(k) == type(); } void IDevice::addDeviceAction(const DeviceAction &deviceAction) diff --git a/src/plugins/projectexplorer/extracompiler.cpp b/src/plugins/projectexplorer/extracompiler.cpp index e73b44cb90..7924945bb8 100644 --- a/src/plugins/projectexplorer/extracompiler.cpp +++ b/src/plugins/projectexplorer/extracompiler.cpp @@ -255,7 +255,7 @@ Utils::Environment ExtraCompiler::buildEnvironment() const return bc->environment(); } else { QList changes = - EnvironmentKitInformation::environmentChanges(target->kit()); + EnvironmentKitAspect::environmentChanges(target->kit()); Utils::Environment env = Utils::Environment::systemEnvironment(); env.modify(changes); return env; diff --git a/src/plugins/projectexplorer/kit.cpp b/src/plugins/projectexplorer/kit.cpp index e0f3939bf3..a894329b60 100644 --- a/src/plugins/projectexplorer/kit.cpp +++ b/src/plugins/projectexplorer/kit.cpp @@ -86,7 +86,7 @@ public: [kit] { return kit->id().toString(); }); m_macroExpander.registerVariable("Kit:FileSystemName", tr("Kit filesystem-friendly name"), [kit] { return kit->fileSystemFriendlyName(); }); - foreach (KitInformation *ki, KitManager::kitInformation()) + foreach (KitAspect *ki, KitManager::kitInformation()) ki->addToMacroExpander(kit, &m_macroExpander); // This provides the same global fall back as the global expander @@ -134,7 +134,7 @@ public: Kit::Kit(Id id) : d(std::make_unique(id, this)) { - foreach (KitInformation *sti, KitManager::kitInformation()) + foreach (KitAspect *sti, KitManager::kitInformation()) d->m_data.insert(sti->id(), sti->defaultValue(this)); } @@ -246,8 +246,8 @@ bool Kit::hasWarning() const QList Kit::validate() const { QList result; - QList infoList = KitManager::kitInformation(); - for (KitInformation *i : infoList) { + QList infoList = KitManager::kitInformation(); + for (KitAspect *i : infoList) { QList tmp = i->validate(this); result.append(tmp); } @@ -262,7 +262,7 @@ QList Kit::validate() const void Kit::fix() { KitGuard g(this); - foreach (KitInformation *i, KitManager::kitInformation()) + foreach (KitAspect *i, KitManager::kitInformation()) i->fix(this); } @@ -271,7 +271,7 @@ void Kit::setup() KitGuard g(this); // Process the KitInfos in reverse order: They may only be based on other information lower in // the stack. - QList info = KitManager::kitInformation(); + QList info = KitManager::kitInformation(); for (int i = info.count() - 1; i >= 0; --i) info.at(i)->setup(this); } @@ -281,7 +281,7 @@ void Kit::upgrade() KitGuard g(this); // Process the KitInfos in reverse order: They may only be based on other information lower in // the stack. - for (KitInformation *ki : KitManager::kitInformation()) + for (KitAspect *ki : KitManager::kitInformation()) ki->upgrade(this); } @@ -371,7 +371,7 @@ QIcon Kit::icon() const return d->m_cachedIcon; } - const Core::Id deviceType = DeviceTypeKitInformation::deviceTypeId(this); + const Core::Id deviceType = DeviceTypeKitAspect::deviceTypeId(this); const QIcon deviceTypeIcon = iconForDeviceType(deviceType); if (!deviceTypeIcon.isNull()) { d->m_cachedIcon = deviceTypeIcon; @@ -503,16 +503,16 @@ QVariantMap Kit::toMap() const void Kit::addToEnvironment(Environment &env) const { - QList infoList = KitManager::kitInformation(); - foreach (KitInformation *ki, infoList) + QList infoList = KitManager::kitInformation(); + foreach (KitAspect *ki, infoList) ki->addToEnvironment(this, env); } IOutputParser *Kit::createOutputParser() const { auto first = new OsParser; - QList infoList = KitManager::kitInformation(); - foreach (KitInformation *ki, infoList) + QList infoList = KitManager::kitInformation(); + foreach (KitAspect *ki, infoList) first->appendOutputParser(ki->createOutputParser(this)); return first; } @@ -528,10 +528,10 @@ QString Kit::toHtml(const QList &additional) const str << "

" << ProjectExplorer::toHtml(additional + validate()) << "

"; str << ""; - QList infoList = KitManager::kitInformation(); - foreach (KitInformation *ki, infoList) { - KitInformation::ItemList list = ki->toUserOutput(this); - foreach (const KitInformation::Item &j, list) { + QList infoList = KitManager::kitInformation(); + foreach (KitAspect *ki, infoList) { + KitAspect::ItemList list = ki->toUserOutput(this); + foreach (const KitAspect::Item &j, list) { QString contents = j.second; if (contents.count() > 256) { int pos = contents.lastIndexOf("
", 256); @@ -573,7 +573,7 @@ void Kit::setSdkProvided(bool sdkProvided) void Kit::makeSticky() { - foreach (KitInformation *ki, KitManager::kitInformation()) { + foreach (KitAspect *ki, KitManager::kitInformation()) { if (hasValue(ki->id())) setSticky(ki->id(), true); } @@ -619,7 +619,7 @@ bool Kit::isMutable(Id id) const QSet Kit::supportedPlatforms() const { QSet platforms; - foreach (const KitInformation *ki, KitManager::kitInformation()) { + foreach (const KitAspect *ki, KitManager::kitInformation()) { const QSet ip = ki->supportedPlatforms(this); if (ip.isEmpty()) continue; @@ -634,7 +634,7 @@ QSet Kit::supportedPlatforms() const QSet Kit::availableFeatures() const { QSet features; - foreach (const KitInformation *ki, KitManager::kitInformation()) + foreach (const KitAspect *ki, KitManager::kitInformation()) features |= ki->availableFeatures(this); return features; } diff --git a/src/plugins/projectexplorer/kit.h b/src/plugins/projectexplorer/kit.h index ab9b1681f6..6a6b014033 100644 --- a/src/plugins/projectexplorer/kit.h +++ b/src/plugins/projectexplorer/kit.h @@ -142,7 +142,7 @@ private: const std::unique_ptr d; - friend class KitInformation; + friend class KitAspect; friend class KitManager; friend class Internal::KitManagerPrivate; friend class Internal::KitModel; // needed for setAutoDetected() when cloning kits diff --git a/src/plugins/projectexplorer/kitchooser.cpp b/src/plugins/projectexplorer/kitchooser.cpp index 9e0b4b25f1..79d1759f7a 100644 --- a/src/plugins/projectexplorer/kitchooser.cpp +++ b/src/plugins/projectexplorer/kitchooser.cpp @@ -52,7 +52,7 @@ KitChooser::KitChooser(QWidget *parent) : { m_chooser = new QComboBox(this); m_chooser->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed); - m_manageButton = new QPushButton(KitConfigWidget::msgManage(), this); + m_manageButton = new QPushButton(KitAspectWidget::msgManage(), this); auto layout = new QHBoxLayout(this); layout->setContentsMargins(0, 0, 0, 0); diff --git a/src/plugins/projectexplorer/kitconfigwidget.cpp b/src/plugins/projectexplorer/kitconfigwidget.cpp index 4b9fbebd60..8fb48296fe 100644 --- a/src/plugins/projectexplorer/kitconfigwidget.cpp +++ b/src/plugins/projectexplorer/kitconfigwidget.cpp @@ -30,31 +30,31 @@ namespace ProjectExplorer { -KitConfigWidget::KitConfigWidget(Kit *kit, const KitInformation *ki) : m_kit(kit), +KitAspectWidget::KitAspectWidget(Kit *kit, const KitAspect *ki) : m_kit(kit), m_kitInformation(ki), m_isSticky(kit->isSticky(ki->id())) { } -Core::Id KitConfigWidget::kitInformationId() const +Core::Id KitAspectWidget::kitInformationId() const { return m_kitInformation->id(); } -bool KitConfigWidget::isMutable() const +bool KitAspectWidget::isMutable() const { return m_kit->isMutable(m_kitInformation->id()); } -void KitConfigWidget::setMutable(bool b) +void KitAspectWidget::setMutable(bool b) { m_kit->setMutable(m_kitInformation->id(), b); } -QString KitConfigWidget::msgManage() +QString KitAspectWidget::msgManage() { return tr("Manage..."); } -void KitConfigWidget::setPalette(const QPalette &p) +void KitAspectWidget::setPalette(const QPalette &p) { if (mainWidget()) mainWidget()->setPalette(p); @@ -62,7 +62,7 @@ void KitConfigWidget::setPalette(const QPalette &p) buttonWidget()->setPalette(p); } -void KitConfigWidget::setStyle(QStyle *s) +void KitAspectWidget::setStyle(QStyle *s) { if (mainWidget()) mainWidget()->setStyle(s); diff --git a/src/plugins/projectexplorer/kitconfigwidget.h b/src/plugins/projectexplorer/kitconfigwidget.h index 05c7ea058b..cf5b811c5d 100644 --- a/src/plugins/projectexplorer/kitconfigwidget.h +++ b/src/plugins/projectexplorer/kitconfigwidget.h @@ -34,18 +34,18 @@ namespace ProjectExplorer { class Kit; -class KitInformation; +class KitAspect; // -------------------------------------------------------------------------- -// KitConfigWidget +// KitAspectWidget // -------------------------------------------------------------------------- -class PROJECTEXPLORER_EXPORT KitConfigWidget : public QObject +class PROJECTEXPLORER_EXPORT KitAspectWidget : public QObject { Q_OBJECT public: - KitConfigWidget(Kit *kit, const KitInformation *ki); + KitAspectWidget(Kit *kit, const KitAspect *ki); Core::Id kitInformationId() const; @@ -74,7 +74,7 @@ signals: protected: Kit *m_kit; - const KitInformation *m_kitInformation; + const KitAspect *m_kitInformation; bool m_isSticky; }; diff --git a/src/plugins/projectexplorer/kitinformation.cpp b/src/plugins/projectexplorer/kitinformation.cpp index f4da43f095..dcc1a3d754 100644 --- a/src/plugins/projectexplorer/kitinformation.cpp +++ b/src/plugins/projectexplorer/kitinformation.cpp @@ -50,26 +50,26 @@ const char KITINFORMATION_ID_V2[] = "PE.Profile.ToolChains"; const char KITINFORMATION_ID_V3[] = "PE.Profile.ToolChainsV3"; // -------------------------------------------------------------------------- -// SysRootKitInformation: +// SysRootKitAspect: // -------------------------------------------------------------------------- -SysRootKitInformation::SysRootKitInformation() +SysRootKitAspect::SysRootKitAspect() { setObjectName(QLatin1String("SysRootInformation")); - setId(SysRootKitInformation::id()); + setId(SysRootKitAspect::id()); setPriority(31000); } -QVariant SysRootKitInformation::defaultValue(const Kit *k) const +QVariant SysRootKitAspect::defaultValue(const Kit *k) const { Q_UNUSED(k) return QString(); } -QList SysRootKitInformation::validate(const Kit *k) const +QList SysRootKitAspect::validate(const Kit *k) const { QList result; - const Utils::FileName dir = SysRootKitInformation::sysRoot(k); + const Utils::FileName dir = SysRootKitAspect::sysRoot(k); if (dir.isEmpty()) return result; @@ -91,41 +91,41 @@ QList SysRootKitInformation::validate(const Kit *k) const return result; } -KitConfigWidget *SysRootKitInformation::createConfigWidget(Kit *k) const +KitAspectWidget *SysRootKitAspect::createConfigWidget(Kit *k) const { QTC_ASSERT(k, return nullptr); - return new Internal::SysRootInformationConfigWidget(k, this); + return new Internal::SysRootKitAspectWidget(k, this); } -KitInformation::ItemList SysRootKitInformation::toUserOutput(const Kit *k) const +KitAspect::ItemList SysRootKitAspect::toUserOutput(const Kit *k) const { return ItemList() << qMakePair(tr("Sys Root"), sysRoot(k).toUserOutput()); } -void SysRootKitInformation::addToMacroExpander(Kit *kit, Utils::MacroExpander *expander) const +void SysRootKitAspect::addToMacroExpander(Kit *kit, Utils::MacroExpander *expander) const { QTC_ASSERT(kit, return); expander->registerFileVariables("SysRoot", tr("Sys Root"), [kit]() -> QString { - return SysRootKitInformation::sysRoot(kit).toString(); + return SysRootKitAspect::sysRoot(kit).toString(); }); } -Core::Id SysRootKitInformation::id() +Core::Id SysRootKitAspect::id() { return "PE.Profile.SysRoot"; } -Utils::FileName SysRootKitInformation::sysRoot(const Kit *k) +Utils::FileName SysRootKitAspect::sysRoot(const Kit *k) { if (!k) return Utils::FileName(); - if (!k->value(SysRootKitInformation::id()).toString().isEmpty()) - return Utils::FileName::fromString(k->value(SysRootKitInformation::id()).toString()); + if (!k->value(SysRootKitAspect::id()).toString().isEmpty()) + return Utils::FileName::fromString(k->value(SysRootKitAspect::id()).toString()); - for (ToolChain *tc : ToolChainKitInformation::toolChains(k)) { + for (ToolChain *tc : ToolChainKitAspect::toolChains(k)) { if (!tc->sysRoot().isEmpty()) return Utils::FileName::fromString(tc->sysRoot()); } @@ -133,12 +133,12 @@ Utils::FileName SysRootKitInformation::sysRoot(const Kit *k) return Utils::FileName(); } -void SysRootKitInformation::setSysRoot(Kit *k, const Utils::FileName &v) +void SysRootKitAspect::setSysRoot(Kit *k, const Utils::FileName &v) { if (!k) return; - for (ToolChain *tc : ToolChainKitInformation::toolChains(k)) { + for (ToolChain *tc : ToolChainKitAspect::toolChains(k)) { if (!tc->sysRoot().isEmpty()) { // It's the sysroot from toolchain, don't set it. if (tc->sysRoot() == v.toString()) @@ -148,21 +148,21 @@ void SysRootKitInformation::setSysRoot(Kit *k, const Utils::FileName &v) break; } } - k->setValue(SysRootKitInformation::id(), v.toString()); + k->setValue(SysRootKitAspect::id(), v.toString()); } // -------------------------------------------------------------------------- -// ToolChainKitInformation: +// ToolChainKitAspect: // -------------------------------------------------------------------------- -ToolChainKitInformation::ToolChainKitInformation() +ToolChainKitAspect::ToolChainKitAspect() { setObjectName(QLatin1String("ToolChainInformation")); - setId(ToolChainKitInformation::id()); + setId(ToolChainKitAspect::id()); setPriority(30000); connect(KitManager::instance(), &KitManager::kitsLoaded, - this, &ToolChainKitInformation::kitsWereLoaded); + this, &ToolChainKitAspect::kitsWereLoaded); } // language id -> tool chain id @@ -189,19 +189,19 @@ static QVariant defaultToolChainValue() return result; } -QVariant ToolChainKitInformation::defaultValue(const Kit *k) const +QVariant ToolChainKitAspect::defaultValue(const Kit *k) const { Q_UNUSED(k); return defaultToolChainValue(); } -QList ToolChainKitInformation::validate(const Kit *k) const +QList ToolChainKitAspect::validate(const Kit *k) const { QList result; const QList tcList = toolChains(k); if (tcList.isEmpty()) { - result << Task(Task::Warning, ToolChainKitInformation::msgNoToolChainInTarget(), + result << Task(Task::Warning, ToolChainKitAspect::msgNoToolChainInTarget(), Utils::FileName(), -1, Core::Id(Constants::TASK_CATEGORY_BUILDSYSTEM)); } else { QSet targetAbis; @@ -218,7 +218,7 @@ QList ToolChainKitInformation::validate(const Kit *k) const return result; } -void ToolChainKitInformation::upgrade(Kit *k) +void ToolChainKitAspect::upgrade(Kit *k) { QTC_ASSERT(k, return); @@ -238,7 +238,7 @@ void ToolChainKitInformation::upgrade(Kit *k) // Used up to 4.1: newValue.insert(Deprecated::Toolchain::languageId(Deprecated::Toolchain::Cxx), oldValue.toString()); - const Core::Id typeId = DeviceTypeKitInformation::deviceTypeId(k); + const Core::Id typeId = DeviceTypeKitAspect::deviceTypeId(k); if (typeId == Constants::DESKTOP_DEVICE_TYPE) { // insert default C compiler which did not exist before newValue.insert(Deprecated::Toolchain::languageId(Deprecated::Toolchain::C), @@ -253,7 +253,7 @@ void ToolChainKitInformation::upgrade(Kit *k) // upgrade 4.2 to 4.3 (keep old settings around for now) { const QVariant oldValue = k->value(oldIdV2); - const QVariant value = k->value(ToolChainKitInformation::id()); + const QVariant value = k->value(ToolChainKitAspect::id()); if (value.isNull() && !oldValue.isNull()) { QVariantMap newValue = oldValue.toMap(); QVariantMap::iterator it = newValue.find(Deprecated::Toolchain::languageId(Deprecated::Toolchain::C)); @@ -262,14 +262,14 @@ void ToolChainKitInformation::upgrade(Kit *k) it = newValue.find(Deprecated::Toolchain::languageId(Deprecated::Toolchain::Cxx)); if (it != newValue.end()) newValue.insert(Core::Id(Constants::CXX_LANGUAGE_ID).toString(), it.value()); - k->setValue(ToolChainKitInformation::id(), newValue); - k->setSticky(ToolChainKitInformation::id(), k->isSticky(oldIdV2)); + k->setValue(ToolChainKitAspect::id(), newValue); + k->setSticky(ToolChainKitAspect::id(), k->isSticky(oldIdV2)); } } // upgrade 4.3-temporary-master-state to 4.3: { - const QVariantMap valueMap = k->value(ToolChainKitInformation::id()).toMap(); + const QVariantMap valueMap = k->value(ToolChainKitAspect::id()).toMap(); QVariantMap result; for (const QString &key : valueMap.keys()) { const int pos = key.lastIndexOf('.'); @@ -278,11 +278,11 @@ void ToolChainKitInformation::upgrade(Kit *k) else result.insert(key, valueMap.value(key)); } - k->setValue(ToolChainKitInformation::id(), result); + k->setValue(ToolChainKitAspect::id(), result); } } -void ToolChainKitInformation::fix(Kit *k) +void ToolChainKitAspect::fix(Kit *k) { QTC_ASSERT(ToolChainManager::isLoaded(), return); foreach (const Core::Id& l, ToolChainManager::allLanguages()) { @@ -303,12 +303,12 @@ static Core::Id findLanguage(const QString &ls) [lsUpper](Core::Id l) { return lsUpper == l.toString().toUpper(); }); } -void ToolChainKitInformation::setup(Kit *k) +void ToolChainKitAspect::setup(Kit *k) { QTC_ASSERT(ToolChainManager::isLoaded(), return); QTC_ASSERT(k, return); - const QVariantMap value = k->value(ToolChainKitInformation::id()).toMap(); + const QVariantMap value = k->value(ToolChainKitAspect::id()).toMap(); for (auto i = value.constBegin(); i != value.constEnd(); ++i) { Core::Id l = findLanguage(i.key()); @@ -333,32 +333,32 @@ void ToolChainKitInformation::setup(Kit *k) } } -KitConfigWidget *ToolChainKitInformation::createConfigWidget(Kit *k) const +KitAspectWidget *ToolChainKitAspect::createConfigWidget(Kit *k) const { QTC_ASSERT(k, return nullptr); - return new Internal::ToolChainInformationConfigWidget(k, this); + return new Internal::ToolChainKitAspectWidget(k, this); } -QString ToolChainKitInformation::displayNamePostfix(const Kit *k) const +QString ToolChainKitAspect::displayNamePostfix(const Kit *k) const { ToolChain *tc = toolChain(k, Constants::CXX_LANGUAGE_ID); return tc ? tc->displayName() : QString(); } -KitInformation::ItemList ToolChainKitInformation::toUserOutput(const Kit *k) const +KitAspect::ItemList ToolChainKitAspect::toUserOutput(const Kit *k) const { ToolChain *tc = toolChain(k, Constants::CXX_LANGUAGE_ID); return ItemList() << qMakePair(tr("Compiler"), tc ? tc->displayName() : tr("None")); } -void ToolChainKitInformation::addToEnvironment(const Kit *k, Utils::Environment &env) const +void ToolChainKitAspect::addToEnvironment(const Kit *k, Utils::Environment &env) const { ToolChain *tc = toolChain(k, Constants::CXX_LANGUAGE_ID); if (tc) tc->addToEnvironment(env); } -void ToolChainKitInformation::addToMacroExpander(Kit *kit, Utils::MacroExpander *expander) const +void ToolChainKitAspect::addToMacroExpander(Kit *kit, Utils::MacroExpander *expander) const { QTC_ASSERT(kit, return); @@ -388,7 +388,7 @@ void ToolChainKitInformation::addToMacroExpander(Kit *kit, Utils::MacroExpander } -IOutputParser *ToolChainKitInformation::createOutputParser(const Kit *k) const +IOutputParser *ToolChainKitAspect::createOutputParser(const Kit *k) const { for (const Core::Id langId : {Constants::CXX_LANGUAGE_ID, Constants::C_LANGUAGE_ID}) { if (const ToolChain * const tc = toolChain(k, langId)) @@ -397,7 +397,7 @@ IOutputParser *ToolChainKitInformation::createOutputParser(const Kit *k) const return nullptr; } -QSet ToolChainKitInformation::availableFeatures(const Kit *k) const +QSet ToolChainKitAspect::availableFeatures(const Kit *k) const { QSet result; for (ToolChain *tc : toolChains(k)) @@ -405,30 +405,30 @@ QSet ToolChainKitInformation::availableFeatures(const Kit *k) const return result; } -Core::Id ToolChainKitInformation::id() +Core::Id ToolChainKitAspect::id() { return KITINFORMATION_ID_V3; } -QByteArray ToolChainKitInformation::toolChainId(const Kit *k, Core::Id language) +QByteArray ToolChainKitAspect::toolChainId(const Kit *k, Core::Id language) { QTC_ASSERT(ToolChainManager::isLoaded(), return nullptr); if (!k) return QByteArray(); - QVariantMap value = k->value(ToolChainKitInformation::id()).toMap(); + QVariantMap value = k->value(ToolChainKitAspect::id()).toMap(); return value.value(language.toString(), QByteArray()).toByteArray(); } -ToolChain *ToolChainKitInformation::toolChain(const Kit *k, Core::Id language) +ToolChain *ToolChainKitAspect::toolChain(const Kit *k, Core::Id language) { return ToolChainManager::findToolChain(toolChainId(k, language)); } -QList ToolChainKitInformation::toolChains(const Kit *k) +QList ToolChainKitAspect::toolChains(const Kit *k) { QTC_ASSERT(k, return QList()); - const QVariantMap value = k->value(ToolChainKitInformation::id()).toMap(); + const QVariantMap value = k->value(ToolChainKitAspect::id()).toMap(); const QList tcList = Utils::transform(ToolChainManager::allLanguages().toList(), [&value](Core::Id l) -> ToolChain * { @@ -437,18 +437,18 @@ QList ToolChainKitInformation::toolChains(const Kit *k) return Utils::filtered(tcList, [](ToolChain *tc) { return tc; }); } -void ToolChainKitInformation::setToolChain(Kit *k, ToolChain *tc) +void ToolChainKitAspect::setToolChain(Kit *k, ToolChain *tc) { QTC_ASSERT(tc, return); QTC_ASSERT(k, return); - QVariantMap result = k->value(ToolChainKitInformation::id()).toMap(); + QVariantMap result = k->value(ToolChainKitAspect::id()).toMap(); result.insert(tc->language().toString(), tc->id()); k->setValue(id(), result); } /** - * @brief ToolChainKitInformation::setAllToolChainsToMatch + * @brief ToolChainKitAspect::setAllToolChainsToMatch * * Set up all toolchains to be similar to the one toolchain provided. Similar ideally means * that all toolchains use the "same" compiler from the same installation, but we will @@ -457,7 +457,7 @@ void ToolChainKitInformation::setToolChain(Kit *k, ToolChain *tc) * @param k The kit to set up * @param tc The toolchain to match other languages for. */ -void ToolChainKitInformation::setAllToolChainsToMatch(Kit *k, ToolChain *tc) +void ToolChainKitAspect::setAllToolChainsToMatch(Kit *k, ToolChain *tc) { QTC_ASSERT(tc, return); QTC_ASSERT(k, return); @@ -465,7 +465,7 @@ void ToolChainKitInformation::setAllToolChainsToMatch(Kit *k, ToolChain *tc) const QList allTcList = ToolChainManager::toolChains(); QTC_ASSERT(allTcList.contains(tc), return); - QVariantMap result = k->value(ToolChainKitInformation::id()).toMap(); + QVariantMap result = k->value(ToolChainKitAspect::id()).toMap(); result.insert(tc->language().toString(), tc->id()); for (Core::Id l : ToolChainManager::allLanguages()) { @@ -496,17 +496,17 @@ void ToolChainKitInformation::setAllToolChainsToMatch(Kit *k, ToolChain *tc) k->setValue(id(), result); } -void ToolChainKitInformation::clearToolChain(Kit *k, Core::Id language) +void ToolChainKitAspect::clearToolChain(Kit *k, Core::Id language) { QTC_ASSERT(language.isValid(), return); QTC_ASSERT(k, return); - QVariantMap result = k->value(ToolChainKitInformation::id()).toMap(); + QVariantMap result = k->value(ToolChainKitAspect::id()).toMap(); result.insert(language.toString(), QByteArray()); k->setValue(id(), result); } -Abi ToolChainKitInformation::targetAbi(const Kit *k) +Abi ToolChainKitAspect::targetAbi(const Kit *k) { QList tcList = toolChains(k); // Find the best possible ABI for all the tool chains... @@ -539,29 +539,29 @@ Abi ToolChainKitInformation::targetAbi(const Kit *k) return candidates.at(0); // Use basically a random Abi... } -QString ToolChainKitInformation::msgNoToolChainInTarget() +QString ToolChainKitAspect::msgNoToolChainInTarget() { return tr("No compiler set in kit."); } -void ToolChainKitInformation::kitsWereLoaded() +void ToolChainKitAspect::kitsWereLoaded() { foreach (Kit *k, KitManager::kits()) fix(k); connect(ToolChainManager::instance(), &ToolChainManager::toolChainRemoved, - this, &ToolChainKitInformation::toolChainRemoved); + this, &ToolChainKitAspect::toolChainRemoved); connect(ToolChainManager::instance(), &ToolChainManager::toolChainUpdated, - this, &ToolChainKitInformation::toolChainUpdated); + this, &ToolChainKitAspect::toolChainUpdated); } -void ToolChainKitInformation::toolChainUpdated(ToolChain *tc) +void ToolChainKitAspect::toolChainUpdated(ToolChain *tc) { for (Kit *k : KitManager::kits([tc](const Kit *k) { return toolChain(k, tc->language()) == tc; })) notifyAboutUpdate(k); } -void ToolChainKitInformation::toolChainRemoved(ToolChain *tc) +void ToolChainKitAspect::toolChainRemoved(ToolChain *tc) { Q_UNUSED(tc); foreach (Kit *k, KitManager::kits()) @@ -569,35 +569,35 @@ void ToolChainKitInformation::toolChainRemoved(ToolChain *tc) } // -------------------------------------------------------------------------- -// DeviceTypeKitInformation: +// DeviceTypeKitAspect: // -------------------------------------------------------------------------- -DeviceTypeKitInformation::DeviceTypeKitInformation() +DeviceTypeKitAspect::DeviceTypeKitAspect() { setObjectName(QLatin1String("DeviceTypeInformation")); - setId(DeviceTypeKitInformation::id()); + setId(DeviceTypeKitAspect::id()); setPriority(33000); } -QVariant DeviceTypeKitInformation::defaultValue(const Kit *k) const +QVariant DeviceTypeKitAspect::defaultValue(const Kit *k) const { Q_UNUSED(k); return QByteArray(Constants::DESKTOP_DEVICE_TYPE); } -QList DeviceTypeKitInformation::validate(const Kit *k) const +QList DeviceTypeKitAspect::validate(const Kit *k) const { Q_UNUSED(k); return QList(); } -KitConfigWidget *DeviceTypeKitInformation::createConfigWidget(Kit *k) const +KitAspectWidget *DeviceTypeKitAspect::createConfigWidget(Kit *k) const { QTC_ASSERT(k, return nullptr); - return new Internal::DeviceTypeInformationConfigWidget(k, this); + return new Internal::DeviceTypeKitAspectWidget(k, this); } -KitInformation::ItemList DeviceTypeKitInformation::toUserOutput(const Kit *k) const +KitAspect::ItemList DeviceTypeKitAspect::toUserOutput(const Kit *k) const { QTC_ASSERT(k, return {}); Core::Id type = deviceTypeId(k); @@ -609,57 +609,57 @@ KitInformation::ItemList DeviceTypeKitInformation::toUserOutput(const Kit *k) co return ItemList() << qMakePair(tr("Device type"), typeDisplayName); } -const Core::Id DeviceTypeKitInformation::id() +const Core::Id DeviceTypeKitAspect::id() { return "PE.Profile.DeviceType"; } -const Core::Id DeviceTypeKitInformation::deviceTypeId(const Kit *k) +const Core::Id DeviceTypeKitAspect::deviceTypeId(const Kit *k) { - return k ? Core::Id::fromSetting(k->value(DeviceTypeKitInformation::id())) : Core::Id(); + return k ? Core::Id::fromSetting(k->value(DeviceTypeKitAspect::id())) : Core::Id(); } -void DeviceTypeKitInformation::setDeviceTypeId(Kit *k, Core::Id type) +void DeviceTypeKitAspect::setDeviceTypeId(Kit *k, Core::Id type) { QTC_ASSERT(k, return); - k->setValue(DeviceTypeKitInformation::id(), type.toSetting()); + k->setValue(DeviceTypeKitAspect::id(), type.toSetting()); } -Kit::Predicate DeviceTypeKitInformation::deviceTypePredicate(Core::Id type) +Kit::Predicate DeviceTypeKitAspect::deviceTypePredicate(Core::Id type) { return [type](const Kit *kit) { return type.isValid() && deviceTypeId(kit) == type; }; } -QSet DeviceTypeKitInformation::supportedPlatforms(const Kit *k) const +QSet DeviceTypeKitAspect::supportedPlatforms(const Kit *k) const { return {deviceTypeId(k)}; } -QSet DeviceTypeKitInformation::availableFeatures(const Kit *k) const +QSet DeviceTypeKitAspect::availableFeatures(const Kit *k) const { - Core::Id id = DeviceTypeKitInformation::deviceTypeId(k); + Core::Id id = DeviceTypeKitAspect::deviceTypeId(k); if (id.isValid()) return {id.withPrefix("DeviceType.")}; return QSet(); } // -------------------------------------------------------------------------- -// DeviceKitInformation: +// DeviceKitAspect: // -------------------------------------------------------------------------- -DeviceKitInformation::DeviceKitInformation() +DeviceKitAspect::DeviceKitAspect() { setObjectName(QLatin1String("DeviceInformation")); - setId(DeviceKitInformation::id()); + setId(DeviceKitAspect::id()); setPriority(32000); connect(KitManager::instance(), &KitManager::kitsLoaded, - this, &DeviceKitInformation::kitsWereLoaded); + this, &DeviceKitAspect::kitsWereLoaded); } -QVariant DeviceKitInformation::defaultValue(const Kit *k) const +QVariant DeviceKitAspect::defaultValue(const Kit *k) const { - Core::Id type = DeviceTypeKitInformation::deviceTypeId(k); + Core::Id type = DeviceTypeKitAspect::deviceTypeId(k); // Use default device if that is compatible: IDevice::ConstPtr dev = DeviceManager::instance()->defaultDevice(type); if (dev && dev->isCompatibleWith(k)) @@ -674,9 +674,9 @@ QVariant DeviceKitInformation::defaultValue(const Kit *k) const return QString(); } -QList DeviceKitInformation::validate(const Kit *k) const +QList DeviceKitAspect::validate(const Kit *k) const { - IDevice::ConstPtr dev = DeviceKitInformation::device(k); + IDevice::ConstPtr dev = DeviceKitAspect::device(k); QList result; if (dev.isNull()) result.append(Task(Task::Warning, tr("No device set."), @@ -688,9 +688,9 @@ QList DeviceKitInformation::validate(const Kit *k) const return result; } -void DeviceKitInformation::fix(Kit *k) +void DeviceKitAspect::fix(Kit *k) { - IDevice::ConstPtr dev = DeviceKitInformation::device(k); + IDevice::ConstPtr dev = DeviceKitAspect::device(k); if (!dev.isNull() && !dev->isCompatibleWith(k)) { qWarning("Device is no longer compatible with kit \"%s\", removing it.", qPrintable(k->displayName())); @@ -698,109 +698,109 @@ void DeviceKitInformation::fix(Kit *k) } } -void DeviceKitInformation::setup(Kit *k) +void DeviceKitAspect::setup(Kit *k) { QTC_ASSERT(DeviceManager::instance()->isLoaded(), return); - IDevice::ConstPtr dev = DeviceKitInformation::device(k); + IDevice::ConstPtr dev = DeviceKitAspect::device(k); if (!dev.isNull() && dev->isCompatibleWith(k)) return; setDeviceId(k, Core::Id::fromSetting(defaultValue(k))); } -KitConfigWidget *DeviceKitInformation::createConfigWidget(Kit *k) const +KitAspectWidget *DeviceKitAspect::createConfigWidget(Kit *k) const { QTC_ASSERT(k, return nullptr); - return new Internal::DeviceInformationConfigWidget(k, this); + return new Internal::DeviceKitAspectWidget(k, this); } -QString DeviceKitInformation::displayNamePostfix(const Kit *k) const +QString DeviceKitAspect::displayNamePostfix(const Kit *k) const { IDevice::ConstPtr dev = device(k); return dev.isNull() ? QString() : dev->displayName(); } -KitInformation::ItemList DeviceKitInformation::toUserOutput(const Kit *k) const +KitAspect::ItemList DeviceKitAspect::toUserOutput(const Kit *k) const { IDevice::ConstPtr dev = device(k); return ItemList() << qMakePair(tr("Device"), dev.isNull() ? tr("Unconfigured") : dev->displayName()); } -void DeviceKitInformation::addToMacroExpander(Kit *kit, Utils::MacroExpander *expander) const +void DeviceKitAspect::addToMacroExpander(Kit *kit, Utils::MacroExpander *expander) const { QTC_ASSERT(kit, return); expander->registerVariable("Device:HostAddress", tr("Host address"), [kit]() -> QString { - const IDevice::ConstPtr device = DeviceKitInformation::device(kit); + const IDevice::ConstPtr device = DeviceKitAspect::device(kit); return device ? device->sshParameters().host() : QString(); }); expander->registerVariable("Device:SshPort", tr("SSH port"), [kit]() -> QString { - const IDevice::ConstPtr device = DeviceKitInformation::device(kit); + const IDevice::ConstPtr device = DeviceKitAspect::device(kit); return device ? QString::number(device->sshParameters().port()) : QString(); }); expander->registerVariable("Device:UserName", tr("User name"), [kit]() -> QString { - const IDevice::ConstPtr device = DeviceKitInformation::device(kit); + const IDevice::ConstPtr device = DeviceKitAspect::device(kit); return device ? device->sshParameters().userName() : QString(); }); expander->registerVariable("Device:KeyFile", tr("Private key file"), [kit]() -> QString { - const IDevice::ConstPtr device = DeviceKitInformation::device(kit); + const IDevice::ConstPtr device = DeviceKitAspect::device(kit); return device ? device->sshParameters().privateKeyFile : QString(); }); expander->registerVariable("Device:Name", tr("Device name"), [kit]() -> QString { - const IDevice::ConstPtr device = DeviceKitInformation::device(kit); + const IDevice::ConstPtr device = DeviceKitAspect::device(kit); return device ? device->displayName() : QString(); }); } -Core::Id DeviceKitInformation::id() +Core::Id DeviceKitAspect::id() { return "PE.Profile.Device"; } -IDevice::ConstPtr DeviceKitInformation::device(const Kit *k) +IDevice::ConstPtr DeviceKitAspect::device(const Kit *k) { QTC_ASSERT(DeviceManager::instance()->isLoaded(), return IDevice::ConstPtr()); return DeviceManager::instance()->find(deviceId(k)); } -Core::Id DeviceKitInformation::deviceId(const Kit *k) +Core::Id DeviceKitAspect::deviceId(const Kit *k) { - return k ? Core::Id::fromSetting(k->value(DeviceKitInformation::id())) : Core::Id(); + return k ? Core::Id::fromSetting(k->value(DeviceKitAspect::id())) : Core::Id(); } -void DeviceKitInformation::setDevice(Kit *k, IDevice::ConstPtr dev) +void DeviceKitAspect::setDevice(Kit *k, IDevice::ConstPtr dev) { setDeviceId(k, dev ? dev->id() : Core::Id()); } -void DeviceKitInformation::setDeviceId(Kit *k, Core::Id id) +void DeviceKitAspect::setDeviceId(Kit *k, Core::Id id) { QTC_ASSERT(k, return); - k->setValue(DeviceKitInformation::id(), id.toSetting()); + k->setValue(DeviceKitAspect::id(), id.toSetting()); } -void DeviceKitInformation::kitsWereLoaded() +void DeviceKitAspect::kitsWereLoaded() { foreach (Kit *k, KitManager::kits()) fix(k); DeviceManager *dm = DeviceManager::instance(); - connect(dm, &DeviceManager::deviceListReplaced, this, &DeviceKitInformation::devicesChanged); - connect(dm, &DeviceManager::deviceAdded, this, &DeviceKitInformation::devicesChanged); - connect(dm, &DeviceManager::deviceRemoved, this, &DeviceKitInformation::devicesChanged); - connect(dm, &DeviceManager::deviceUpdated, this, &DeviceKitInformation::deviceUpdated); + connect(dm, &DeviceManager::deviceListReplaced, this, &DeviceKitAspect::devicesChanged); + connect(dm, &DeviceManager::deviceAdded, this, &DeviceKitAspect::devicesChanged); + connect(dm, &DeviceManager::deviceRemoved, this, &DeviceKitAspect::devicesChanged); + connect(dm, &DeviceManager::deviceUpdated, this, &DeviceKitAspect::deviceUpdated); connect(KitManager::instance(), &KitManager::kitUpdated, - this, &DeviceKitInformation::kitUpdated); + this, &DeviceKitAspect::kitUpdated); connect(KitManager::instance(), &KitManager::unmanagedKitUpdated, - this, &DeviceKitInformation::kitUpdated); + this, &DeviceKitAspect::kitUpdated); } -void DeviceKitInformation::deviceUpdated(Core::Id id) +void DeviceKitAspect::deviceUpdated(Core::Id id) { foreach (Kit *k, KitManager::kits()) { if (deviceId(k) == id) @@ -808,40 +808,40 @@ void DeviceKitInformation::deviceUpdated(Core::Id id) } } -void DeviceKitInformation::kitUpdated(Kit *k) +void DeviceKitAspect::kitUpdated(Kit *k) { setup(k); // Set default device if necessary } -void DeviceKitInformation::devicesChanged() +void DeviceKitAspect::devicesChanged() { foreach (Kit *k, KitManager::kits()) setup(k); // Set default device if necessary } // -------------------------------------------------------------------------- -// EnvironmentKitInformation: +// EnvironmentKitAspect: // -------------------------------------------------------------------------- -EnvironmentKitInformation::EnvironmentKitInformation() +EnvironmentKitAspect::EnvironmentKitAspect() { - setObjectName(QLatin1String("EnvironmentKitInformation")); - setId(EnvironmentKitInformation::id()); + setObjectName(QLatin1String("EnvironmentKitAspect")); + setId(EnvironmentKitAspect::id()); setPriority(29000); } -QVariant EnvironmentKitInformation::defaultValue(const Kit *k) const +QVariant EnvironmentKitAspect::defaultValue(const Kit *k) const { Q_UNUSED(k) return QStringList(); } -QList EnvironmentKitInformation::validate(const Kit *k) const +QList EnvironmentKitAspect::validate(const Kit *k) const { QList result; QTC_ASSERT(k, return result); - const QVariant variant = k->value(EnvironmentKitInformation::id()); + const QVariant variant = k->value(EnvironmentKitAspect::id()); if (!variant.isNull() && !variant.canConvert(QVariant::List)) { result.append(Task(Task::Error, tr("The environment setting value is invalid."), Utils::FileName(), -1, Core::Id(Constants::TASK_CATEGORY_BUILDSYSTEM))); @@ -849,18 +849,18 @@ QList EnvironmentKitInformation::validate(const Kit *k) const return result; } -void EnvironmentKitInformation::fix(Kit *k) +void EnvironmentKitAspect::fix(Kit *k) { QTC_ASSERT(k, return); - const QVariant variant = k->value(EnvironmentKitInformation::id()); + const QVariant variant = k->value(EnvironmentKitAspect::id()); if (!variant.isNull() && !variant.canConvert(QVariant::List)) { qWarning("Kit \"%s\" has a wrong environment value set.", qPrintable(k->displayName())); setEnvironmentChanges(k, QList()); } } -void EnvironmentKitInformation::addToEnvironment(const Kit *k, Utils::Environment &env) const +void EnvironmentKitAspect::addToEnvironment(const Kit *k, Utils::Environment &env) const { const QStringList values = Utils::transform(Utils::EnvironmentItem::toStringList(environmentChanges(k)), @@ -868,34 +868,34 @@ void EnvironmentKitInformation::addToEnvironment(const Kit *k, Utils::Environmen env.modify(Utils::EnvironmentItem::fromStringList(values)); } -KitConfigWidget *EnvironmentKitInformation::createConfigWidget(Kit *k) const +KitAspectWidget *EnvironmentKitAspect::createConfigWidget(Kit *k) const { QTC_ASSERT(k, return nullptr); - return new Internal::KitEnvironmentConfigWidget(k, this); + return new Internal::EnvironmentKitAspectWidget(k, this); } -KitInformation::ItemList EnvironmentKitInformation::toUserOutput(const Kit *k) const +KitAspect::ItemList EnvironmentKitAspect::toUserOutput(const Kit *k) const { return { qMakePair(tr("Environment"), Utils::EnvironmentItem::toStringList(environmentChanges(k)).join("
")) }; } -Core::Id EnvironmentKitInformation::id() +Core::Id EnvironmentKitAspect::id() { return "PE.Profile.Environment"; } -QList EnvironmentKitInformation::environmentChanges(const Kit *k) +QList EnvironmentKitAspect::environmentChanges(const Kit *k) { if (k) - return Utils::EnvironmentItem::fromStringList(k->value(EnvironmentKitInformation::id()).toStringList()); + return Utils::EnvironmentItem::fromStringList(k->value(EnvironmentKitAspect::id()).toStringList()); return QList(); } -void EnvironmentKitInformation::setEnvironmentChanges(Kit *k, const QList &changes) +void EnvironmentKitAspect::setEnvironmentChanges(Kit *k, const QList &changes) { if (k) - k->setValue(EnvironmentKitInformation::id(), Utils::EnvironmentItem::toStringList(changes)); + k->setValue(EnvironmentKitAspect::id(), Utils::EnvironmentItem::toStringList(changes)); } } // namespace ProjectExplorer diff --git a/src/plugins/projectexplorer/kitinformation.h b/src/plugins/projectexplorer/kitinformation.h index c32dbefa27..2295c8944c 100644 --- a/src/plugins/projectexplorer/kitinformation.h +++ b/src/plugins/projectexplorer/kitinformation.h @@ -37,24 +37,24 @@ namespace ProjectExplorer { -class KitConfigWidget; +class KitAspectWidget; // -------------------------------------------------------------------------- // SysRootInformation: // -------------------------------------------------------------------------- -class PROJECTEXPLORER_EXPORT SysRootKitInformation : public KitInformation +class PROJECTEXPLORER_EXPORT SysRootKitAspect : public KitAspect { Q_OBJECT public: - SysRootKitInformation(); + SysRootKitAspect(); QVariant defaultValue(const Kit *k) const override; QList validate(const Kit *k) const override; - KitConfigWidget *createConfigWidget(Kit *k) const override; + KitAspectWidget *createConfigWidget(Kit *k) const override; ItemList toUserOutput(const Kit *k) const override; void addToMacroExpander(Kit *kit, Utils::MacroExpander *expander) const override; @@ -68,12 +68,12 @@ public: // ToolChainInformation: // -------------------------------------------------------------------------- -class PROJECTEXPLORER_EXPORT ToolChainKitInformation : public KitInformation +class PROJECTEXPLORER_EXPORT ToolChainKitAspect : public KitAspect { Q_OBJECT public: - ToolChainKitInformation(); + ToolChainKitAspect(); QVariant defaultValue(const Kit *k) const override; @@ -82,7 +82,7 @@ public: void fix(Kit *k) override; void setup(Kit *k) override; - KitConfigWidget *createConfigWidget(Kit *k) const override; + KitAspectWidget *createConfigWidget(Kit *k) const override; QString displayNamePostfix(const Kit *k) const override; @@ -114,18 +114,18 @@ private: // DeviceTypeInformation: // -------------------------------------------------------------------------- -class PROJECTEXPLORER_EXPORT DeviceTypeKitInformation : public KitInformation +class PROJECTEXPLORER_EXPORT DeviceTypeKitAspect : public KitAspect { Q_OBJECT public: - DeviceTypeKitInformation(); + DeviceTypeKitAspect(); QVariant defaultValue(const Kit *k) const override; QList validate(const Kit *k) const override; - KitConfigWidget *createConfigWidget(Kit *k) const override; + KitAspectWidget *createConfigWidget(Kit *k) const override; ItemList toUserOutput(const Kit *k) const override; @@ -143,12 +143,12 @@ public: // DeviceInformation: // -------------------------------------------------------------------------- -class PROJECTEXPLORER_EXPORT DeviceKitInformation : public KitInformation +class PROJECTEXPLORER_EXPORT DeviceKitAspect : public KitAspect { Q_OBJECT public: - DeviceKitInformation(); + DeviceKitAspect(); QVariant defaultValue(const Kit *k) const override; @@ -156,7 +156,7 @@ public: void fix(Kit *k) override; void setup(Kit *k) override; - KitConfigWidget *createConfigWidget(Kit *k) const override; + KitAspectWidget *createConfigWidget(Kit *k) const override; QString displayNamePostfix(const Kit *k) const override; @@ -178,15 +178,15 @@ private: }; // -------------------------------------------------------------------------- -// EnvironmentKitInformation: +// EnvironmentKitAspect: // -------------------------------------------------------------------------- -class PROJECTEXPLORER_EXPORT EnvironmentKitInformation : public KitInformation +class PROJECTEXPLORER_EXPORT EnvironmentKitAspect : public KitAspect { Q_OBJECT public: - EnvironmentKitInformation(); + EnvironmentKitAspect(); QVariant defaultValue(const Kit *k) const override; @@ -194,7 +194,7 @@ public: void fix(Kit *k) override; void addToEnvironment(const Kit *k, Utils::Environment &env) const override; - KitConfigWidget *createConfigWidget(Kit *k) const override; + KitAspectWidget *createConfigWidget(Kit *k) const override; ItemList toUserOutput(const Kit *k) const override; diff --git a/src/plugins/projectexplorer/kitinformationconfigwidget.cpp b/src/plugins/projectexplorer/kitinformationconfigwidget.cpp index a366d84646..57ebc2f9b8 100644 --- a/src/plugins/projectexplorer/kitinformationconfigwidget.cpp +++ b/src/plugins/projectexplorer/kitinformationconfigwidget.cpp @@ -61,76 +61,76 @@ namespace ProjectExplorer { namespace Internal { // -------------------------------------------------------------------------- -// SysRootInformationConfigWidget: +// SysRootKitAspectWidget: // -------------------------------------------------------------------------- -SysRootInformationConfigWidget::SysRootInformationConfigWidget(Kit *k, const KitInformation *ki) : - KitConfigWidget(k, ki) +SysRootKitAspectWidget::SysRootKitAspectWidget(Kit *k, const KitAspect *ki) : + KitAspectWidget(k, ki) { m_chooser = new Utils::PathChooser; m_chooser->setExpectedKind(Utils::PathChooser::ExistingDirectory); m_chooser->setHistoryCompleter(QLatin1String("PE.SysRoot.History")); - m_chooser->setFileName(SysRootKitInformation::sysRoot(k)); + m_chooser->setFileName(SysRootKitAspect::sysRoot(k)); connect(m_chooser, &Utils::PathChooser::pathChanged, - this, &SysRootInformationConfigWidget::pathWasChanged); + this, &SysRootKitAspectWidget::pathWasChanged); } -SysRootInformationConfigWidget::~SysRootInformationConfigWidget() +SysRootKitAspectWidget::~SysRootKitAspectWidget() { delete m_chooser; } -QString SysRootInformationConfigWidget::displayName() const +QString SysRootKitAspectWidget::displayName() const { return tr("Sysroot"); } -QString SysRootInformationConfigWidget::toolTip() const +QString SysRootKitAspectWidget::toolTip() const { return tr("The root directory of the system image to use.
" "Leave empty when building for the desktop."); } -void SysRootInformationConfigWidget::setPalette(const QPalette &p) +void SysRootKitAspectWidget::setPalette(const QPalette &p) { - KitConfigWidget::setPalette(p); + KitAspectWidget::setPalette(p); m_chooser->setOkColor(p.color(QPalette::Active, QPalette::Text)); } -void SysRootInformationConfigWidget::refresh() +void SysRootKitAspectWidget::refresh() { if (!m_ignoreChange) - m_chooser->setFileName(SysRootKitInformation::sysRoot(m_kit)); + m_chooser->setFileName(SysRootKitAspect::sysRoot(m_kit)); } -void SysRootInformationConfigWidget::makeReadOnly() +void SysRootKitAspectWidget::makeReadOnly() { m_chooser->setReadOnly(true); } -QWidget *SysRootInformationConfigWidget::mainWidget() const +QWidget *SysRootKitAspectWidget::mainWidget() const { return m_chooser->lineEdit(); } -QWidget *SysRootInformationConfigWidget::buttonWidget() const +QWidget *SysRootKitAspectWidget::buttonWidget() const { return m_chooser->buttonAtIndex(0); } -void SysRootInformationConfigWidget::pathWasChanged() +void SysRootKitAspectWidget::pathWasChanged() { m_ignoreChange = true; - SysRootKitInformation::setSysRoot(m_kit, m_chooser->fileName()); + SysRootKitAspect::setSysRoot(m_kit, m_chooser->fileName()); m_ignoreChange = false; } // -------------------------------------------------------------------------- -// ToolChainInformationConfigWidget: +// ToolChainKitAspectWidget: // -------------------------------------------------------------------------- -ToolChainInformationConfigWidget::ToolChainInformationConfigWidget(Kit *k, const KitInformation *ki) : - KitConfigWidget(k, ki) +ToolChainKitAspectWidget::ToolChainKitAspectWidget(Kit *k, const KitAspect *ki) : + KitAspectWidget(k, ki) { m_mainWidget = new QWidget; m_mainWidget->setContentsMargins(0, 0, 0, 0); @@ -163,31 +163,31 @@ ToolChainInformationConfigWidget::ToolChainInformationConfigWidget(Kit *k, const refresh(); - m_manageButton = new QPushButton(KitConfigWidget::msgManage()); + m_manageButton = new QPushButton(KitAspectWidget::msgManage()); m_manageButton->setContentsMargins(0, 0, 0, 0); connect(m_manageButton, &QAbstractButton::clicked, - this, &ToolChainInformationConfigWidget::manageToolChains); + this, &ToolChainKitAspectWidget::manageToolChains); } -ToolChainInformationConfigWidget::~ToolChainInformationConfigWidget() +ToolChainKitAspectWidget::~ToolChainKitAspectWidget() { delete m_mainWidget; delete m_manageButton; } -QString ToolChainInformationConfigWidget::displayName() const +QString ToolChainKitAspectWidget::displayName() const { return tr("Compiler"); } -QString ToolChainInformationConfigWidget::toolTip() const +QString ToolChainKitAspectWidget::toolTip() const { return tr("The compiler to use for building.
" "Make sure the compiler will produce binaries compatible with the target device, " "Qt version and other libraries used."); } -void ToolChainInformationConfigWidget::refresh() +void ToolChainKitAspectWidget::refresh() { m_ignoreChanges = true; @@ -203,13 +203,13 @@ void ToolChainInformationConfigWidget::refresh() cb->addItem(tc->displayName(), tc->id()); cb->setEnabled(cb->count() > 1 && !m_isReadOnly); - const int index = indexOf(cb, ToolChainKitInformation::toolChain(m_kit, l)); + const int index = indexOf(cb, ToolChainKitAspect::toolChain(m_kit, l)); cb->setCurrentIndex(index); } m_ignoreChanges = false; } -void ToolChainInformationConfigWidget::makeReadOnly() +void ToolChainKitAspectWidget::makeReadOnly() { m_isReadOnly = true; foreach (Core::Id l, m_languageComboboxMap.keys()) { @@ -217,22 +217,22 @@ void ToolChainInformationConfigWidget::makeReadOnly() } } -QWidget *ToolChainInformationConfigWidget::mainWidget() const +QWidget *ToolChainKitAspectWidget::mainWidget() const { return m_mainWidget; } -QWidget *ToolChainInformationConfigWidget::buttonWidget() const +QWidget *ToolChainKitAspectWidget::buttonWidget() const { return m_manageButton; } -void ToolChainInformationConfigWidget::manageToolChains() +void ToolChainKitAspectWidget::manageToolChains() { ICore::showOptionsDialog(Constants::TOOLCHAIN_SETTINGS_PAGE_ID, buttonWidget()); } -void ToolChainInformationConfigWidget::currentToolChainChanged(Id language, int idx) +void ToolChainKitAspectWidget::currentToolChainChanged(Id language, int idx) { if (m_ignoreChanges || idx < 0) return; @@ -241,12 +241,12 @@ void ToolChainInformationConfigWidget::currentToolChainChanged(Id language, int ToolChain *tc = ToolChainManager::findToolChain(id); QTC_ASSERT(!tc || tc->language() == language, return); if (tc) - ToolChainKitInformation::setToolChain(m_kit, tc); + ToolChainKitAspect::setToolChain(m_kit, tc); else - ToolChainKitInformation::clearToolChain(m_kit, language); + ToolChainKitAspect::clearToolChain(m_kit, language); } -int ToolChainInformationConfigWidget::indexOf(QComboBox *cb, const ToolChain *tc) +int ToolChainKitAspectWidget::indexOf(QComboBox *cb, const ToolChain *tc) { const QByteArray id = tc ? tc->id() : QByteArray(); for (int i = 0; i < cb->count(); ++i) { @@ -257,11 +257,11 @@ int ToolChainInformationConfigWidget::indexOf(QComboBox *cb, const ToolChain *tc } // -------------------------------------------------------------------------- -// DeviceTypeInformationConfigWidget: +// DeviceTypeKitAspectWidget: // -------------------------------------------------------------------------- -DeviceTypeInformationConfigWidget::DeviceTypeInformationConfigWidget(Kit *workingCopy, const KitInformation *ki) : - KitConfigWidget(workingCopy, ki), m_comboBox(new QComboBox) +DeviceTypeKitAspectWidget::DeviceTypeKitAspectWidget(Kit *workingCopy, const KitAspect *ki) : + KitAspectWidget(workingCopy, ki), m_comboBox(new QComboBox) { for (IDeviceFactory *factory : IDeviceFactory::allDeviceFactories()) m_comboBox->addItem(factory->displayName(), factory->deviceType().toSetting()); @@ -270,32 +270,32 @@ DeviceTypeInformationConfigWidget::DeviceTypeInformationConfigWidget(Kit *workin refresh(); connect(m_comboBox, static_cast(&QComboBox::currentIndexChanged), - this, &DeviceTypeInformationConfigWidget::currentTypeChanged); + this, &DeviceTypeKitAspectWidget::currentTypeChanged); } -DeviceTypeInformationConfigWidget::~DeviceTypeInformationConfigWidget() +DeviceTypeKitAspectWidget::~DeviceTypeKitAspectWidget() { delete m_comboBox; } -QWidget *DeviceTypeInformationConfigWidget::mainWidget() const +QWidget *DeviceTypeKitAspectWidget::mainWidget() const { return m_comboBox; } -QString DeviceTypeInformationConfigWidget::displayName() const +QString DeviceTypeKitAspectWidget::displayName() const { return tr("Device type"); } -QString DeviceTypeInformationConfigWidget::toolTip() const +QString DeviceTypeKitAspectWidget::toolTip() const { return tr("The type of device to run applications on."); } -void DeviceTypeInformationConfigWidget::refresh() +void DeviceTypeKitAspectWidget::refresh() { - Id devType = DeviceTypeKitInformation::deviceTypeId(m_kit); + Id devType = DeviceTypeKitAspect::deviceTypeId(m_kit); if (!devType.isValid()) m_comboBox->setCurrentIndex(-1); for (int i = 0; i < m_comboBox->count(); ++i) { @@ -306,112 +306,112 @@ void DeviceTypeInformationConfigWidget::refresh() } } -void DeviceTypeInformationConfigWidget::makeReadOnly() +void DeviceTypeKitAspectWidget::makeReadOnly() { m_comboBox->setEnabled(false); } -void DeviceTypeInformationConfigWidget::currentTypeChanged(int idx) +void DeviceTypeKitAspectWidget::currentTypeChanged(int idx) { Id type = idx < 0 ? Id() : Id::fromSetting(m_comboBox->itemData(idx)); - DeviceTypeKitInformation::setDeviceTypeId(m_kit, type); + DeviceTypeKitAspect::setDeviceTypeId(m_kit, type); } // -------------------------------------------------------------------------- -// DeviceInformationConfigWidget: +// DeviceKitAspectWidget: // -------------------------------------------------------------------------- -DeviceInformationConfigWidget::DeviceInformationConfigWidget(Kit *workingCopy, const KitInformation *ki) : - KitConfigWidget(workingCopy, ki), +DeviceKitAspectWidget::DeviceKitAspectWidget(Kit *workingCopy, const KitAspect *ki) : + KitAspectWidget(workingCopy, ki), m_comboBox(new QComboBox), m_model(new DeviceManagerModel(DeviceManager::instance())) { m_comboBox->setSizePolicy(QSizePolicy::Ignored, m_comboBox->sizePolicy().verticalPolicy()); m_comboBox->setModel(m_model); - m_manageButton = new QPushButton(KitConfigWidget::msgManage()); + m_manageButton = new QPushButton(KitAspectWidget::msgManage()); refresh(); m_comboBox->setToolTip(toolTip()); connect(m_model, &QAbstractItemModel::modelAboutToBeReset, - this, &DeviceInformationConfigWidget::modelAboutToReset); + this, &DeviceKitAspectWidget::modelAboutToReset); connect(m_model, &QAbstractItemModel::modelReset, - this, &DeviceInformationConfigWidget::modelReset); + this, &DeviceKitAspectWidget::modelReset); connect(m_comboBox, static_cast(&QComboBox::currentIndexChanged), - this, &DeviceInformationConfigWidget::currentDeviceChanged); + this, &DeviceKitAspectWidget::currentDeviceChanged); connect(m_manageButton, &QAbstractButton::clicked, - this, &DeviceInformationConfigWidget::manageDevices); + this, &DeviceKitAspectWidget::manageDevices); } -DeviceInformationConfigWidget::~DeviceInformationConfigWidget() +DeviceKitAspectWidget::~DeviceKitAspectWidget() { delete m_comboBox; delete m_model; delete m_manageButton; } -QWidget *DeviceInformationConfigWidget::mainWidget() const +QWidget *DeviceKitAspectWidget::mainWidget() const { return m_comboBox; } -QString DeviceInformationConfigWidget::displayName() const +QString DeviceKitAspectWidget::displayName() const { return tr("Device"); } -QString DeviceInformationConfigWidget::toolTip() const +QString DeviceKitAspectWidget::toolTip() const { return tr("The device to run the applications on."); } -void DeviceInformationConfigWidget::refresh() +void DeviceKitAspectWidget::refresh() { - m_model->setTypeFilter(DeviceTypeKitInformation::deviceTypeId(m_kit)); - m_comboBox->setCurrentIndex(m_model->indexOf(DeviceKitInformation::device(m_kit))); + m_model->setTypeFilter(DeviceTypeKitAspect::deviceTypeId(m_kit)); + m_comboBox->setCurrentIndex(m_model->indexOf(DeviceKitAspect::device(m_kit))); } -void DeviceInformationConfigWidget::makeReadOnly() +void DeviceKitAspectWidget::makeReadOnly() { m_comboBox->setEnabled(false); } -QWidget *DeviceInformationConfigWidget::buttonWidget() const +QWidget *DeviceKitAspectWidget::buttonWidget() const { return m_manageButton; } -void DeviceInformationConfigWidget::manageDevices() +void DeviceKitAspectWidget::manageDevices() { ICore::showOptionsDialog(Constants::DEVICE_SETTINGS_PAGE_ID, buttonWidget()); } -void DeviceInformationConfigWidget::modelAboutToReset() +void DeviceKitAspectWidget::modelAboutToReset() { m_selectedId = m_model->deviceId(m_comboBox->currentIndex()); m_ignoreChange = true; } -void DeviceInformationConfigWidget::modelReset() +void DeviceKitAspectWidget::modelReset() { m_comboBox->setCurrentIndex(m_model->indexForId(m_selectedId)); m_ignoreChange = false; } -void DeviceInformationConfigWidget::currentDeviceChanged() +void DeviceKitAspectWidget::currentDeviceChanged() { if (m_ignoreChange) return; - DeviceKitInformation::setDeviceId(m_kit, m_model->deviceId(m_comboBox->currentIndex())); + DeviceKitAspect::setDeviceId(m_kit, m_model->deviceId(m_comboBox->currentIndex())); } // -------------------------------------------------------------------- -// KitEnvironmentConfigWidget: +// EnvironmentKitAspectWidget: // -------------------------------------------------------------------- -KitEnvironmentConfigWidget::KitEnvironmentConfigWidget(Kit *workingCopy, const KitInformation *ki) : - KitConfigWidget(workingCopy, ki), +EnvironmentKitAspectWidget::EnvironmentKitAspectWidget(Kit *workingCopy, const KitAspect *ki) : + KitAspectWidget(workingCopy, ki), m_summaryLabel(new QLabel), m_manageButton(new QPushButton), m_mainWidget(new QWidget) @@ -427,25 +427,25 @@ KitEnvironmentConfigWidget::KitEnvironmentConfigWidget(Kit *workingCopy, const K refresh(); m_manageButton->setText(tr("Change...")); connect(m_manageButton, &QAbstractButton::clicked, - this, &KitEnvironmentConfigWidget::editEnvironmentChanges); + this, &EnvironmentKitAspectWidget::editEnvironmentChanges); } -QWidget *KitEnvironmentConfigWidget::mainWidget() const +QWidget *EnvironmentKitAspectWidget::mainWidget() const { return m_mainWidget; } -QString KitEnvironmentConfigWidget::displayName() const +QString EnvironmentKitAspectWidget::displayName() const { return tr("Environment"); } -QString KitEnvironmentConfigWidget::toolTip() const +QString EnvironmentKitAspectWidget::toolTip() const { return tr("Additional build environment settings when using this kit."); } -void KitEnvironmentConfigWidget::refresh() +void EnvironmentKitAspectWidget::refresh() { const QList changes = currentEnvironment(); QString shortSummary = Utils::EnvironmentItem::toStringList(changes).join(QLatin1String("; ")); @@ -454,14 +454,14 @@ void KitEnvironmentConfigWidget::refresh() m_summaryLabel->setText(shortSummary.isEmpty() ? tr("No changes to apply.") : shortSummary); } -void KitEnvironmentConfigWidget::makeReadOnly() +void EnvironmentKitAspectWidget::makeReadOnly() { m_manageButton->setEnabled(false); } -QList KitEnvironmentConfigWidget::currentEnvironment() const +QList EnvironmentKitAspectWidget::currentEnvironment() const { - QList changes = EnvironmentKitInformation::environmentChanges(m_kit); + QList changes = EnvironmentKitAspect::environmentChanges(m_kit); if (Utils::HostOsInfo::isWindowsHost()) { const Utils::EnvironmentItem forceMSVCEnglishItem("VSLANG", "1033"); @@ -476,7 +476,7 @@ QList KitEnvironmentConfigWidget::currentEnvironment() c return changes; } -void KitEnvironmentConfigWidget::editEnvironmentChanges() +void EnvironmentKitAspectWidget::editEnvironmentChanges() { bool ok; Utils::MacroExpander *expander = m_kit->macroExpander(); @@ -498,15 +498,15 @@ void KitEnvironmentConfigWidget::editEnvironmentChanges() changes.append(forceMSVCEnglishItem); } - EnvironmentKitInformation::setEnvironmentChanges(m_kit, changes); + EnvironmentKitAspect::setEnvironmentChanges(m_kit, changes); } -QWidget *KitEnvironmentConfigWidget::buttonWidget() const +QWidget *EnvironmentKitAspectWidget::buttonWidget() const { return m_manageButton; } -void KitEnvironmentConfigWidget::initMSVCOutputSwitch(QVBoxLayout *layout) +void EnvironmentKitAspectWidget::initMSVCOutputSwitch(QVBoxLayout *layout) { m_vslangCheckbox = new QCheckBox(tr("Force UTF-8 MSVC compiler output")); layout->addWidget(m_vslangCheckbox); @@ -515,13 +515,13 @@ void KitEnvironmentConfigWidget::initMSVCOutputSwitch(QVBoxLayout *layout) "compiler).")); connect(m_vslangCheckbox, &QCheckBox::toggled, this, [this](bool checked) { QList changes - = EnvironmentKitInformation::environmentChanges(m_kit); + = EnvironmentKitAspect::environmentChanges(m_kit); const Utils::EnvironmentItem forceMSVCEnglishItem("VSLANG", "1033"); if (!checked && changes.indexOf(forceMSVCEnglishItem) >= 0) changes.removeAll(forceMSVCEnglishItem); if (checked && changes.indexOf(forceMSVCEnglishItem) < 0) changes.append(forceMSVCEnglishItem); - EnvironmentKitInformation::setEnvironmentChanges(m_kit, changes); + EnvironmentKitAspect::setEnvironmentChanges(m_kit, changes); }); } diff --git a/src/plugins/projectexplorer/kitinformationconfigwidget.h b/src/plugins/projectexplorer/kitinformationconfigwidget.h index 5fb6016d8c..ad909efcc8 100644 --- a/src/plugins/projectexplorer/kitinformationconfigwidget.h +++ b/src/plugins/projectexplorer/kitinformationconfigwidget.h @@ -50,16 +50,16 @@ class DeviceManagerModel; namespace Internal { // -------------------------------------------------------------------------- -// SysRootInformationConfigWidget: +// SysRootKitAspectWidget: // -------------------------------------------------------------------------- -class SysRootInformationConfigWidget : public KitConfigWidget +class SysRootKitAspectWidget : public KitAspectWidget { Q_OBJECT public: - SysRootInformationConfigWidget(Kit *k, const KitInformation *ki); - ~SysRootInformationConfigWidget() override; + SysRootKitAspectWidget(Kit *k, const KitAspect *ki); + ~SysRootKitAspectWidget() override; QString displayName() const override; void refresh() override; @@ -78,16 +78,16 @@ private: }; // -------------------------------------------------------------------------- -// ToolChainInformationConfigWidget: +// ToolChainKitAspectWidget: // -------------------------------------------------------------------------- -class ToolChainInformationConfigWidget : public KitConfigWidget +class ToolChainKitAspectWidget : public KitAspectWidget { Q_OBJECT public: - ToolChainInformationConfigWidget(Kit *k, const KitInformation *ki); - ~ToolChainInformationConfigWidget() override; + ToolChainKitAspectWidget(Kit *k, const KitAspect *ki); + ~ToolChainKitAspectWidget() override; QString displayName() const override; void refresh() override; @@ -110,16 +110,16 @@ private: }; // -------------------------------------------------------------------------- -// DeviceTypeInformationConfigWidget: +// DeviceTypeKitAspectWidget: // -------------------------------------------------------------------------- -class DeviceTypeInformationConfigWidget : public KitConfigWidget +class DeviceTypeKitAspectWidget : public KitAspectWidget { Q_OBJECT public: - DeviceTypeInformationConfigWidget(Kit *workingCopy, const KitInformation *ki); - ~DeviceTypeInformationConfigWidget() override; + DeviceTypeKitAspectWidget(Kit *workingCopy, const KitAspect *ki); + ~DeviceTypeKitAspectWidget() override; QWidget *mainWidget() const override; QString displayName() const override; @@ -134,16 +134,16 @@ private: }; // -------------------------------------------------------------------------- -// DeviceInformationConfigWidget: +// DeviceKitAspectWidget: // -------------------------------------------------------------------------- -class DeviceInformationConfigWidget : public KitConfigWidget +class DeviceKitAspectWidget : public KitAspectWidget { Q_OBJECT public: - DeviceInformationConfigWidget(Kit *workingCopy, const KitInformation *ki); - ~DeviceInformationConfigWidget() override; + DeviceKitAspectWidget(Kit *workingCopy, const KitAspect *ki); + ~DeviceKitAspectWidget() override; QWidget *mainWidget() const override; QWidget *buttonWidget() const override; @@ -166,12 +166,12 @@ private: Core::Id m_selectedId; }; -class KitEnvironmentConfigWidget : public KitConfigWidget +class EnvironmentKitAspectWidget : public KitAspectWidget { Q_OBJECT public: - KitEnvironmentConfigWidget(Kit *workingCopy, const KitInformation *ki); + EnvironmentKitAspectWidget(Kit *workingCopy, const KitAspect *ki); QWidget *mainWidget() const override; QWidget *buttonWidget() const override; diff --git a/src/plugins/projectexplorer/kitmanager.cpp b/src/plugins/projectexplorer/kitmanager.cpp index 499f1f19b4..73365e2283 100644 --- a/src/plugins/projectexplorer/kitmanager.cpp +++ b/src/plugins/projectexplorer/kitmanager.cpp @@ -69,7 +69,7 @@ class KitManagerPrivate public: Kit *m_defaultKit = nullptr; bool m_initialized = false; - std::vector> m_informationList; + std::vector> m_informationList; std::vector> m_kitList; std::unique_ptr m_writer; }; @@ -151,7 +151,7 @@ void KitManager::restoreKits() Kit *ptr = i->get(); // Overwrite settings that the SDK sets to those values: - foreach (const KitInformation *ki, KitManager::kitInformation()) { + foreach (const KitAspect *ki, KitManager::kitInformation()) { // Copy sticky settings over: if (ptr->isSticky(ki->id())) { ptr->setValue(ki->id(), toStore->value(ki->id())); @@ -227,7 +227,7 @@ bool KitManager::isLoaded() return d->m_initialized; } -void KitManager::registerKitInformation(std::unique_ptr &&ki) +void KitManager::registerKitAspect(std::unique_ptr &&ki) { QTC_ASSERT(ki->id().isValid(), return ); QTC_ASSERT(!Utils::contains(d->m_informationList, ki.get()), return ); @@ -235,8 +235,8 @@ void KitManager::registerKitInformation(std::unique_ptr &&ki) auto it = std::lower_bound(std::begin(d->m_informationList), std::end(d->m_informationList), ki, - [](const std::unique_ptr &a, - const std::unique_ptr &b) { + [](const std::unique_ptr &a, + const std::unique_ptr &b) { return a->priority() > b->priority(); }); d->m_informationList.insert(it, std::move(ki)); @@ -364,7 +364,7 @@ Kit *KitManager::defaultKit() return d->m_defaultKit; } -QList KitManager::kitInformation() +QList KitManager::kitInformation() { return Utils::toRawPointer(d->m_informationList); } @@ -372,7 +372,7 @@ QList KitManager::kitInformation() KitManagerConfigWidget *KitManager::createConfigWidget(Kit *k) { auto *result = new KitManagerConfigWidget(k); - foreach (KitInformation *ki, kitInformation()) + foreach (KitAspect *ki, kitInformation()) result->addConfigWidget(ki->createConfigWidget(result->workingCopy())); result->updateVisibility(); @@ -442,7 +442,7 @@ void KitManager::completeKit(Kit *k) { QTC_ASSERT(k, return); KitGuard g(k); - for (const std::unique_ptr &ki : d->m_informationList) { + for (const std::unique_ptr &ki : d->m_informationList) { ki->upgrade(k); if (!k->hasValue(ki->id())) k->setValue(ki->id(), ki->defaultValue(k)); @@ -452,46 +452,46 @@ void KitManager::completeKit(Kit *k) } // -------------------------------------------------------------------- -// KitInformation: +// KitAspect: // -------------------------------------------------------------------- -void KitInformation::addToEnvironment(const Kit *k, Environment &env) const +void KitAspect::addToEnvironment(const Kit *k, Environment &env) const { Q_UNUSED(k); Q_UNUSED(env); } -IOutputParser *KitInformation::createOutputParser(const Kit *k) const +IOutputParser *KitAspect::createOutputParser(const Kit *k) const { Q_UNUSED(k); return nullptr; } -QString KitInformation::displayNamePostfix(const Kit *k) const +QString KitAspect::displayNamePostfix(const Kit *k) const { Q_UNUSED(k); return QString(); } -QSet KitInformation::supportedPlatforms(const Kit *k) const +QSet KitAspect::supportedPlatforms(const Kit *k) const { Q_UNUSED(k); return QSet(); } -QSet KitInformation::availableFeatures(const Kit *k) const +QSet KitAspect::availableFeatures(const Kit *k) const { Q_UNUSED(k); return QSet(); } -void KitInformation::addToMacroExpander(Kit *k, MacroExpander *expander) const +void KitAspect::addToMacroExpander(Kit *k, MacroExpander *expander) const { Q_UNUSED(k); Q_UNUSED(expander); } -void KitInformation::notifyAboutUpdate(Kit *k) +void KitAspect::notifyAboutUpdate(Kit *k) { if (k) k->kitUpdated(); diff --git a/src/plugins/projectexplorer/kitmanager.h b/src/plugins/projectexplorer/kitmanager.h index 189dc1c216..0085b67479 100644 --- a/src/plugins/projectexplorer/kitmanager.h +++ b/src/plugins/projectexplorer/kitmanager.h @@ -46,7 +46,7 @@ class MacroExpander; namespace ProjectExplorer { class Task; class IOutputParser; -class KitConfigWidget; +class KitAspectWidget; class KitManager; namespace Internal { @@ -55,13 +55,13 @@ class KitModel; } // namespace Internal /** - * @brief The KitInformation class + * @brief The KitAspect class * * One piece of information stored in the kit. * * This needs to get registered with the \a KitManager. */ -class PROJECTEXPLORER_EXPORT KitInformation : public QObject +class PROJECTEXPLORER_EXPORT KitAspect : public QObject { Q_OBJECT @@ -85,7 +85,7 @@ public: virtual ItemList toUserOutput(const Kit *) const = 0; - virtual KitConfigWidget *createConfigWidget(Kit *) const = 0; + virtual KitAspectWidget *createConfigWidget(Kit *) const = 0; virtual void addToEnvironment(const Kit *k, Utils::Environment &env) const; virtual IOutputParser *createOutputParser(const Kit *k) const; @@ -120,7 +120,7 @@ public: static Kit *kit(Core::Id id); static Kit *defaultKit(); - static QList kitInformation(); + static QList kitInformation(); static Internal::KitManagerConfigWidget *createConfigWidget(Kit *k); @@ -129,8 +129,8 @@ public: static void setDefaultKit(Kit *k); template - static void registerKitInformation(Args&&... args) { - registerKitInformation(std::make_unique(std::forward(args)...)); + static void registerKitAspect(Args&&... args) { + registerKitAspect(std::make_unique(std::forward(args)...)); } static QSet supportedPlatforms(); @@ -159,10 +159,10 @@ signals: private: explicit KitManager(QObject *parent = nullptr); - static void registerKitInformation(std::unique_ptr &&ki); + static void registerKitAspect(std::unique_ptr &&ki); // Make sure the this is only called after all - // KitInformation are registered! + // KitAspects are registered! void restoreKits(); class KitList { @@ -178,7 +178,7 @@ private: friend class ProjectExplorerPlugin; // for constructor friend class Kit; friend class Internal::KitModel; - friend class KitInformation; // for notifyAbutUpdate + friend class KitAspect; // for notifyAbutUpdate }; } // namespace ProjectExplorer diff --git a/src/plugins/projectexplorer/kitmanagerconfigwidget.cpp b/src/plugins/projectexplorer/kitmanagerconfigwidget.cpp index 473c8455e2..5a3895d0c2 100644 --- a/src/plugins/projectexplorer/kitmanagerconfigwidget.cpp +++ b/src/plugins/projectexplorer/kitmanagerconfigwidget.cpp @@ -211,7 +211,7 @@ QString KitManagerConfigWidget::validityMessage() const return m_modifiedKit->toHtml(tmp); } -void KitManagerConfigWidget::addConfigWidget(KitConfigWidget *widget) +void KitManagerConfigWidget::addConfigWidget(KitAspectWidget *widget) { QTC_ASSERT(widget, return); QTC_ASSERT(!m_widgets.contains(widget), return); @@ -249,7 +249,7 @@ void KitManagerConfigWidget::updateVisibility() { int count = m_widgets.count(); for (int i = 0; i < count; ++i) { - KitConfigWidget *widget = m_widgets.at(i); + KitAspectWidget *widget = m_widgets.at(i); bool visible = widget->visibleInKit(); widget->mainWidget()->setVisible(visible); if (widget->buttonWidget()) @@ -265,7 +265,7 @@ void KitManagerConfigWidget::setHasUniqueName(bool unique) void KitManagerConfigWidget::makeStickySubWidgetsReadOnly() { - foreach (KitConfigWidget *w, m_widgets) { + foreach (KitAspectWidget *w, m_widgets) { if (w->isSticky()) w->makeReadOnly(); } @@ -348,7 +348,7 @@ void KitManagerConfigWidget::workingCopyWasUpdated(Kit *k) k->fix(); m_fixingKit = false; - foreach (KitConfigWidget *w, m_widgets) + foreach (KitAspectWidget *w, m_widgets) w->refresh(); m_cachedDisplayName.clear(); @@ -376,7 +376,7 @@ void KitManagerConfigWidget::kitWasUpdated(Kit *k) void KitManagerConfigWidget::showEvent(QShowEvent *event) { Q_UNUSED(event); - foreach (KitConfigWidget *widget, m_widgets) + foreach (KitAspectWidget *widget, m_widgets) widget->refresh(); } diff --git a/src/plugins/projectexplorer/kitmanagerconfigwidget.h b/src/plugins/projectexplorer/kitmanagerconfigwidget.h index 026a8e25b4..b7a6d652ec 100644 --- a/src/plugins/projectexplorer/kitmanagerconfigwidget.h +++ b/src/plugins/projectexplorer/kitmanagerconfigwidget.h @@ -60,7 +60,7 @@ public: bool isValid() const; bool hasWarning() const; QString validityMessage() const; - void addConfigWidget(KitConfigWidget *widget); + void addConfigWidget(KitAspectWidget *widget); void makeStickySubWidgetsReadOnly(); Kit *workingCopy() const; @@ -97,7 +97,7 @@ private: QToolButton *m_iconButton; QLineEdit *m_nameEdit; QLineEdit *m_fileSystemFriendlyNameLineEdit; - QList m_widgets; + QList m_widgets; QList m_labels; Kit *m_kit; std::unique_ptr m_modifiedKit; diff --git a/src/plugins/projectexplorer/makestep.cpp b/src/plugins/projectexplorer/makestep.cpp index b909962ce9..34db908c61 100644 --- a/src/plugins/projectexplorer/makestep.cpp +++ b/src/plugins/projectexplorer/makestep.cpp @@ -126,7 +126,7 @@ QString MakeStep::defaultDisplayName() static const QList preferredToolChains(const Kit *kit) { - QList tcs = ToolChainKitInformation::toolChains(kit); + QList tcs = ToolChainKitAspect::toolChains(kit); // prefer CXX, then C, then others Utils::sort(tcs, [](ToolChain *tcA, ToolChain *tcB) { if (tcA->language() == tcB->language()) diff --git a/src/plugins/projectexplorer/miniprojecttargetselector.cpp b/src/plugins/projectexplorer/miniprojecttargetselector.cpp index 7d0573b0ac..fbf26fc4de 100644 --- a/src/plugins/projectexplorer/miniprojecttargetselector.cpp +++ b/src/plugins/projectexplorer/miniprojecttargetselector.cpp @@ -579,7 +579,7 @@ KitAreaWidget::~KitAreaWidget() void KitAreaWidget::setKit(Kit *k) { - foreach (KitConfigWidget *w, m_widgets) + foreach (KitAspectWidget *w, m_widgets) delete(w); m_widgets.clear(); @@ -591,9 +591,9 @@ void KitAreaWidget::setKit(Kit *k) m_labels.clear(); int row = 0; - foreach (KitInformation *ki, KitManager::kitInformation()) { + foreach (KitAspect *ki, KitManager::kitInformation()) { if (k && k->isMutable(ki->id())) { - KitConfigWidget *widget = ki->createConfigWidget(k); + KitAspectWidget *widget = ki->createConfigWidget(k); m_widgets << widget; QLabel *label = new QLabel(widget->displayName()); m_labels << label; @@ -619,9 +619,9 @@ void KitAreaWidget::updateKit(Kit *k) return; bool addedMutables = false; - QList knownIdList = Utils::transform(m_widgets, &KitConfigWidget::kitInformationId); + QList knownIdList = Utils::transform(m_widgets, &KitAspectWidget::kitInformationId); - foreach (KitInformation *ki, KitManager::kitInformation()) { + foreach (KitAspect *ki, KitManager::kitInformation()) { Core::Id currentId = ki->id(); if (m_kit->isMutable(currentId) && !knownIdList.removeOne(currentId)) { addedMutables = true; @@ -635,7 +635,7 @@ void KitAreaWidget::updateKit(Kit *k) setKit(m_kit); } else { // Refresh all widgets if the number of mutable settings did not change - foreach (KitConfigWidget *w, m_widgets) + foreach (KitAspectWidget *w, m_widgets) w->refresh(); } } diff --git a/src/plugins/projectexplorer/miniprojecttargetselector.h b/src/plugins/projectexplorer/miniprojecttargetselector.h index 0c2e51a4f4..032f69f7eb 100644 --- a/src/plugins/projectexplorer/miniprojecttargetselector.h +++ b/src/plugins/projectexplorer/miniprojecttargetselector.h @@ -37,7 +37,7 @@ QT_END_NAMESPACE namespace ProjectExplorer { class Kit; -class KitConfigWidget; +class KitAspectWidget; class Project; class Target; class BuildConfiguration; @@ -101,7 +101,7 @@ private: QGridLayout *m_layout; Kit *m_kit = nullptr; - QList m_widgets; + QList m_widgets; QList m_labels; }; diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp index 7caef6e4b3..dad44d2700 100644 --- a/src/plugins/projectexplorer/projectexplorer.cpp +++ b/src/plugins/projectexplorer/projectexplorer.cpp @@ -603,12 +603,12 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er IWizardFactory::registerFeatureProvider(new KitFeatureProvider); - // Register KitInformation: - KitManager::registerKitInformation(); - KitManager::registerKitInformation(); - KitManager::registerKitInformation(); - KitManager::registerKitInformation(); - KitManager::registerKitInformation(); + // Register KitAspects: + KitManager::registerKitAspect(); + KitManager::registerKitAspect(); + KitManager::registerKitAspect(); + KitManager::registerKitAspect(); + KitManager::registerKitAspect(); IWizardFactory::registerFactoryCreator([]() -> QList { QList result; @@ -1535,7 +1535,7 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er tr("The host address of the device in the currently active kit."), []() -> QString { Kit *kit = currentKit(); - const IDevice::ConstPtr device = DeviceKitInformation::device(kit); + const IDevice::ConstPtr device = DeviceKitAspect::device(kit); return device ? device->sshParameters().host() : QString(); }); @@ -1543,7 +1543,7 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er tr("The SSH port of the device in the currently active kit."), []() -> QString { Kit *kit = currentKit(); - const IDevice::ConstPtr device = DeviceKitInformation::device(kit); + const IDevice::ConstPtr device = DeviceKitAspect::device(kit); return device ? QString::number(device->sshParameters().port()) : QString(); }); @@ -1551,7 +1551,7 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er tr("The username with which to log into the device in the currently active kit."), []() -> QString { Kit *kit = currentKit(); - const IDevice::ConstPtr device = DeviceKitInformation::device(kit); + const IDevice::ConstPtr device = DeviceKitAspect::device(kit); return device ? device->sshParameters().userName() : QString(); }); @@ -1561,7 +1561,7 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er "in the currently active kit."), []() -> QString { Kit *kit = currentKit(); - const IDevice::ConstPtr device = DeviceKitInformation::device(kit); + const IDevice::ConstPtr device = DeviceKitAspect::device(kit); return device ? device->sshParameters().privateKeyFile : QString(); }); @@ -2546,7 +2546,7 @@ int ProjectExplorerPluginPrivate::queue(QList projects, QList ste return false; IDevice::ConstPtr device = rc->runnable().device; if (device.isNull()) - device = DeviceKitInformation::device(t->kit()); + device = DeviceKitAspect::device(t->kit()); return !device.isNull() && device->type() == Core::Id(Constants::DESKTOP_DEVICE_TYPE); }); } diff --git a/src/plugins/projectexplorer/projectimporter.cpp b/src/plugins/projectexplorer/projectimporter.cpp index 174f6a7472..e5910c0366 100644 --- a/src/plugins/projectexplorer/projectimporter.cpp +++ b/src/plugins/projectexplorer/projectimporter.cpp @@ -73,7 +73,7 @@ static bool hasOtherUsers(Core::Id id, const QVariant &v, Kit *k) ProjectImporter::ProjectImporter(const Utils::FileName &path) : m_projectPath(path) { - useTemporaryKitInformation(ToolChainKitInformation::id(), + useTemporaryKitAspect(ToolChainKitAspect::id(), [this](Kit *k, const QVariantList &vl) { cleanupTemporaryToolChains(k, vl); }, [this](Kit *k, const QVariantList &vl) { persistTemporaryToolChains(k, vl); }); } @@ -167,7 +167,7 @@ Target *ProjectImporter::preferredTarget(const QList &possibleTargets) return t; if (pickedFallback) continue; - if (DeviceTypeKitInformation::deviceTypeId(t->kit()) == Constants::DESKTOP_DEVICE_TYPE) { + if (DeviceTypeKitAspect::deviceTypeId(t->kit()) == Constants::DESKTOP_DEVICE_TYPE) { activeTarget = t; pickedFallback = true; } @@ -294,12 +294,12 @@ Kit *ProjectImporter::createTemporaryKit(const KitSetupFunction &setup) const k->setUnexpandedDisplayName(QCoreApplication::translate("ProjectExplorer::ProjectImporter", "Imported Kit"));; // Set up values: - foreach (KitInformation *ki, KitManager::kitInformation()) + foreach (KitAspect *ki, KitManager::kitInformation()) ki->setup(kptr); setup(kptr); - foreach (KitInformation *ki, KitManager::kitInformation()) + foreach (KitAspect *ki, KitManager::kitInformation()) ki->fix(kptr); markKitAsTemporary(kptr); @@ -326,7 +326,7 @@ void ProjectImporter::cleanupTemporaryToolChains(Kit *k, const QVariantList &vl) ToolChain *tc = toolChainFromVariant(v); QTC_ASSERT(tc, continue); ToolChainManager::deregisterToolChain(tc); - ToolChainKitInformation::setToolChain(k, nullptr); + ToolChainKitAspect::setToolChain(k, nullptr); } } @@ -335,13 +335,13 @@ void ProjectImporter::persistTemporaryToolChains(Kit *k, const QVariantList &vl) for (const QVariant &v : vl) { ToolChain *tmpTc = toolChainFromVariant(v); QTC_ASSERT(tmpTc, continue); - ToolChain *actualTc = ToolChainKitInformation::toolChain(k, tmpTc->language()); + ToolChain *actualTc = ToolChainKitAspect::toolChain(k, tmpTc->language()); if (tmpTc && actualTc != tmpTc) ToolChainManager::deregisterToolChain(tmpTc); } } -void ProjectImporter::useTemporaryKitInformation(Core::Id id, +void ProjectImporter::useTemporaryKitAspect(Core::Id id, ProjectImporter::CleanupFunction cleanup, ProjectImporter::PersistFunction persist) { @@ -400,7 +400,7 @@ ProjectImporter::findOrCreateToolChains(const Utils::FileName &toolChainPath, }); for (const ToolChain *tc : result.tcs) { const QByteArray tcId = tc->id(); - result.areTemporary = result.areTemporary ? true : hasKitWithTemporaryData(ToolChainKitInformation::id(), tcId); + result.areTemporary = result.areTemporary ? true : hasKitWithTemporaryData(ToolChainKitAspect::id(), tcId); } if (!result.tcs.isEmpty()) return result; diff --git a/src/plugins/projectexplorer/projectimporter.h b/src/plugins/projectexplorer/projectimporter.h index c7df542a7a..133cb811dd 100644 --- a/src/plugins/projectexplorer/projectimporter.h +++ b/src/plugins/projectexplorer/projectimporter.h @@ -103,7 +103,7 @@ protected: // Handle temporary additions to Kits (Qt Versions, ToolChains, etc.) using CleanupFunction = std::function; using PersistFunction = std::function; - void useTemporaryKitInformation(Core::Id id, + void useTemporaryKitAspect(Core::Id id, CleanupFunction cleanup, PersistFunction persist); void addTemporaryData(Core::Id id, const QVariant &cleanupData, Kit *k) const; // Does *any* kit feature the requested data yet? diff --git a/src/plugins/projectexplorer/runconfiguration.cpp b/src/plugins/projectexplorer/runconfiguration.cpp index 2c8e238495..9b58ab701c 100644 --- a/src/plugins/projectexplorer/runconfiguration.cpp +++ b/src/plugins/projectexplorer/runconfiguration.cpp @@ -435,9 +435,9 @@ QString RunConfigurationFactory::decoratedTargetName(const QString &targetName, QString displayName; if (!targetName.isEmpty()) displayName = QFileInfo(targetName).completeBaseName(); - Core::Id devType = DeviceTypeKitInformation::deviceTypeId(target->kit()); + Core::Id devType = DeviceTypeKitAspect::deviceTypeId(target->kit()); if (devType != Constants::DESKTOP_DEVICE_TYPE) { - if (IDevice::ConstPtr dev = DeviceKitInformation::device(target->kit())) { + if (IDevice::ConstPtr dev = DeviceKitAspect::device(target->kit())) { if (displayName.isEmpty()) { //: Shown in Run configuration if no executable is given, %1 is device name displayName = RunConfiguration::tr("Run on %1").arg(dev->displayName()); @@ -524,7 +524,7 @@ bool RunConfigurationFactory::canHandle(Target *target) const if (!m_supportedTargetDeviceTypes.isEmpty()) if (!m_supportedTargetDeviceTypes.contains( - DeviceTypeKitInformation::deviceTypeId(kit))) + DeviceTypeKitAspect::deviceTypeId(kit))) return false; return true; @@ -796,7 +796,7 @@ public: outputFormatter = runConfiguration->createOutputFormatter(); device = runnable.device; if (!device) - device = DeviceKitInformation::device(runConfiguration->target()->kit()); + device = DeviceKitAspect::device(runConfiguration->target()->kit()); project = runConfiguration->target()->project(); } else { outputFormatter = new OutputFormatter(); diff --git a/src/plugins/projectexplorer/target.cpp b/src/plugins/projectexplorer/target.cpp index 70d742e34e..f8f34f9cc1 100644 --- a/src/plugins/projectexplorer/target.cpp +++ b/src/plugins/projectexplorer/target.cpp @@ -452,7 +452,7 @@ void Target::setOverlayIcon(const QIcon &icon) QString Target::overlayIconToolTip() { - IDevice::ConstPtr current = DeviceKitInformation::device(kit()); + IDevice::ConstPtr current = DeviceKitAspect::device(kit()); return current.isNull() ? QString() : formatDeviceInfo(current->deviceInformation()); } @@ -682,7 +682,7 @@ QVariant Target::additionalData(Core::Id id) const void Target::updateDeviceState() { - IDevice::ConstPtr current = DeviceKitInformation::device(kit()); + IDevice::ConstPtr current = DeviceKitAspect::device(kit()); QIcon overlay; static const QIcon disconnected = Icons::DEVICE_DISCONNECTED_INDICATOR_OVERLAY.icon(); diff --git a/src/plugins/projectexplorer/targetsetupwidget.cpp b/src/plugins/projectexplorer/targetsetupwidget.cpp index 88e5b4ab06..0c8d4042c3 100644 --- a/src/plugins/projectexplorer/targetsetupwidget.cpp +++ b/src/plugins/projectexplorer/targetsetupwidget.cpp @@ -73,7 +73,7 @@ TargetSetupWidget::TargetSetupWidget(Kit *k, const QString &projectPath) : auto panel = new Utils::FadingWidget(m_detailsWidget); auto panelLayout = new QHBoxLayout(panel); - m_manageButton = new QPushButton(KitConfigWidget::msgManage()); + m_manageButton = new QPushButton(KitAspectWidget::msgManage()); panelLayout->addWidget(m_manageButton); m_detailsWidget->setToolWidget(panel); diff --git a/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp b/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp index a014d7a758..513a163ed6 100644 --- a/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp +++ b/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp @@ -76,7 +76,7 @@ static QString extractToolchainPrefix(QString *compilerName) static QString targetPlatform(const ProjectExplorer::Abi &abi, const ProjectExplorer::Kit *k) { - const Core::Id device = ProjectExplorer::DeviceTypeKitInformation::deviceTypeId(k); + const Core::Id device = ProjectExplorer::DeviceTypeKitAspect::deviceTypeId(k); switch (abi.os()) { case ProjectExplorer::Abi::WindowsOS: return QLatin1String("windows"); @@ -195,7 +195,7 @@ QVariantMap DefaultPropertyProvider::properties(const ProjectExplorer::Kit *k, { QTC_ASSERT(k, return defaultData); QVariantMap data = autoGeneratedProperties(k, defaultData); - const QVariantMap customProperties = QbsKitInformation::properties(k); + const QVariantMap customProperties = QbsKitAspect::properties(k); for (QVariantMap::ConstIterator it = customProperties.constBegin(); it != customProperties.constEnd(); ++it) { data.insert(it.key(), it.value()); @@ -222,14 +222,14 @@ QVariantMap DefaultPropertyProvider::autoGeneratedProperties(const ProjectExplor { QVariantMap data = defaultData; - const QString sysroot = ProjectExplorer::SysRootKitInformation::sysRoot(k).toUserOutput(); + const QString sysroot = ProjectExplorer::SysRootKitAspect::sysRoot(k).toUserOutput(); if (!sysroot.isEmpty()) data.insert(QLatin1String(QBS_SYSROOT), sysroot); ProjectExplorer::ToolChain *tcC - = ProjectExplorer::ToolChainKitInformation::toolChain(k, ProjectExplorer::Constants::C_LANGUAGE_ID); + = ProjectExplorer::ToolChainKitAspect::toolChain(k, ProjectExplorer::Constants::C_LANGUAGE_ID); ProjectExplorer::ToolChain *tcCxx - = ProjectExplorer::ToolChainKitInformation::toolChain(k, ProjectExplorer::Constants::CXX_LANGUAGE_ID); + = ProjectExplorer::ToolChainKitAspect::toolChain(k, ProjectExplorer::Constants::CXX_LANGUAGE_ID); if (!tcC && !tcCxx) return data; diff --git a/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp b/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp index 21e24cffa8..e501d3b56e 100644 --- a/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp +++ b/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp @@ -399,7 +399,7 @@ QbsBuildConfigurationFactory::QbsBuildConfigurationFactory() setSupportedProjectType(Constants::PROJECT_ID); setSupportedProjectMimeTypeName(Constants::MIME_TYPE); setIssueReporter([](Kit *k, const QString &projectPath, const QString &buildDir) -> QList { - const QtSupport::BaseQtVersion * const version = QtSupport::QtKitInformation::qtVersion(k); + const QtSupport::BaseQtVersion * const version = QtSupport::QtKitAspect::qtVersion(k); return version ? version->reportIssues(projectPath, buildDir) : QList(); }); diff --git a/src/plugins/qbsprojectmanager/qbskitinformation.cpp b/src/plugins/qbsprojectmanager/qbskitinformation.cpp index 95242e5e37..f1bb0de3ac 100644 --- a/src/plugins/qbsprojectmanager/qbskitinformation.cpp +++ b/src/plugins/qbsprojectmanager/qbskitinformation.cpp @@ -42,49 +42,49 @@ using namespace ProjectExplorer; namespace QbsProjectManager { namespace Internal { -class ConfigWidget final : public KitConfigWidget +class AspectWidget final : public KitAspectWidget { Q_OBJECT public: - ConfigWidget(Kit *kit, const KitInformation *kitInfo) - : KitConfigWidget(kit, kitInfo), + AspectWidget(Kit *kit, const KitAspect *kitInfo) + : KitAspectWidget(kit, kitInfo), m_contentLabel(new Utils::ElidingLabel), m_changeButton(new QPushButton(tr("Change..."))) { - connect(m_changeButton, &QPushButton::clicked, this, &ConfigWidget::changeProperties); + connect(m_changeButton, &QPushButton::clicked, this, &AspectWidget::changeProperties); } private: - QString displayName() const override { return QbsKitInformation::displayName(); } + QString displayName() const override { return QbsKitAspect::displayName(); } void makeReadOnly() override { m_changeButton->setEnabled(false); } - void refresh() override { m_contentLabel->setText(QbsKitInformation::representation(kit())); } + void refresh() override { m_contentLabel->setText(QbsKitAspect::representation(kit())); } QWidget *mainWidget() const override { return m_contentLabel; } QWidget *buttonWidget() const override { return m_changeButton; } void changeProperties() { - CustomQbsPropertiesDialog dlg(QbsKitInformation::properties(kit())); + CustomQbsPropertiesDialog dlg(QbsKitAspect::properties(kit())); if (dlg.exec() == QDialog::Accepted) - QbsKitInformation::setProperties(kit(), dlg.properties()); + QbsKitAspect::setProperties(kit(), dlg.properties()); } QLabel * const m_contentLabel; QPushButton * const m_changeButton; }; -QbsKitInformation::QbsKitInformation() +QbsKitAspect::QbsKitAspect() { - setObjectName(QLatin1String("QbsKitInformation")); - setId(QbsKitInformation::id()); + setObjectName(QLatin1String("QbsKitAspect")); + setId(QbsKitAspect::id()); setPriority(22000); } -QString QbsKitInformation::displayName() +QString QbsKitAspect::displayName() { return tr("Additional Qbs Profile Settings"); } -QString QbsKitInformation::representation(const Kit *kit) +QString QbsKitAspect::representation(const Kit *kit) { const QVariantMap props = properties(kit); QString repr; @@ -96,34 +96,34 @@ QString QbsKitInformation::representation(const Kit *kit) return repr; } -QVariantMap QbsKitInformation::properties(const Kit *kit) +QVariantMap QbsKitAspect::properties(const Kit *kit) { QTC_ASSERT(kit, return QVariantMap()); return kit->value(id()).toMap(); } -void QbsKitInformation::setProperties(Kit *kit, const QVariantMap &properties) +void QbsKitAspect::setProperties(Kit *kit, const QVariantMap &properties) { QTC_ASSERT(kit, return); kit->setValue(id(), properties); } -Core::Id QbsKitInformation::id() +Core::Id QbsKitAspect::id() { return "Qbs.KitInformation"; } -QVariant QbsKitInformation::defaultValue(const Kit *) const { return QString(); } -QList QbsKitInformation::validate(const Kit *) const { return QList(); } +QVariant QbsKitAspect::defaultValue(const Kit *) const { return QString(); } +QList QbsKitAspect::validate(const Kit *) const { return QList(); } -KitInformation::ItemList QbsKitInformation::toUserOutput(const Kit *k) const +KitAspect::ItemList QbsKitAspect::toUserOutput(const Kit *k) const { return ItemList({qMakePair(displayName(), representation(k))}); } -KitConfigWidget *QbsKitInformation::createConfigWidget(Kit *k) const +KitAspectWidget *QbsKitAspect::createConfigWidget(Kit *k) const { - return new ConfigWidget(k, this); + return new AspectWidget(k, this); } } // namespace Internal diff --git a/src/plugins/qbsprojectmanager/qbskitinformation.h b/src/plugins/qbsprojectmanager/qbskitinformation.h index ef5a5b9351..cc7235944a 100644 --- a/src/plugins/qbsprojectmanager/qbskitinformation.h +++ b/src/plugins/qbsprojectmanager/qbskitinformation.h @@ -30,12 +30,12 @@ namespace QbsProjectManager { namespace Internal { -class QbsKitInformation final : public ProjectExplorer::KitInformation +class QbsKitAspect final : public ProjectExplorer::KitAspect { Q_OBJECT public: - QbsKitInformation(); + QbsKitAspect(); static QString displayName(); static QString representation(const ProjectExplorer::Kit *kit); @@ -48,7 +48,7 @@ private: QVariant defaultValue(const ProjectExplorer::Kit *) const override; QList validate(const ProjectExplorer::Kit *) const override; ItemList toUserOutput(const ProjectExplorer::Kit *) const override; - ProjectExplorer::KitConfigWidget *createConfigWidget(ProjectExplorer::Kit *) const override; + ProjectExplorer::KitAspectWidget *createConfigWidget(ProjectExplorer::Kit *) const override; }; } // namespace Internal diff --git a/src/plugins/qbsprojectmanager/qbsproject.cpp b/src/plugins/qbsprojectmanager/qbsproject.cpp index 0ea82d6f40..2a2d706db5 100644 --- a/src/plugins/qbsprojectmanager/qbsproject.cpp +++ b/src/plugins/qbsprojectmanager/qbsproject.cpp @@ -693,7 +693,7 @@ void QbsProject::configureAsExampleProject(const QSet &platforms) }; foreach (Kit *k, kits) { const QtSupport::BaseQtVersion * const qtVersion - = QtSupport::QtKitInformation::qtVersion(k); + = QtSupport::QtKitAspect::qtVersion(k); if (!qtVersion || !qtVersionMatchesPlatform(qtVersion)) continue; if (auto factory = BuildConfigurationFactory::find(k, projectFilePath().toString())) diff --git a/src/plugins/qbsprojectmanager/qbsprojectimporter.cpp b/src/plugins/qbsprojectmanager/qbsprojectimporter.cpp index 7e3f37d0a8..72f576f8d1 100644 --- a/src/plugins/qbsprojectmanager/qbsprojectimporter.cpp +++ b/src/plugins/qbsprojectmanager/qbsprojectimporter.cpp @@ -163,14 +163,14 @@ bool QbsProjectImporter::matchKit(void *directoryData, const Kit *k) const const auto * const bgData = static_cast(directoryData); qCDebug(qbsPmLog) << "matching kit" << k->displayName() << "against imported build" << bgData->bgFilePath.toUserOutput(); - if (ToolChainKitInformation::toolChains(k).isEmpty() && bgData->cCompilerPath.isEmpty() + if (ToolChainKitAspect::toolChains(k).isEmpty() && bgData->cCompilerPath.isEmpty() && bgData->cxxCompilerPath.isEmpty()) { return true; } const ToolChain * const cToolchain - = ToolChainKitInformation::toolChain(k, Constants::C_LANGUAGE_ID); + = ToolChainKitAspect::toolChain(k, Constants::C_LANGUAGE_ID); const ToolChain * const cxxToolchain - = ToolChainKitInformation::toolChain(k, Constants::CXX_LANGUAGE_ID); + = ToolChainKitAspect::toolChain(k, Constants::CXX_LANGUAGE_ID); if (!bgData->cCompilerPath.isEmpty()) { if (!cToolchain) return false; @@ -183,14 +183,14 @@ bool QbsProjectImporter::matchKit(void *directoryData, const Kit *k) const if (bgData->cxxCompilerPath != cxxToolchain->compilerCommand()) return false; } - const QtSupport::BaseQtVersion * const qtVersion = QtSupport::QtKitInformation::qtVersion(k); + const QtSupport::BaseQtVersion * const qtVersion = QtSupport::QtKitAspect::qtVersion(k); if (!bgData->qtBinPath.isEmpty()) { if (!qtVersion) return false; if (bgData->qtBinPath != qtVersion->binPath()) return false; } - if (bgData->sysroot != SysRootKitInformation::sysRoot(k)) + if (bgData->sysroot != SysRootKitAspect::sysRoot(k)) return false; qCDebug(qbsPmLog) << "Kit matches"; @@ -215,9 +215,9 @@ Kit *QbsProjectImporter::createKit(void *directoryData) const tcData << findOrCreateToolChains(bgData->cCompilerPath, Constants::C_LANGUAGE_ID); foreach (const ToolChainData &tc, tcData) { if (!tc.tcs.isEmpty()) - ToolChainKitInformation::setToolChain(k, tc.tcs.first()); + ToolChainKitAspect::setToolChain(k, tc.tcs.first()); } - SysRootKitInformation::setSysRoot(k, bgData->sysroot); + SysRootKitAspect::setSysRoot(k, bgData->sysroot); }); } diff --git a/src/plugins/qbsprojectmanager/qbsprojectmanager.cpp b/src/plugins/qbsprojectmanager/qbsprojectmanager.cpp index 978ca57148..8e384b2036 100644 --- a/src/plugins/qbsprojectmanager/qbsprojectmanager.cpp +++ b/src/plugins/qbsprojectmanager/qbsprojectmanager.cpp @@ -166,7 +166,7 @@ void QbsManager::addProfile(const QString &name, const QVariantMap &data) void QbsManager::addQtProfileFromKit(const QString &profileName, const ProjectExplorer::Kit *k) { - const QtSupport::BaseQtVersion * const qt = QtSupport::QtKitInformation::qtVersion(k); + const QtSupport::BaseQtVersion * const qt = QtSupport::QtKitAspect::qtVersion(k); if (!qt) return; diff --git a/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp b/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp index 3087dfc7a9..62d802a388 100644 --- a/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp +++ b/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp @@ -112,7 +112,7 @@ bool QbsProjectManagerPlugin::initialize(const QStringList &arguments, QString * Core::HelpManager::registerDocumentation({Core::HelpManager::documentationPath() + "/qbs.qch"}); ProjectManager::registerProjectType(QmlJSTools::Constants::QBS_MIMETYPE); - KitManager::registerKitInformation(); + KitManager::registerKitAspect(); //menus // Build Menu: diff --git a/src/plugins/qmakeprojectmanager/externaleditors.cpp b/src/plugins/qmakeprojectmanager/externaleditors.cpp index 39de1e8ac7..5924afb6a0 100644 --- a/src/plugins/qmakeprojectmanager/externaleditors.cpp +++ b/src/plugins/qmakeprojectmanager/externaleditors.cpp @@ -172,17 +172,17 @@ bool ExternalQtEditor::getEditorLaunchData(const QString &fileName, data->workingDirectory = project->projectDirectory().toString(); // active kit if (const Target *target = project->activeTarget()) { - qtVersionsToCheck << QtSupport::QtKitInformation::qtVersion(target->kit()); + qtVersionsToCheck << QtSupport::QtKitAspect::qtVersion(target->kit()); } // all kits of project qtVersionsToCheck += Utils::transform(project->targets(), [](Target *t) { - return QTC_GUARD(t) ? QtSupport::QtKitInformation::qtVersion(t->kit()) : nullptr; + return QTC_GUARD(t) ? QtSupport::QtKitAspect::qtVersion(t->kit()) : nullptr; }); } // default kit - qtVersionsToCheck << QtSupport::QtKitInformation::qtVersion(KitManager::defaultKit()); + qtVersionsToCheck << QtSupport::QtKitAspect::qtVersion(KitManager::defaultKit()); // all kits - qtVersionsToCheck += Utils::transform(KitManager::kits(), QtSupport::QtKitInformation::qtVersion); + qtVersionsToCheck += Utils::transform(KitManager::kits(), QtSupport::QtKitAspect::qtVersion); qtVersionsToCheck = Utils::filteredUnique(qtVersionsToCheck); // can still contain nullptr data->binary = findFirstCommand(qtVersionsToCheck, m_commandForQtVersion); // fallback diff --git a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp index 9435155b44..a2a187194c 100644 --- a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp +++ b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp @@ -140,7 +140,7 @@ void QmakeBuildConfiguration::initialize(const BuildInfo &info) cleanSteps->appendStep(new QmakeMakeStep(cleanSteps)); const QmakeExtraBuildInfo qmakeExtra = info.extraInfo.value(); - BaseQtVersion *version = QtKitInformation::qtVersion(target()->kit()); + BaseQtVersion *version = QtKitAspect::qtVersion(target()->kit()); BaseQtVersion::QmakeBuildConfigs config = version->defaultBuildConfig(); if (info.buildType == BuildConfiguration::Debug) @@ -165,7 +165,7 @@ void QmakeBuildConfiguration::initialize(const BuildInfo &info) setBuildDirectory(directory); - if (DeviceTypeKitInformation::deviceTypeId(target()->kit()) + if (DeviceTypeKitAspect::deviceTypeId(target()->kit()) == Android::Constants::ANDROID_DEVICE_TYPE) { buildSteps->appendStep(Android::Constants::ANDROID_PACKAGE_INSTALLATION_STEP_ID); buildSteps->appendStep(Android::Constants::ANDROID_BUILD_APK_ID); @@ -210,13 +210,13 @@ void QmakeBuildConfiguration::kitChanged() void QmakeBuildConfiguration::toolChainUpdated(ToolChain *tc) { - if (ToolChainKitInformation::toolChain(target()->kit(), ProjectExplorer::Constants::CXX_LANGUAGE_ID) == tc) + if (ToolChainKitAspect::toolChain(target()->kit(), ProjectExplorer::Constants::CXX_LANGUAGE_ID) == tc) emitProFileEvaluateNeeded(); } void QmakeBuildConfiguration::qtVersionsChanged(const QList &,const QList &, const QList &changed) { - if (changed.contains(QtKitInformation::qtVersionId(target()->kit()))) + if (changed.contains(QtKitAspect::qtVersionId(target()->kit()))) emitProFileEvaluateNeeded(); } @@ -301,7 +301,7 @@ void QmakeBuildConfiguration::emitQMakeBuildConfigurationChanged() QStringList QmakeBuildConfiguration::configCommandLineArguments() const { QStringList result; - BaseQtVersion *version = QtKitInformation::qtVersion(target()->kit()); + BaseQtVersion *version = QtKitAspect::qtVersion(target()->kit()); BaseQtVersion::QmakeBuildConfigs defaultBuildConfiguration = version ? version->defaultBuildConfig() : BaseQtVersion::QmakeBuildConfigs(BaseQtVersion::DebugBuild | BaseQtVersion::BuildAll); BaseQtVersion::QmakeBuildConfigs userBuildConfiguration = m_qmakeBuildConfiguration; @@ -364,7 +364,7 @@ QmakeBuildConfiguration::MakefileState QmakeBuildConfiguration::compareToImportF return MakefileMissing; } - BaseQtVersion *version = QtKitInformation::qtVersion(target()->kit()); + BaseQtVersion *version = QtKitAspect::qtVersion(target()->kit()); if (!version) { qCDebug(logs) << "**No qt version in kit"; return MakefileForWrongProject; @@ -567,7 +567,7 @@ QmakeBuildConfigurationFactory::QmakeBuildConfigurationFactory() setSupportedProjectType(Constants::QMAKEPROJECT_ID); setSupportedProjectMimeTypeName(Constants::PROFILE_MIMETYPE); setIssueReporter([](Kit *k, const QString &projectPath, const QString &buildDir) { - QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(k); + QtSupport::BaseQtVersion *version = QtSupport::QtKitAspect::qtVersion(k); QList issues; if (version) issues << version->reportIssues(projectPath, buildDir); @@ -594,7 +594,7 @@ BuildInfo QmakeBuildConfigurationFactory::createBuildInfo(const Kit *k, const QString &projectPath, BuildConfiguration::BuildType type) const { - BaseQtVersion *version = QtKitInformation::qtVersion(k); + BaseQtVersion *version = QtKitAspect::qtVersion(k); QmakeExtraBuildInfo extraInfo; BuildInfo info(this); QString suffix; @@ -662,7 +662,7 @@ QList QmakeBuildConfigurationFactory::availableBuilds(const Target *p const QString projectFilePath = parent->project()->projectFilePath().toString(); foreach (BuildConfiguration::BuildType buildType, - availableBuildTypes(QtKitInformation::qtVersion(parent->kit()))) { + availableBuildTypes(QtKitAspect::qtVersion(parent->kit()))) { BuildInfo info = createBuildInfo(parent->kit(), projectFilePath, buildType); info.displayName.clear(); // ask for a name info.buildDirectory.clear(); // This depends on the displayName @@ -675,7 +675,7 @@ QList QmakeBuildConfigurationFactory::availableBuilds(const Target *p QList QmakeBuildConfigurationFactory::availableSetups(const Kit *k, const QString &projectPath) const { QList result; - BaseQtVersion *qtVersion = QtKitInformation::qtVersion(k); + BaseQtVersion *qtVersion = QtKitAspect::qtVersion(k); if (!qtVersion || !qtVersion->isValid()) return result; @@ -704,7 +704,7 @@ void QmakeBuildConfiguration::addToEnvironment(Environment &env) const void QmakeBuildConfiguration::setupBuildEnvironment(Kit *k, Environment &env) { prependCompilerPathToEnvironment(k, env); - const BaseQtVersion *qt = QtKitInformation::qtVersion(k); + const BaseQtVersion *qt = QtKitAspect::qtVersion(k); if (qt && !qt->binPath().isEmpty()) env.prependOrSetPath(qt->binPath().toString()); } @@ -712,11 +712,11 @@ void QmakeBuildConfiguration::setupBuildEnvironment(Kit *k, Environment &env) QmakeBuildConfiguration::LastKitState::LastKitState() = default; QmakeBuildConfiguration::LastKitState::LastKitState(Kit *k) - : m_qtVersion(QtKitInformation::qtVersionId(k)), - m_sysroot(SysRootKitInformation::sysRoot(k).toString()), - m_mkspec(QmakeKitInformation::mkspec(k).toString()) + : m_qtVersion(QtKitAspect::qtVersionId(k)), + m_sysroot(SysRootKitAspect::sysRoot(k).toString()), + m_mkspec(QmakeKitAspect::mkspec(k).toString()) { - ToolChain *tc = ToolChainKitInformation::toolChain(k, ProjectExplorer::Constants::CXX_LANGUAGE_ID); + ToolChain *tc = ToolChainKitAspect::toolChain(k, ProjectExplorer::Constants::CXX_LANGUAGE_ID); m_toolchain = tc ? tc->id() : QByteArray(); } diff --git a/src/plugins/qmakeprojectmanager/qmakekitconfigwidget.cpp b/src/plugins/qmakeprojectmanager/qmakekitconfigwidget.cpp index ba90baf6f1..6675cbca5e 100644 --- a/src/plugins/qmakeprojectmanager/qmakekitconfigwidget.cpp +++ b/src/plugins/qmakeprojectmanager/qmakekitconfigwidget.cpp @@ -34,51 +34,51 @@ namespace QmakeProjectManager { namespace Internal { -QmakeKitConfigWidget::QmakeKitConfigWidget(ProjectExplorer::Kit *k, const ProjectExplorer::KitInformation *ki) : - ProjectExplorer::KitConfigWidget(k, ki), +QmakeKitAspectWidget::QmakeKitAspectWidget(ProjectExplorer::Kit *k, const ProjectExplorer::KitAspect *ki) : + ProjectExplorer::KitAspectWidget(k, ki), m_lineEdit(new QLineEdit) { refresh(); // set up everything according to kit m_lineEdit->setToolTip(toolTip()); - connect(m_lineEdit, &QLineEdit::textEdited, this, &QmakeKitConfigWidget::mkspecWasChanged); + connect(m_lineEdit, &QLineEdit::textEdited, this, &QmakeKitAspectWidget::mkspecWasChanged); } -QmakeKitConfigWidget::~QmakeKitConfigWidget() +QmakeKitAspectWidget::~QmakeKitAspectWidget() { delete m_lineEdit; } -QWidget *QmakeKitConfigWidget::mainWidget() const +QWidget *QmakeKitAspectWidget::mainWidget() const { return m_lineEdit; } -QString QmakeKitConfigWidget::displayName() const +QString QmakeKitAspectWidget::displayName() const { return tr("Qt mkspec"); } -QString QmakeKitConfigWidget::toolTip() const +QString QmakeKitAspectWidget::toolTip() const { return tr("The mkspec to use when building the project with qmake.
" "This setting is ignored when using other build systems."); } -void QmakeKitConfigWidget::makeReadOnly() +void QmakeKitAspectWidget::makeReadOnly() { m_lineEdit->setEnabled(false); } -void QmakeKitConfigWidget::refresh() +void QmakeKitAspectWidget::refresh() { if (!m_ignoreChange) - m_lineEdit->setText(QmakeKitInformation::mkspec(m_kit).toUserOutput()); + m_lineEdit->setText(QmakeKitAspect::mkspec(m_kit).toUserOutput()); } -void QmakeKitConfigWidget::mkspecWasChanged(const QString &text) +void QmakeKitAspectWidget::mkspecWasChanged(const QString &text) { m_ignoreChange = true; - QmakeKitInformation::setMkspec(m_kit, Utils::FileName::fromString(text)); + QmakeKitAspect::setMkspec(m_kit, Utils::FileName::fromString(text)); m_ignoreChange = false; } diff --git a/src/plugins/qmakeprojectmanager/qmakekitconfigwidget.h b/src/plugins/qmakeprojectmanager/qmakekitconfigwidget.h index f1faa861f1..ffae1f7b91 100644 --- a/src/plugins/qmakeprojectmanager/qmakekitconfigwidget.h +++ b/src/plugins/qmakeprojectmanager/qmakekitconfigwidget.h @@ -34,13 +34,13 @@ QT_END_NAMESPACE namespace QmakeProjectManager { namespace Internal { -class QmakeKitConfigWidget : public ProjectExplorer::KitConfigWidget +class QmakeKitAspectWidget : public ProjectExplorer::KitAspectWidget { Q_OBJECT public: - QmakeKitConfigWidget(ProjectExplorer::Kit *k, const ProjectExplorer::KitInformation *ki); - ~QmakeKitConfigWidget() override; + QmakeKitAspectWidget(ProjectExplorer::Kit *k, const ProjectExplorer::KitAspect *ki); + ~QmakeKitAspectWidget() override; QWidget *mainWidget() const override; QString displayName() const override; diff --git a/src/plugins/qmakeprojectmanager/qmakekitinformation.cpp b/src/plugins/qmakeprojectmanager/qmakekitinformation.cpp index 94f3efcbe7..f8a35e1c36 100644 --- a/src/plugins/qmakeprojectmanager/qmakekitinformation.cpp +++ b/src/plugins/qmakeprojectmanager/qmakekitinformation.cpp @@ -42,25 +42,25 @@ using namespace Utils; namespace QmakeProjectManager { -QmakeKitInformation::QmakeKitInformation() +QmakeKitAspect::QmakeKitAspect() { - setObjectName(QLatin1String("QmakeKitInformation")); - setId(QmakeKitInformation::id()); + setObjectName(QLatin1String("QmakeKitAspect")); + setId(QmakeKitAspect::id()); setPriority(24000); } -QVariant QmakeKitInformation::defaultValue(const Kit *k) const +QVariant QmakeKitAspect::defaultValue(const Kit *k) const { Q_UNUSED(k); return QString(); } -QList QmakeKitInformation::validate(const Kit *k) const +QList QmakeKitAspect::validate(const Kit *k) const { QList result; - QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(k); + QtSupport::BaseQtVersion *version = QtSupport::QtKitAspect::qtVersion(k); - FileName mkspec = QmakeKitInformation::mkspec(k); + FileName mkspec = QmakeKitAspect::mkspec(k); if (!version && !mkspec.isEmpty()) result << Task(Task::Warning, tr("No Qt version set, so mkspec is ignored."), FileName(), -1, ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM); @@ -70,9 +70,9 @@ QList QmakeKitInformation::validate(const Kit *k) const return result; } -void QmakeKitInformation::setup(Kit *k) +void QmakeKitAspect::setup(Kit *k) { - QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(k); + QtSupport::BaseQtVersion *version = QtSupport::QtKitAspect::qtVersion(k); if (!version) return; @@ -80,11 +80,11 @@ void QmakeKitInformation::setup(Kit *k) if (version->type() == "Boot2Qt.QtVersionType" || version->type() == "Qdb.EmbeddedLinuxQt") return; - FileName spec = QmakeKitInformation::mkspec(k); + FileName spec = QmakeKitAspect::mkspec(k); if (spec.isEmpty()) spec = version->mkspec(); - ToolChain *tc = ToolChainKitInformation::toolChain(k, ProjectExplorer::Constants::CXX_LANGUAGE_ID); + ToolChain *tc = ToolChainKitAspect::toolChain(k, ProjectExplorer::Constants::CXX_LANGUAGE_ID); if (!tc || (!tc->suggestedMkspecList().empty() && !tc->suggestedMkspecList().contains(spec))) { const QList possibleTcs = ToolChainManager::toolChains( @@ -110,42 +110,42 @@ void QmakeKitInformation::setup(Kit *k) bestTc = goodTcs.isEmpty() ? possibleTcs.last() : goodTcs.last(); } if (bestTc) - ToolChainKitInformation::setAllToolChainsToMatch(k, bestTc); + ToolChainKitAspect::setAllToolChainsToMatch(k, bestTc); } } } -KitConfigWidget *QmakeKitInformation::createConfigWidget(Kit *k) const +KitAspectWidget *QmakeKitAspect::createConfigWidget(Kit *k) const { - return new Internal::QmakeKitConfigWidget(k, this); + return new Internal::QmakeKitAspectWidget(k, this); } -KitInformation::ItemList QmakeKitInformation::toUserOutput(const Kit *k) const +KitAspect::ItemList QmakeKitAspect::toUserOutput(const Kit *k) const { return ItemList() << qMakePair(tr("mkspec"), mkspec(k).toUserOutput()); } -void QmakeKitInformation::addToMacroExpander(Kit *kit, MacroExpander *expander) const +void QmakeKitAspect::addToMacroExpander(Kit *kit, MacroExpander *expander) const { expander->registerVariable("Qmake:mkspec", tr("Mkspec configured for qmake by the Kit."), [kit]() -> QString { - return QmakeKitInformation::mkspec(kit).toUserOutput(); + return QmakeKitAspect::mkspec(kit).toUserOutput(); }); } -Core::Id QmakeKitInformation::id() +Core::Id QmakeKitAspect::id() { return Constants::KIT_INFORMATION_ID; } -FileName QmakeKitInformation::mkspec(const Kit *k) +FileName QmakeKitAspect::mkspec(const Kit *k) { if (!k) return FileName(); - return FileName::fromString(k->value(QmakeKitInformation::id()).toString()); + return FileName::fromString(k->value(QmakeKitAspect::id()).toString()); } -FileName QmakeKitInformation::effectiveMkspec(const Kit *k) +FileName QmakeKitAspect::effectiveMkspec(const Kit *k) { if (!k) return FileName(); @@ -155,19 +155,19 @@ FileName QmakeKitInformation::effectiveMkspec(const Kit *k) return spec; } -void QmakeKitInformation::setMkspec(Kit *k, const FileName &fn) +void QmakeKitAspect::setMkspec(Kit *k, const FileName &fn) { QTC_ASSERT(k, return); - k->setValue(QmakeKitInformation::id(), fn == defaultMkspec(k) ? QString() : fn.toString()); + k->setValue(QmakeKitAspect::id(), fn == defaultMkspec(k) ? QString() : fn.toString()); } -FileName QmakeKitInformation::defaultMkspec(const Kit *k) +FileName QmakeKitAspect::defaultMkspec(const Kit *k) { - QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(k); + QtSupport::BaseQtVersion *version = QtSupport::QtKitAspect::qtVersion(k); if (!version) // No version, so no qmake return FileName(); - return version->mkspecFor(ToolChainKitInformation::toolChain(k, + return version->mkspecFor(ToolChainKitAspect::toolChain(k, ProjectExplorer::Constants::CXX_LANGUAGE_ID)); } diff --git a/src/plugins/qmakeprojectmanager/qmakekitinformation.h b/src/plugins/qmakeprojectmanager/qmakekitinformation.h index 686ece1246..f030c01dc9 100644 --- a/src/plugins/qmakeprojectmanager/qmakekitinformation.h +++ b/src/plugins/qmakeprojectmanager/qmakekitinformation.h @@ -31,19 +31,19 @@ namespace QmakeProjectManager { -class QMAKEPROJECTMANAGER_EXPORT QmakeKitInformation : public ProjectExplorer::KitInformation +class QMAKEPROJECTMANAGER_EXPORT QmakeKitAspect : public ProjectExplorer::KitAspect { Q_OBJECT public: - QmakeKitInformation(); + QmakeKitAspect(); QVariant defaultValue(const ProjectExplorer::Kit *k) const override; QList validate(const ProjectExplorer::Kit *k) const override; void setup(ProjectExplorer::Kit *k) override; - ProjectExplorer::KitConfigWidget *createConfigWidget(ProjectExplorer::Kit *k) const override; + ProjectExplorer::KitAspectWidget *createConfigWidget(ProjectExplorer::Kit *k) const override; ItemList toUserOutput(const ProjectExplorer::Kit *k) const override; diff --git a/src/plugins/qmakeprojectmanager/qmakemakestep.cpp b/src/plugins/qmakeprojectmanager/qmakemakestep.cpp index be03c1affc..86bd85359a 100644 --- a/src/plugins/qmakeprojectmanager/qmakemakestep.cpp +++ b/src/plugins/qmakeprojectmanager/qmakemakestep.cpp @@ -156,7 +156,7 @@ bool QmakeMakeStep::init() pp->resolveAll(); setOutputParser(new ProjectExplorer::GnuMakeParser()); - ToolChain *tc = ToolChainKitInformation::toolChain(target()->kit(), + ToolChain *tc = ToolChainKitAspect::toolChain(target()->kit(), ProjectExplorer::Constants::CXX_LANGUAGE_ID); if (tc && tc->targetAbi().os() == Abi::DarwinOS) appendOutputParser(new XcodebuildParser); diff --git a/src/plugins/qmakeprojectmanager/qmakenodetreebuilder.cpp b/src/plugins/qmakeprojectmanager/qmakenodetreebuilder.cpp index b4e3b28abb..4953a65946 100644 --- a/src/plugins/qmakeprojectmanager/qmakenodetreebuilder.cpp +++ b/src/plugins/qmakeprojectmanager/qmakenodetreebuilder.cpp @@ -201,7 +201,7 @@ std::unique_ptr QmakeNodeTreeBuilder::buildTree(QmakeProject * // Remove qmake implementation details that litter up the project data: Target *t = project->activeTarget(); Kit *k = t ? t->kit() : KitManager::defaultKit(); - BaseQtVersion *qt = k ? QtKitInformation::qtVersion(k) : nullptr; + BaseQtVersion *qt = k ? QtKitAspect::qtVersion(k) : nullptr; const FileNameList toExclude = qt ? qt->directoriesToIgnoreInProjectTree() : FileNameList(); diff --git a/src/plugins/qmakeprojectmanager/qmakeproject.cpp b/src/plugins/qmakeprojectmanager/qmakeproject.cpp index 6e92cf45d2..25352190d8 100644 --- a/src/plugins/qmakeprojectmanager/qmakeproject.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeproject.cpp @@ -582,11 +582,11 @@ void QmakeProject::buildFinished(bool success) QList QmakeProject::projectIssues(const Kit *k) const { QList result = Project::projectIssues(k); - if (!QtSupport::QtKitInformation::qtVersion(k)) + if (!QtSupport::QtKitAspect::qtVersion(k)) result.append(createProjectTask(Task::TaskType::Error, tr("No Qt version set in kit."))); - else if (!QtSupport::QtKitInformation::qtVersion(k)->isValid()) + else if (!QtSupport::QtKitAspect::qtVersion(k)->isValid()) result.append(createProjectTask(Task::TaskType::Error, tr("Qt version is invalid."))); - if (!ToolChainKitInformation::toolChain(k, ProjectExplorer::Constants::CXX_LANGUAGE_ID)) + if (!ToolChainKitAspect::toolChain(k, ProjectExplorer::Constants::CXX_LANGUAGE_ID)) result.append(createProjectTask(Task::TaskType::Error, tr("No C++ compiler set in kit."))); return result; } @@ -665,8 +665,8 @@ QtSupport::ProFileReader *QmakeProject::createProFileReader(const QmakeProFile * k->addToEnvironment(env); } - QtSupport::BaseQtVersion *qtVersion = QtSupport::QtKitInformation::qtVersion(k); - m_qmakeSysroot = SysRootKitInformation::sysRoot(k).toString(); + QtSupport::BaseQtVersion *qtVersion = QtSupport::QtKitAspect::qtVersion(k); + m_qmakeSysroot = SysRootKitAspect::sysRoot(k).toString(); if (qtVersion && qtVersion->isValid()) { m_qmakeGlobals->qmake_abslocation = QDir::cleanPath(qtVersion->qmakeCommand().toString()); @@ -962,7 +962,7 @@ void QmakeProject::configureAsExampleProject(const QSet &platforms) QList infoList; QList kits = KitManager::kits(); foreach (Kit *k, kits) { - QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(k); + QtSupport::BaseQtVersion *version = QtSupport::QtKitAspect::qtVersion(k); if (!version || (!platforms.isEmpty() && !Utils::contains(version->targetDeviceTypes(), [platforms](Core::Id i) { return platforms.contains(i); }))) @@ -1061,7 +1061,7 @@ void QmakeProject::updateBuildSystemData() libraryPaths.append(dir); } } - QtSupport::BaseQtVersion *qtVersion = QtSupport::QtKitInformation::qtVersion(target->kit()); + QtSupport::BaseQtVersion *qtVersion = QtSupport::QtKitAspect::qtVersion(target->kit()); if (qtVersion) libraryPaths.append(qtVersion->librarySearchPath().toString()); @@ -1137,7 +1137,7 @@ void QmakeProject::collectLibraryData(const QmakeProFile *file, DeploymentData & if (targetPath.isEmpty()) return; const Kit * const kit = activeTarget()->kit(); - const ToolChain * const toolchain = ToolChainKitInformation::toolChain(kit, ProjectExplorer::Constants::CXX_LANGUAGE_ID); + const ToolChain * const toolchain = ToolChainKitAspect::toolChain(kit, ProjectExplorer::Constants::CXX_LANGUAGE_ID); if (!toolchain) return; @@ -1224,7 +1224,7 @@ void QmakeProject::collectLibraryData(const QmakeProFile *file, DeploymentData & bool QmakeProject::matchesKit(const Kit *kit) { FileName filePath = projectFilePath(); - QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(kit); + QtSupport::BaseQtVersion *version = QtSupport::QtKitAspect::qtVersion(kit); return QtSupport::QtVersionManager::version([&filePath, version](const QtSupport::BaseQtVersion *v) { return v->isValid() && v->isSubProject(filePath) && v == version; @@ -1299,16 +1299,16 @@ void QmakeProject::warnOnToolChainMismatch(const QmakeProFile *pro) const if (!bc) return; - testToolChain(ToolChainKitInformation::toolChain(t->kit(), ProjectExplorer::Constants::C_LANGUAGE_ID), + testToolChain(ToolChainKitAspect::toolChain(t->kit(), ProjectExplorer::Constants::C_LANGUAGE_ID), getFullPathOf(pro, Variable::QmakeCc, bc)); - testToolChain(ToolChainKitInformation::toolChain(t->kit(), ProjectExplorer::Constants::CXX_LANGUAGE_ID), + testToolChain(ToolChainKitAspect::toolChain(t->kit(), ProjectExplorer::Constants::CXX_LANGUAGE_ID), getFullPathOf(pro, Variable::QmakeCxx, bc)); } QString QmakeProject::executableFor(const QmakeProFileNode *node) { const Kit *const kit = activeTarget() ? activeTarget()->kit() : nullptr; - const ToolChain *const tc = ToolChainKitInformation::toolChain(kit, ProjectExplorer::Constants::CXX_LANGUAGE_ID); + const ToolChain *const tc = ToolChainKitAspect::toolChain(kit, ProjectExplorer::Constants::CXX_LANGUAGE_ID); if (!tc) return QString(); diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectconfigwidget.cpp b/src/plugins/qmakeprojectmanager/qmakeprojectconfigwidget.cpp index 241bd5a4f5..17dc6d578b 100644 --- a/src/plugins/qmakeprojectmanager/qmakeprojectconfigwidget.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeprojectconfigwidget.cpp @@ -210,7 +210,7 @@ void QmakeProjectConfigWidget::updateProblemLabel() const QString proFileName = m_buildConfiguration->target()->project()->projectFilePath().toString(); // Check for Qt version: - QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(k); + QtSupport::BaseQtVersion *version = QtSupport::QtKitAspect::qtVersion(k); if (!version) { setProblemLabel(tr("This kit cannot build this project since it does not define a Qt version.")); return; diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectimporter.cpp b/src/plugins/qmakeprojectmanager/qmakeprojectimporter.cpp index c97bab5a38..b5a29ba620 100644 --- a/src/plugins/qmakeprojectmanager/qmakeprojectimporter.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeprojectimporter.cpp @@ -203,9 +203,9 @@ bool QmakeProjectImporter::matchKit(void *directoryData, const Kit *k) const auto *data = static_cast(directoryData); const QLoggingCategory &logs = MakeFileParse::logging(); - BaseQtVersion *kitVersion = QtKitInformation::qtVersion(k); - FileName kitSpec = QmakeKitInformation::mkspec(k); - ToolChain *tc = ToolChainKitInformation::toolChain(k, ProjectExplorer::Constants::CXX_LANGUAGE_ID); + BaseQtVersion *kitVersion = QtKitAspect::qtVersion(k); + FileName kitSpec = QmakeKitAspect::mkspec(k); + ToolChain *tc = ToolChainKitAspect::toolChain(k, ProjectExplorer::Constants::CXX_LANGUAGE_ID); if (kitSpec.isEmpty() && kitVersion) kitSpec = kitVersion->mkspecFor(tc); QMakeStepConfig::TargetArchConfig kitTargetArch = QMakeStepConfig::NoArch; @@ -288,9 +288,9 @@ Kit *QmakeProjectImporter::createTemporaryKit(const QtProjectImporter::QtVersion Q_UNUSED(osType); // TODO use this to select the right toolchain? return QtProjectImporter::createTemporaryKit(data, [&data, parsedSpec, archConfig](Kit *k) -> void { - ToolChainKitInformation::setToolChain(k, preferredToolChain(data.qt, parsedSpec, archConfig)); + ToolChainKitAspect::setToolChain(k, preferredToolChain(data.qt, parsedSpec, archConfig)); if (parsedSpec != data.qt->mkspec()) - QmakeKitInformation::setMkspec(k, parsedSpec); + QmakeKitAspect::setMkspec(k, parsedSpec); }); } diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp b/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp index 46ffcec047..feeb03f2b9 100644 --- a/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp @@ -140,7 +140,7 @@ bool QmakeProjectManagerPlugin::initialize(const QStringList &arguments, QString //create and register objects ProjectManager::registerProjectType(QmakeProjectManager::Constants::PROFILE_MIMETYPE); - ProjectExplorer::KitManager::registerKitInformation(); + ProjectExplorer::KitManager::registerKitAspect(); IWizardFactory::registerFactoryCreator([] { return QList { diff --git a/src/plugins/qmakeprojectmanager/qmakestep.cpp b/src/plugins/qmakeprojectmanager/qmakestep.cpp index c9bdbb96bf..d537ace366 100644 --- a/src/plugins/qmakeprojectmanager/qmakestep.cpp +++ b/src/plugins/qmakeprojectmanager/qmakestep.cpp @@ -136,18 +136,18 @@ QMakeStepConfig QMakeStep::deducedArguments() const ProjectExplorer::Kit *kit = target()->kit(); QMakeStepConfig config; ProjectExplorer::ToolChain *tc - = ProjectExplorer::ToolChainKitInformation::toolChain(kit, ProjectExplorer::Constants::CXX_LANGUAGE_ID); + = ProjectExplorer::ToolChainKitAspect::toolChain(kit, ProjectExplorer::Constants::CXX_LANGUAGE_ID); ProjectExplorer::Abi targetAbi; if (tc) { targetAbi = tc->targetAbi(); if (HostOsInfo::isWindowsHost() && tc->typeId() == ProjectExplorer::Constants::CLANG_TOOLCHAIN_TYPEID) { - config.sysRoot = ProjectExplorer::SysRootKitInformation::sysRoot(kit).toString(); + config.sysRoot = ProjectExplorer::SysRootKitAspect::sysRoot(kit).toString(); config.targetTriple = tc->originalTargetTriple(); } } - BaseQtVersion *version = QtKitInformation::qtVersion(target()->kit()); + BaseQtVersion *version = QtKitAspect::qtVersion(target()->kit()); config.archConfig = QMakeStepConfig::targetArchFor(targetAbi, version); config.osType = QMakeStepConfig::osTypeFor(targetAbi, version); @@ -166,7 +166,7 @@ QMakeStepConfig QMakeStep::deducedArguments() const bool QMakeStep::init() { QmakeBuildConfiguration *qmakeBc = qmakeBuildConfiguration(); - const BaseQtVersion *qtVersion = QtKitInformation::qtVersion(target()->kit()); + const BaseQtVersion *qtVersion = QtKitAspect::qtVersion(target()->kit()); if (!qtVersion) { emit addOutput(tr("No Qt version configured."), BuildStep::OutputFormat::ErrorMessage); @@ -452,7 +452,7 @@ QString QMakeStep::makeArguments(const QString &makefile) const QString QMakeStep::effectiveQMakeCall() const { - BaseQtVersion *qtVersion = QtKitInformation::qtVersion(target()->kit()); + BaseQtVersion *qtVersion = QtKitAspect::qtVersion(target()->kit()); QString qmake = qtVersion ? qtVersion->qmakeCommand().toUserOutput() : QString(); if (qmake.isEmpty()) qmake = tr(""); @@ -474,7 +474,7 @@ QString QMakeStep::effectiveQMakeCall() const QStringList QMakeStep::parserArguments() { QStringList result; - BaseQtVersion *qt = QtKitInformation::qtVersion(target()->kit()); + BaseQtVersion *qt = QtKitAspect::qtVersion(target()->kit()); QTC_ASSERT(qt, return QStringList()); for (QtcProcess::ConstArgIterator ait(allArguments(qt, ArgumentFlag::Expand)); ait.next(); ) { if (ait.isSimple()) @@ -499,7 +499,7 @@ FileName QMakeStep::mkspec() const } } - return QmakeProjectManager::QmakeKitInformation::effectiveMkspec(target()->kit()); + return QmakeProjectManager::QmakeKitAspect::effectiveMkspec(target()->kit()); } QVariantMap QMakeStep::toMap() const @@ -743,7 +743,7 @@ void QMakeStepConfigWidget::separateDebugInfoChecked(bool checked) void QMakeStepConfigWidget::updateSummaryLabel() { - BaseQtVersion *qtVersion = QtKitInformation::qtVersion(m_step->target()->kit()); + BaseQtVersion *qtVersion = QtKitAspect::qtVersion(m_step->target()->kit()); if (!qtVersion) { setSummaryText(tr("qmake: No Qt version set. Cannot run qmake.")); return; diff --git a/src/plugins/qmakeprojectmanager/wizards/qtwizard.cpp b/src/plugins/qmakeprojectmanager/wizards/qtwizard.cpp index 9ed1939f1a..d22d8da89d 100644 --- a/src/plugins/qmakeprojectmanager/wizards/qtwizard.cpp +++ b/src/plugins/qmakeprojectmanager/wizards/qtwizard.cpp @@ -196,11 +196,11 @@ int BaseQmakeProjectWizardDialog::addTargetSetupPage(int id) const Core::Id platform = selectedPlatform(); QSet features = {QtSupport::Constants::FEATURE_DESKTOP}; if (!platform.isValid()) - m_targetSetupPage->setPreferredKitPredicate(QtKitInformation::qtVersionPredicate(features)); + m_targetSetupPage->setPreferredKitPredicate(QtKitAspect::qtVersionPredicate(features)); else - m_targetSetupPage->setPreferredKitPredicate(QtKitInformation::platformPredicate(platform)); + m_targetSetupPage->setPreferredKitPredicate(QtKitAspect::platformPredicate(platform)); - m_targetSetupPage->setRequiredKitPredicate(QtKitInformation::qtVersionPredicate(requiredFeatures())); + m_targetSetupPage->setRequiredKitPredicate(QtKitAspect::qtVersionPredicate(requiredFeatures())); resize(900, 450); if (id >= 0) @@ -262,7 +262,7 @@ bool BaseQmakeProjectWizardDialog::isQtPlatformSelected(Core::Id platform) const { QList selectedKitList = selectedKits(); - return Utils::contains(KitManager::kits(QtKitInformation::platformPredicate(platform)), + return Utils::contains(KitManager::kits(QtKitAspect::platformPredicate(platform)), [selectedKitList](const Kit *k) { return selectedKitList.contains(k->id()); }); } diff --git a/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp b/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp index 8ab932e8b1..4f5be1a03d 100644 --- a/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp +++ b/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp @@ -90,7 +90,7 @@ QHash PuppetCreator::m_qml2PuppetForKitPupp QByteArray PuppetCreator::qtHash() const { - QtSupport::BaseQtVersion *currentQtVersion = QtSupport::QtKitInformation::qtVersion(m_kit); + QtSupport::BaseQtVersion *currentQtVersion = QtSupport::QtKitAspect::qtVersion(m_kit); if (currentQtVersion) { return QCryptographicHash::hash(currentQtVersion->qmakeProperty("QT_INSTALL_DATA").toUtf8(), QCryptographicHash::Sha1) @@ -102,7 +102,7 @@ QByteArray PuppetCreator::qtHash() const QDateTime PuppetCreator::qtLastModified() const { - QtSupport::BaseQtVersion *currentQtVersion = QtSupport::QtKitInformation::qtVersion(m_kit); + QtSupport::BaseQtVersion *currentQtVersion = QtSupport::QtKitAspect::qtVersion(m_kit); if (currentQtVersion) return QFileInfo(currentQtVersion->qmakeProperty("QT_INSTALL_LIBS")).lastModified(); @@ -419,7 +419,7 @@ QProcessEnvironment PuppetCreator::processEnvironment() const Utils::Environment environment = Utils::Environment::systemEnvironment(); if (!useOnlyFallbackPuppet()) m_kit->addToEnvironment(environment); - const QtSupport::BaseQtVersion *qt = QtSupport::QtKitInformation::qtVersion(m_kit); + const QtSupport::BaseQtVersion *qt = QtSupport::QtKitAspect::qtVersion(m_kit); if (QTC_GUARD(qt)) { // Kits without a Qt version should not have a puppet! // Update PATH to include QT_HOST_BINS const Utils::FileName qtBinPath = qt->binPath(); @@ -497,7 +497,7 @@ QString PuppetCreator::buildCommand() const m_kit->addToEnvironment(environment); ProjectExplorer::ToolChain *toolChain - = ProjectExplorer::ToolChainKitInformation::toolChain(m_kit, + = ProjectExplorer::ToolChainKitAspect::toolChain(m_kit, ProjectExplorer::Constants::CXX_LANGUAGE_ID); if (toolChain) @@ -508,7 +508,7 @@ QString PuppetCreator::buildCommand() const QString PuppetCreator::qmakeCommand() const { - QtSupport::BaseQtVersion *currentQtVersion = QtSupport::QtKitInformation::qtVersion(m_kit); + QtSupport::BaseQtVersion *currentQtVersion = QtSupport::QtKitAspect::qtVersion(m_kit); if (currentQtVersion) return currentQtVersion->qmakeCommand().toString(); @@ -595,7 +595,7 @@ static bool nonEarlyQt5Version(const QtSupport::QtVersionNumber ¤tQtVersio bool PuppetCreator::qtIsSupported() const { - QtSupport::BaseQtVersion *currentQtVersion = QtSupport::QtKitInformation::qtVersion(m_kit); + QtSupport::BaseQtVersion *currentQtVersion = QtSupport::QtKitAspect::qtVersion(m_kit); return currentQtVersion && currentQtVersion->isValid() diff --git a/src/plugins/qmljstools/qmljsbundleprovider.cpp b/src/plugins/qmljstools/qmljsbundleprovider.cpp index 7fb0a03a26..176d66b33d 100644 --- a/src/plugins/qmljstools/qmljsbundleprovider.cpp +++ b/src/plugins/qmljstools/qmljsbundleprovider.cpp @@ -98,7 +98,7 @@ void BasicBundleProvider::mergeBundlesForKit(ProjectExplorer::Kit *kit bundles.mergeBundleForLanguage(Dialect::QmlTypeInfo, defaultQmltypesBundle()); bundles.mergeBundleForLanguage(Dialect::QmlProject, defaultQmlprojectBundle()); - QtSupport::BaseQtVersion *qtVersion = QtSupport::QtKitInformation::qtVersion(kit); + QtSupport::BaseQtVersion *qtVersion = QtSupport::QtKitAspect::qtVersion(kit); if (!qtVersion) { QmlBundle b2(defaultQt5QtQuick2Bundle()); bundles.mergeBundleForLanguage(Dialect::Qml, b2); diff --git a/src/plugins/qmljstools/qmljsmodelmanager.cpp b/src/plugins/qmljstools/qmljsmodelmanager.cpp index d328886f9e..af47d2eef3 100644 --- a/src/plugins/qmljstools/qmljsmodelmanager.cpp +++ b/src/plugins/qmljstools/qmljsmodelmanager.cpp @@ -98,7 +98,7 @@ ModelManagerInterface::ProjectInfo ModelManager::defaultProjectInfoForProject( activeTarget = project->activeTarget(); } Kit *activeKit = activeTarget ? activeTarget->kit() : KitManager::defaultKit(); - QtSupport::BaseQtVersion *qtVersion = QtSupport::QtKitInformation::qtVersion(activeKit); + QtSupport::BaseQtVersion *qtVersion = QtSupport::QtKitAspect::qtVersion(activeKit); bool preferDebugDump = false; bool setPreferDump = false; diff --git a/src/plugins/qmlpreview/qmlpreviewfileontargetfinder.cpp b/src/plugins/qmlpreview/qmlpreviewfileontargetfinder.cpp index 95ed107fea..f08f3aeaaa 100644 --- a/src/plugins/qmlpreview/qmlpreviewfileontargetfinder.cpp +++ b/src/plugins/qmlpreview/qmlpreviewfileontargetfinder.cpp @@ -101,7 +101,7 @@ QString QmlPreviewFileOnTargetFinder::findPath(const QString &filePath, bool *su if (success) { // On desktop, if there is no "remote" path, then the application will load the local path. - *success = ProjectExplorer::DeviceTypeKitInformation::deviceTypeId(m_target->kit()) + *success = ProjectExplorer::DeviceTypeKitAspect::deviceTypeId(m_target->kit()) == ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE; } return filePath; diff --git a/src/plugins/qmlpreview/qmlpreviewplugin.cpp b/src/plugins/qmlpreview/qmlpreviewplugin.cpp index b60996ae1f..a1c497756a 100644 --- a/src/plugins/qmlpreview/qmlpreviewplugin.cpp +++ b/src/plugins/qmlpreview/qmlpreviewplugin.cpp @@ -111,7 +111,7 @@ bool QmlPreviewPlugin::initialize(const QStringList &arguments, QString *errorSt auto constraint = [](RunConfiguration *runConfiguration) { Target *target = runConfiguration ? runConfiguration->target() : nullptr; Kit *kit = target ? target->kit() : nullptr; - return DeviceTypeKitInformation::deviceTypeId(kit) == Constants::DESKTOP_DEVICE_TYPE; + return DeviceTypeKitAspect::deviceTypeId(kit) == Constants::DESKTOP_DEVICE_TYPE; }; RunControl::registerWorker(Constants::QML_PREVIEW_RUN_MODE, constraint); diff --git a/src/plugins/qmlprofiler/qmlprofilerattachdialog.cpp b/src/plugins/qmlprofiler/qmlprofilerattachdialog.cpp index 392bf15927..43b1d500a0 100644 --- a/src/plugins/qmlprofiler/qmlprofilerattachdialog.cpp +++ b/src/plugins/qmlprofiler/qmlprofilerattachdialog.cpp @@ -56,7 +56,7 @@ QmlProfilerAttachDialog::QmlProfilerAttachDialog(QWidget *parent) : d->kitChooser = new KitChooser(this); d->kitChooser->setKitPredicate([](const Kit *kit) { - return DeviceKitInformation::device(kit) != nullptr; + return DeviceKitAspect::device(kit) != nullptr; }); d->kitChooser->populate(); diff --git a/src/plugins/qmlprofiler/qmlprofilerplugin.cpp b/src/plugins/qmlprofiler/qmlprofilerplugin.cpp index e3a2a1aa3f..92a4fe0a44 100644 --- a/src/plugins/qmlprofiler/qmlprofilerplugin.cpp +++ b/src/plugins/qmlprofiler/qmlprofilerplugin.cpp @@ -105,7 +105,7 @@ void QmlProfilerPlugin::extensionsInitialized() auto constraint = [](RunConfiguration *runConfiguration) { Target *target = runConfiguration ? runConfiguration->target() : nullptr; Kit *kit = target ? target->kit() : nullptr; - return DeviceTypeKitInformation::deviceTypeId(kit) + return DeviceTypeKitAspect::deviceTypeId(kit) == ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE; }; diff --git a/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp b/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp index e1e476df36..09f3945cbe 100644 --- a/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp +++ b/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp @@ -206,7 +206,7 @@ static QUrl localServerUrl(RunControl *runControl) QUrl serverUrl; RunConfiguration *runConfiguration = runControl->runConfiguration(); Kit *kit = runConfiguration->target()->kit(); - const QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(kit); + const QtSupport::BaseQtVersion *version = QtSupport::QtKitAspect::qtVersion(kit); if (version) { if (version->qtVersion() >= QtSupport::QtVersionNumber(5, 6, 0)) serverUrl = Utils::urlFromLocalSocket(); diff --git a/src/plugins/qmlprofiler/qmlprofilertool.cpp b/src/plugins/qmlprofiler/qmlprofilertool.cpp index 1196429d7d..9669ed0b2c 100644 --- a/src/plugins/qmlprofiler/qmlprofilertool.cpp +++ b/src/plugins/qmlprofiler/qmlprofilertool.cpp @@ -545,7 +545,7 @@ ProjectExplorer::RunControl *QmlProfilerTool::attachToWaitingApplication() QUrl serverUrl; - IDevice::ConstPtr device = DeviceKitInformation::device(kit); + IDevice::ConstPtr device = DeviceKitAspect::device(kit); QTC_ASSERT(device, return nullptr); QUrl toolControl = device->toolControlChannel(IDevice::QmlControlChannel); serverUrl.setScheme(Utils::urlTcpScheme()); diff --git a/src/plugins/qmlprofiler/tests/qmlprofilerdetailsrewriter_test.cpp b/src/plugins/qmlprofiler/tests/qmlprofilerdetailsrewriter_test.cpp index 9a2dede657..88965ca4f2 100644 --- a/src/plugins/qmlprofiler/tests/qmlprofilerdetailsrewriter_test.cpp +++ b/src/plugins/qmlprofiler/tests/qmlprofilerdetailsrewriter_test.cpp @@ -226,7 +226,7 @@ void QmlProfilerDetailsRewriterTest::seedRewriter() QVERIFY(!doc->source().isEmpty()); auto kit = std::make_unique(); - ProjectExplorer::SysRootKitInformation::setSysRoot( + ProjectExplorer::SysRootKitAspect::setSysRoot( kit.get(), Utils::FileName::fromLatin1("/nowhere")); DummyProject *project = new DummyProject(Utils::FileName::fromString(filename)); diff --git a/src/plugins/qmlprojectmanager/qmlproject.cpp b/src/plugins/qmlprojectmanager/qmlproject.cpp index e516862617..6082a61682 100644 --- a/src/plugins/qmlprojectmanager/qmlproject.cpp +++ b/src/plugins/qmlprojectmanager/qmlproject.cpp @@ -188,7 +188,7 @@ void QmlProject::setMainFile(const QString &mainFilePath) Utils::FileName QmlProject::targetDirectory(const Target *target) const { - if (DeviceTypeKitInformation::deviceTypeId(target->kit()) + if (DeviceTypeKitAspect::deviceTypeId(target->kit()) == ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE) return canonicalProjectDir(); @@ -277,11 +277,11 @@ QList QmlProject::projectIssues(const Kit *k) const { QList result = Project::projectIssues(k); - const QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(k); + const QtSupport::BaseQtVersion *version = QtSupport::QtKitAspect::qtVersion(k); if (!version) result.append(createProjectTask(Task::TaskType::Error, tr("No Qt version set in kit."))); - IDevice::ConstPtr dev = DeviceKitInformation::device(k); + IDevice::ConstPtr dev = DeviceKitAspect::device(k); if (dev.isNull()) result.append(createProjectTask(Task::TaskType::Error, tr("Kit has no device."))); @@ -371,7 +371,7 @@ void QmlProject::updateDeploymentData(ProjectExplorer::Target *target) if (!m_projectItem) return; - if (DeviceTypeKitInformation::deviceTypeId(target->kit()) + if (DeviceTypeKitAspect::deviceTypeId(target->kit()) == ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE) { return; } diff --git a/src/plugins/qmlprojectmanager/qmlprojectenvironmentaspect.cpp b/src/plugins/qmlprojectmanager/qmlprojectenvironmentaspect.cpp index 0a81e39bf4..2502747f2e 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectenvironmentaspect.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojectenvironmentaspect.cpp @@ -56,7 +56,7 @@ Environment QmlProjectEnvironmentAspect::baseEnvironment() const QmlProjectEnvironmentAspect::QmlProjectEnvironmentAspect(Target *target) : m_target(target) { - if (DeviceTypeKitInformation::deviceTypeId(target->kit()) + if (DeviceTypeKitAspect::deviceTypeId(target->kit()) == Constants::DESKTOP_DEVICE_TYPE) addPreferredBaseEnvironment(SystemEnvironmentBase, tr("System Environment")); diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp index c973bdd8b9..27aadb2de1 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp @@ -313,7 +313,7 @@ QString QmlProjectRunConfiguration::disabledReason() const { if (mainScript().isEmpty()) return tr("No script file to execute."); - if (DeviceTypeKitInformation::deviceTypeId(target()->kit()) + if (DeviceTypeKitAspect::deviceTypeId(target()->kit()) == ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE && !QFileInfo::exists(executable())) { return tr("No qmlscene found."); @@ -329,11 +329,11 @@ QString QmlProjectRunConfiguration::executable() const if (!qmlViewer.isEmpty()) return qmlViewer; - BaseQtVersion *version = QtKitInformation::qtVersion(target()->kit()); + BaseQtVersion *version = QtKitAspect::qtVersion(target()->kit()); if (!version) // No Qt version in Kit. Don't try to run qmlscene. return QString(); - const Id deviceType = DeviceTypeKitInformation::deviceTypeId(target()->kit()); + const Id deviceType = DeviceTypeKitAspect::deviceTypeId(target()->kit()); if (deviceType == ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE) { // If not given explicitly by Qt Version, try to pick it from $PATH. return version->type() == QtSupport::Constants::DESKTOPQT @@ -341,7 +341,7 @@ QString QmlProjectRunConfiguration::executable() const : QString("qmlscene"); } - IDevice::ConstPtr dev = DeviceKitInformation::device(target()->kit()); + IDevice::ConstPtr dev = DeviceKitAspect::device(target()->kit()); if (dev.isNull()) // No device set. We don't know where to run qmlscene. return QString(); @@ -355,7 +355,7 @@ QString QmlProjectRunConfiguration::commandLineArguments() const // arguments in .user file QString args = aspect()->arguments(macroExpander()); const Target *currentTarget = target(); - const IDevice::ConstPtr device = DeviceKitInformation::device(currentTarget->kit()); + const IDevice::ConstPtr device = DeviceKitAspect::device(currentTarget->kit()); const Utils::OsType osType = device ? device->osType() : Utils::HostOsInfo::hostOs(); // arguments from .qmlproject file diff --git a/src/plugins/qnx/qnxconfiguration.cpp b/src/plugins/qnx/qnxconfiguration.cpp index 0619b439b7..5da58989b1 100644 --- a/src/plugins/qnx/qnxconfiguration.cpp +++ b/src/plugins/qnx/qnxconfiguration.cpp @@ -177,8 +177,8 @@ void QnxConfiguration::deactivate() foreach (Kit *kit, KitManager::kits()) { if (kit->isAutoDetected() - && DeviceTypeKitInformation::deviceTypeId(kit) == Constants::QNX_QNX_OS_TYPE - && toolChainsToRemove.contains(ToolChainKitInformation::toolChain(kit, ProjectExplorer::Constants::CXX_LANGUAGE_ID))) + && DeviceTypeKitAspect::deviceTypeId(kit) == Constants::QNX_QNX_OS_TYPE + && toolChainsToRemove.contains(ToolChainKitAspect::toolChain(kit, ProjectExplorer::Constants::CXX_LANGUAGE_ID))) KitManager::deregisterKit(kit); } @@ -304,14 +304,14 @@ ProjectExplorer::Kit *QnxConfiguration::createKit( auto kit = std::make_unique(); Kit *kptr = kit.get(); - QtKitInformation::setQtVersion(kptr, qnxQt); - ToolChainKitInformation::setToolChain(kptr, toolChain); - ToolChainKitInformation::clearToolChain(kptr, ProjectExplorer::Constants::C_LANGUAGE_ID); + QtKitAspect::setQtVersion(kptr, qnxQt); + ToolChainKitAspect::setToolChain(kptr, toolChain); + ToolChainKitAspect::clearToolChain(kptr, ProjectExplorer::Constants::C_LANGUAGE_ID); if (debugger.isValid()) - DebuggerKitInformation::setDebugger(kptr, debugger); + DebuggerKitAspect::setDebugger(kptr, debugger); - DeviceTypeKitInformation::setDeviceTypeId(kptr, Constants::QNX_QNX_OS_TYPE); + DeviceTypeKitAspect::setDeviceTypeId(kptr, Constants::QNX_QNX_OS_TYPE); // TODO: Add sysroot? kit->setUnexpandedDisplayName( @@ -323,12 +323,12 @@ ProjectExplorer::Kit *QnxConfiguration::createKit( kit->setAutoDetected(true); kit->setAutoDetectionSource(envFile().toString()); - kit->setMutable(DeviceKitInformation::id(), true); + kit->setMutable(DeviceKitAspect::id(), true); - kit->setSticky(ToolChainKitInformation::id(), true); - kit->setSticky(DeviceTypeKitInformation::id(), true); - kit->setSticky(SysRootKitInformation::id(), true); - kit->setSticky(DebuggerKitInformation::id(), true); + kit->setSticky(ToolChainKitAspect::id(), true); + kit->setSticky(DeviceTypeKitAspect::id(), true); + kit->setSticky(SysRootKitAspect::id(), true); + kit->setSticky(DebuggerKitAspect::id(), true); kit->setSticky(QmakeProjectManager::Constants::KIT_INFORMATION_ID, true); // add kit with device and qt version not sticky diff --git a/src/plugins/qnx/qnxdebugsupport.cpp b/src/plugins/qnx/qnxdebugsupport.cpp index f53b27df36..2eeda6db6f 100644 --- a/src/plugins/qnx/qnxdebugsupport.cpp +++ b/src/plugins/qnx/qnxdebugsupport.cpp @@ -72,7 +72,7 @@ namespace Internal { static QStringList searchPaths(Kit *kit) { - auto qtVersion = dynamic_cast(QtSupport::QtKitInformation::qtVersion(kit)); + auto qtVersion = dynamic_cast(QtSupport::QtKitAspect::qtVersion(kit)); if (!qtVersion) return {}; @@ -157,7 +157,7 @@ QnxDebugSupport::QnxDebugSupport(RunControl *runControl) setCloseMode(KillAtClose); setUseCtrlCStub(true); setSolibSearchPath(searchPaths(k)); - if (auto qtVersion = dynamic_cast(QtSupport::QtKitInformation::qtVersion(k))) + if (auto qtVersion = dynamic_cast(QtSupport::QtKitAspect::qtVersion(k))) setSysRoot(qtVersion->qnxTarget()); } @@ -241,7 +241,7 @@ void QnxAttachDebugSupport::showProcessesDialog() { auto kitChooser = new KitChooser; kitChooser->setKitPredicate([](const Kit *k) { - return k->isValid() && DeviceTypeKitInformation::deviceTypeId(k) == Constants::QNX_QNX_OS_TYPE; + return k->isValid() && DeviceTypeKitAspect::deviceTypeId(k) == Constants::QNX_QNX_OS_TYPE; }); QnxAttachDebugDialog dlg(kitChooser); @@ -279,7 +279,7 @@ void QnxAttachDebugSupport::showProcessesDialog() // setRunControlName(tr("Remote: \"%1\" - Process %2").arg(remoteChannel).arg(m_process.pid)); debugger->setRunControlName(tr("Remote QNX process %1").arg(pid)); debugger->setSolibSearchPath(searchPaths(kit)); - if (auto qtVersion = dynamic_cast(QtSupport::QtKitInformation::qtVersion(kit))) + if (auto qtVersion = dynamic_cast(QtSupport::QtKitAspect::qtVersion(kit))) debugger->setSysRoot(qtVersion->qnxTarget()); debugger->setUseContinueInsteadOfRun(true); diff --git a/src/plugins/qnx/qnxplugin.cpp b/src/plugins/qnx/qnxplugin.cpp index e316742f2c..e30beec6ee 100644 --- a/src/plugins/qnx/qnxplugin.cpp +++ b/src/plugins/qnx/qnxplugin.cpp @@ -138,7 +138,7 @@ bool QnxPlugin::initialize(const QStringList &arguments, QString *errorString) return false; } - auto dev = DeviceKitInformation::device(runConfig->target()->kit()) + auto dev = DeviceKitAspect::device(runConfig->target()->kit()) .dynamicCast(); return !dev.isNull(); }; @@ -176,9 +176,9 @@ void QnxPluginPrivate::updateDebuggerActions() { bool hasValidQnxKit = false; - auto matcher = DeviceTypeKitInformation::deviceTypePredicate(Constants::QNX_QNX_OS_TYPE); + auto matcher = DeviceTypeKitAspect::deviceTypePredicate(Constants::QNX_QNX_OS_TYPE); foreach (Kit *qnxKit, KitManager::kits(matcher)) { - if (qnxKit->isValid() && !DeviceKitInformation::device(qnxKit).isNull()) { + if (qnxKit->isValid() && !DeviceKitAspect::device(qnxKit).isNull()) { hasValidQnxKit = true; break; } diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp index 3790005a7c..376e5f23fc 100644 --- a/src/plugins/qtsupport/baseqtversion.cpp +++ b/src/plugins/qtsupport/baseqtversion.cpp @@ -347,14 +347,14 @@ QList BaseQtVersion::validateKit(const Kit *k) { QList result; - BaseQtVersion *version = QtKitInformation::qtVersion(k); + BaseQtVersion *version = QtKitAspect::qtVersion(k); Q_ASSERT(version == this); const QList qtAbis = version->qtAbis(); if (qtAbis.isEmpty()) // No need to test if Qt does not know anyway... return result; - const Id dt = DeviceTypeKitInformation::deviceTypeId(k); + const Id dt = DeviceTypeKitAspect::deviceTypeId(k); const QSet tdt = targetDeviceTypes(); if (!tdt.isEmpty() && !tdt.contains(dt)) { result << Task(Task::Warning, @@ -363,7 +363,7 @@ QList BaseQtVersion::validateKit(const Kit *k) FileName(), -1, ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM); } - ToolChain *tc = ToolChainKitInformation::toolChain(k, ProjectExplorer::Constants::CXX_LANGUAGE_ID); + ToolChain *tc = ToolChainKitAspect::toolChain(k, ProjectExplorer::Constants::CXX_LANGUAGE_ID); if (tc) { Abi targetAbi = tc->targetAbi(); bool fuzzyMatch = false; @@ -1175,151 +1175,151 @@ BaseQtVersion::createMacroExpander(const std::function }; }; std::unique_ptr expander(new Utils::MacroExpander); - expander->setDisplayName(QtKitInformation::tr("Qt version")); + expander->setDisplayName(QtKitAspect::tr("Qt version")); expander->registerVariable( "Qt:Version", - QtKitInformation::tr("The version string of the current Qt version."), + QtKitAspect::tr("The version string of the current Qt version."), versionProperty([](const BaseQtVersion *version) { return version->qtVersionString(); })); expander->registerVariable( "Qt:Type", - QtKitInformation::tr("The type of the current Qt version."), + QtKitAspect::tr("The type of the current Qt version."), versionProperty([](const BaseQtVersion *version) { return version->type(); })); expander->registerVariable( "Qt:Mkspec", - QtKitInformation::tr("The mkspec of the current Qt version."), + QtKitAspect::tr("The mkspec of the current Qt version."), versionProperty([](const BaseQtVersion *version) { return version->mkspec().toUserOutput(); })); expander->registerVariable( "Qt:QT_INSTALL_PREFIX", - QtKitInformation::tr("The installation prefix of the current Qt version."), + QtKitAspect::tr("The installation prefix of the current Qt version."), versionProperty([](const BaseQtVersion *version) { return version->qmakeProperty(version->m_versionInfo, "QT_INSTALL_PREFIX"); })); expander->registerVariable( "Qt:QT_INSTALL_DATA", - QtKitInformation::tr("The installation location of the current Qt version's data."), + QtKitAspect::tr("The installation location of the current Qt version's data."), versionProperty([](const BaseQtVersion *version) { return version->qmakeProperty(version->m_versionInfo, "QT_INSTALL_DATA"); })); expander->registerVariable( "Qt:QT_INSTALL_HEADERS", - QtKitInformation::tr("The installation location of the current Qt version's header files."), + QtKitAspect::tr("The installation location of the current Qt version's header files."), versionProperty([](const BaseQtVersion *version) { return version->qmakeProperty(version->m_versionInfo, "QT_INSTALL_HEADERS"); })); expander->registerVariable( "Qt:QT_INSTALL_LIBS", - QtKitInformation::tr("The installation location of the current Qt version's library files."), + QtKitAspect::tr("The installation location of the current Qt version's library files."), versionProperty([](const BaseQtVersion *version) { return version->qmakeProperty(version->m_versionInfo, "QT_INSTALL_LIBS"); })); expander->registerVariable( "Qt:QT_INSTALL_DOCS", - QtKitInformation::tr("The installation location of the current Qt version's documentation files."), + QtKitAspect::tr("The installation location of the current Qt version's documentation files."), versionProperty([](const BaseQtVersion *version) { return version->qmakeProperty(version->m_versionInfo, "QT_INSTALL_DOCS"); })); expander->registerVariable( "Qt:QT_INSTALL_BINS", - QtKitInformation::tr("The installation location of the current Qt version's executable files."), + QtKitAspect::tr("The installation location of the current Qt version's executable files."), versionProperty([](const BaseQtVersion *version) { return version->qmakeProperty(version->m_versionInfo, "QT_INSTALL_BINS"); })); expander->registerVariable( "Qt:QT_INSTALL_PLUGINS", - QtKitInformation::tr("The installation location of the current Qt version's plugins."), + QtKitAspect::tr("The installation location of the current Qt version's plugins."), versionProperty([](const BaseQtVersion *version) { return version->qmakeProperty(version->m_versionInfo, "QT_INSTALL_PLUGINS"); })); expander->registerVariable( "Qt:QT_INSTALL_QML", - QtKitInformation::tr("The installation location of the current Qt version's QML files."), + QtKitAspect::tr("The installation location of the current Qt version's QML files."), versionProperty([](const BaseQtVersion *version) { return version->qmakeProperty(version->m_versionInfo, "QT_INSTALL_QML"); })); expander->registerVariable( "Qt:QT_INSTALL_IMPORTS", - QtKitInformation::tr("The installation location of the current Qt version's imports."), + QtKitAspect::tr("The installation location of the current Qt version's imports."), versionProperty([](const BaseQtVersion *version) { return version->qmakeProperty(version->m_versionInfo, "QT_INSTALL_IMPORTS"); })); expander->registerVariable( "Qt:QT_INSTALL_TRANSLATIONS", - QtKitInformation::tr("The installation location of the current Qt version's translation files."), + QtKitAspect::tr("The installation location of the current Qt version's translation files."), versionProperty([](const BaseQtVersion *version) { return version->qmakeProperty(version->m_versionInfo, "QT_INSTALL_TRANSLATIONS"); })); expander->registerVariable( "Qt:QT_INSTALL_CONFIGURATION", - QtKitInformation::tr("The installation location of the current Qt version's translation files."), + QtKitAspect::tr("The installation location of the current Qt version's translation files."), versionProperty([](const BaseQtVersion *version) { return version->qmakeProperty(version->m_versionInfo, "QT_INSTALL_CONFIGURATION"); })); expander->registerVariable( "Qt:QT_INSTALL_EXAMPLES", - QtKitInformation::tr("The installation location of the current Qt version's examples."), + QtKitAspect::tr("The installation location of the current Qt version's examples."), versionProperty([](const BaseQtVersion *version) { return version->qmakeProperty(version->m_versionInfo, "QT_INSTALL_EXAMPLES"); })); expander->registerVariable( "Qt:QT_INSTALL_DEMOS", - QtKitInformation::tr("The installation location of the current Qt version's demos."), + QtKitAspect::tr("The installation location of the current Qt version's demos."), versionProperty([](const BaseQtVersion *version) { return version->qmakeProperty(version->m_versionInfo, "QT_INSTALL_DEMOS"); })); expander->registerVariable( "Qt:QMAKE_MKSPECS", - QtKitInformation::tr("The current Qt version's default mkspecs (Qt 4)."), + QtKitAspect::tr("The current Qt version's default mkspecs (Qt 4)."), versionProperty([](const BaseQtVersion *version) { return version->qmakeProperty(version->m_versionInfo, "QMAKE_MKSPECS"); })); expander->registerVariable( "Qt:QMAKE_SPEC", - QtKitInformation::tr("The current Qt version's default mkspec (Qt 5; host system)."), + QtKitAspect::tr("The current Qt version's default mkspec (Qt 5; host system)."), versionProperty([](const BaseQtVersion *version) { return version->qmakeProperty(version->m_versionInfo, "QMAKE_SPEC"); })); expander->registerVariable( "Qt:QMAKE_XSPEC", - QtKitInformation::tr("The current Qt version's default mkspec (Qt 5; target system)."), + QtKitAspect::tr("The current Qt version's default mkspec (Qt 5; target system)."), versionProperty([](const BaseQtVersion *version) { return version->qmakeProperty(version->m_versionInfo, "QMAKE_XSPEC"); })); expander->registerVariable( "Qt:QMAKE_VERSION", - QtKitInformation::tr("The current Qt's qmake version."), + QtKitAspect::tr("The current Qt's qmake version."), versionProperty([](const BaseQtVersion *version) { return version->qmakeProperty(version->m_versionInfo, "QMAKE_VERSION"); })); // FIXME: Re-enable once we can detect expansion loops. // expander->registerVariable("Qt:Name", - // QtKitInformation::tr("The display name of the current Qt version."), + // QtKitAspect::tr("The display name of the current Qt version."), // versionProperty([](BaseQtVersion *version) { // return version->displayName(); // })); @@ -1362,9 +1362,9 @@ void BaseQtVersion::populateQmlFileFinder(FileInProjectFinder *finder, const Tar // ... and find the sysroot and qml directory if we have any target at all. const ProjectExplorer::Kit *kit = target ? target->kit() : nullptr; - const Utils::FileName activeSysroot = ProjectExplorer::SysRootKitInformation::sysRoot(kit); + const Utils::FileName activeSysroot = ProjectExplorer::SysRootKitAspect::sysRoot(kit); const QtSupport::BaseQtVersion *qtVersion = QtVersionManager::isLoaded() - ? QtSupport::QtKitInformation::qtVersion(kit) : nullptr; + ? QtSupport::QtKitAspect::qtVersion(kit) : nullptr; Utils::FileNameList additionalSearchDirectories = qtVersion ? Utils::FileNameList({qtVersion->qmlPath()}) : Utils::FileNameList(); @@ -1706,7 +1706,7 @@ bool BaseQtVersion::isSubProject(const Utils::FileName &filePath) const bool BaseQtVersion::isQmlDebuggingSupported(Kit *k, QString *reason) { QTC_ASSERT(k, return false); - BaseQtVersion *version = QtKitInformation::qtVersion(k); + BaseQtVersion *version = QtKitAspect::qtVersion(k); if (!version) { if (reason) *reason = QCoreApplication::translate("BaseQtVersion", "No Qt version."); @@ -1735,7 +1735,7 @@ bool BaseQtVersion::isQmlDebuggingSupported(QString *reason) const bool BaseQtVersion::isQtQuickCompilerSupported(Kit *k, QString *reason) { QTC_ASSERT(k, return false); - BaseQtVersion *version = QtKitInformation::qtVersion(k); + BaseQtVersion *version = QtKitAspect::qtVersion(k); if (!version) { if (reason) *reason = QCoreApplication::translate("BaseQtVersion", "No Qt version."); diff --git a/src/plugins/qtsupport/exampleslistmodel.cpp b/src/plugins/qtsupport/exampleslistmodel.cpp index f83496ef54..ee0d88088a 100644 --- a/src/plugins/qtsupport/exampleslistmodel.cpp +++ b/src/plugins/qtsupport/exampleslistmodel.cpp @@ -504,7 +504,7 @@ void ExampleSetModel::updateQtVersionList() // prioritize default qt version ProjectExplorer::Kit *defaultKit = ProjectExplorer::KitManager::defaultKit(); - BaseQtVersion *defaultVersion = QtKitInformation::qtVersion(defaultKit); + BaseQtVersion *defaultVersion = QtKitAspect::qtVersion(defaultKit); if (defaultVersion && versions.contains(defaultVersion)) versions.move(versions.indexOf(defaultVersion), 0); diff --git a/src/plugins/qtsupport/qmldumptool.cpp b/src/plugins/qtsupport/qmldumptool.cpp index 045353d004..dc9f766144 100644 --- a/src/plugins/qtsupport/qmldumptool.cpp +++ b/src/plugins/qtsupport/qmldumptool.cpp @@ -85,7 +85,7 @@ void QmlDumpTool::pathAndEnvironment(const ProjectExplorer::Kit *k, bool preferD if (!k) return; - const BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(k); + const BaseQtVersion *version = QtSupport::QtKitAspect::qtVersion(k); if (version && !version->hasQmlDump()) return; diff --git a/src/plugins/qtsupport/qscxmlcgenerator.cpp b/src/plugins/qtsupport/qscxmlcgenerator.cpp index f9e4c3c455..1396c0ac47 100644 --- a/src/plugins/qtsupport/qscxmlcgenerator.cpp +++ b/src/plugins/qtsupport/qscxmlcgenerator.cpp @@ -77,9 +77,9 @@ Utils::FileName QScxmlcGenerator::command() const QtSupport::BaseQtVersion *version = nullptr; Target *target; if ((target = project()->activeTarget())) - version = QtSupport::QtKitInformation::qtVersion(target->kit()); + version = QtSupport::QtKitAspect::qtVersion(target->kit()); else - version = QtSupport::QtKitInformation::qtVersion(KitManager::defaultKit()); + version = QtSupport::QtKitAspect::qtVersion(KitManager::defaultKit()); if (!version) return Utils::FileName(); diff --git a/src/plugins/qtsupport/qtcppkitinfo.cpp b/src/plugins/qtsupport/qtcppkitinfo.cpp index 2028400ee4..07e404cce4 100644 --- a/src/plugins/qtsupport/qtcppkitinfo.cpp +++ b/src/plugins/qtsupport/qtcppkitinfo.cpp @@ -35,7 +35,7 @@ using namespace CppTools; CppKitInfo::CppKitInfo(ProjectExplorer::Project *project) : KitInfo(project) { - if (kit && (qtVersion = QtKitInformation::qtVersion(kit))) { + if (kit && (qtVersion = QtKitAspect::qtVersion(kit))) { if (qtVersion->qtVersion() < QtSupport::QtVersionNumber(5, 0, 0)) projectPartQtVersion = ProjectPart::Qt4; else diff --git a/src/plugins/qtsupport/qtkitconfigwidget.cpp b/src/plugins/qtsupport/qtkitconfigwidget.cpp index 8b32ba44de..e2376074dc 100644 --- a/src/plugins/qtsupport/qtkitconfigwidget.cpp +++ b/src/plugins/qtsupport/qtkitconfigwidget.cpp @@ -40,8 +40,8 @@ namespace QtSupport { namespace Internal { -QtKitConfigWidget::QtKitConfigWidget(ProjectExplorer::Kit *k, const ProjectExplorer::KitInformation *ki) : - KitConfigWidget(k, ki) +QtKitAspectWidget::QtKitAspectWidget(ProjectExplorer::Kit *k, const ProjectExplorer::KitAspect *ki) : + KitAspectWidget(k, ki) { m_combo = new QComboBox; m_combo->setSizePolicy(QSizePolicy::Ignored, m_combo->sizePolicy().verticalPolicy()); @@ -50,54 +50,54 @@ QtKitConfigWidget::QtKitConfigWidget(ProjectExplorer::Kit *k, const ProjectExplo QList versionIds = Utils::transform(QtVersionManager::versions(), &BaseQtVersion::uniqueId); versionsChanged(versionIds, QList(), QList()); - m_manageButton = new QPushButton(KitConfigWidget::msgManage()); + m_manageButton = new QPushButton(KitAspectWidget::msgManage()); refresh(); m_combo->setToolTip(toolTip()); connect(m_combo, static_cast(&QComboBox::currentIndexChanged), - this, &QtKitConfigWidget::currentWasChanged); + this, &QtKitAspectWidget::currentWasChanged); connect(QtVersionManager::instance(), &QtVersionManager::qtVersionsChanged, - this, &QtKitConfigWidget::versionsChanged); + this, &QtKitAspectWidget::versionsChanged); - connect(m_manageButton, &QAbstractButton::clicked, this, &QtKitConfigWidget::manageQtVersions); + connect(m_manageButton, &QAbstractButton::clicked, this, &QtKitAspectWidget::manageQtVersions); } -QtKitConfigWidget::~QtKitConfigWidget() +QtKitAspectWidget::~QtKitAspectWidget() { delete m_combo; delete m_manageButton; } -QString QtKitConfigWidget::displayName() const +QString QtKitAspectWidget::displayName() const { return tr("Qt version"); } -QString QtKitConfigWidget::toolTip() const +QString QtKitAspectWidget::toolTip() const { return tr("The Qt library to use for all projects using this kit.
" "A Qt version is required for qmake-based projects " "and optional when using other build systems."); } -void QtKitConfigWidget::makeReadOnly() +void QtKitAspectWidget::makeReadOnly() { m_combo->setEnabled(false); } -void QtKitConfigWidget::refresh() +void QtKitAspectWidget::refresh() { - m_combo->setCurrentIndex(findQtVersion(QtKitInformation::qtVersionId(m_kit))); + m_combo->setCurrentIndex(findQtVersion(QtKitAspect::qtVersionId(m_kit))); } -QWidget *QtKitConfigWidget::mainWidget() const +QWidget *QtKitAspectWidget::mainWidget() const { return m_combo; } -QWidget *QtKitConfigWidget::buttonWidget() const +QWidget *QtKitAspectWidget::buttonWidget() const { return m_manageButton; } @@ -111,7 +111,7 @@ static QString itemNameFor(const BaseQtVersion *v) return name; } -void QtKitConfigWidget::versionsChanged(const QList &added, const QList &removed, +void QtKitAspectWidget::versionsChanged(const QList &added, const QList &removed, const QList &changed) { foreach (const int id, added) { @@ -133,17 +133,17 @@ void QtKitConfigWidget::versionsChanged(const QList &added, const QListitemData(idx).toInt()); + QtKitAspect::setQtVersionId(m_kit, m_combo->itemData(idx).toInt()); } -int QtKitConfigWidget::findQtVersion(const int id) const +int QtKitAspectWidget::findQtVersion(const int id) const { for (int i = 0; i < m_combo->count(); ++i) { if (id == m_combo->itemData(i).toInt()) diff --git a/src/plugins/qtsupport/qtkitconfigwidget.h b/src/plugins/qtsupport/qtkitconfigwidget.h index 76cd30d5b5..b110874fb7 100644 --- a/src/plugins/qtsupport/qtkitconfigwidget.h +++ b/src/plugins/qtsupport/qtkitconfigwidget.h @@ -35,13 +35,13 @@ QT_END_NAMESPACE namespace QtSupport { namespace Internal { -class QtKitConfigWidget : public ProjectExplorer::KitConfigWidget +class QtKitAspectWidget : public ProjectExplorer::KitAspectWidget { Q_OBJECT public: - QtKitConfigWidget(ProjectExplorer::Kit *k, const ProjectExplorer::KitInformation *ki); - ~QtKitConfigWidget() override; + QtKitAspectWidget(ProjectExplorer::Kit *k, const ProjectExplorer::KitAspect *ki); + ~QtKitAspectWidget() override; QString displayName() const override; diff --git a/src/plugins/qtsupport/qtkitinformation.cpp b/src/plugins/qtsupport/qtkitinformation.cpp index 3e55fb3fd0..b2ad7f036c 100644 --- a/src/plugins/qtsupport/qtkitinformation.cpp +++ b/src/plugins/qtsupport/qtkitinformation.cpp @@ -45,17 +45,17 @@ using namespace Utils; namespace QtSupport { -QtKitInformation::QtKitInformation() +QtKitAspect::QtKitAspect() { - setObjectName(QLatin1String("QtKitInformation")); - setId(QtKitInformation::id()); + setObjectName(QLatin1String("QtKitAspect")); + setId(QtKitAspect::id()); setPriority(26000); connect(KitManager::instance(), &KitManager::kitsLoaded, - this, &QtKitInformation::kitsWereLoaded); + this, &QtKitAspect::kitsWereLoaded); } -QVariant QtKitInformation::defaultValue(const Kit *k) const +QVariant QtKitAspect::defaultValue(const Kit *k) const { Q_UNUSED(k); @@ -71,7 +71,7 @@ QVariant QtKitInformation::defaultValue(const Kit *k) const return result ? result->uniqueId() : -1; } -QList QtKitInformation::validate(const ProjectExplorer::Kit *k) const +QList QtKitAspect::validate(const ProjectExplorer::Kit *k) const { QTC_ASSERT(QtVersionManager::isLoaded(), return { }); BaseQtVersion *version = qtVersion(k); @@ -81,7 +81,7 @@ QList QtKitInformation::validate(const ProjectExplorer::K return version->validateKit(k); } -void QtKitInformation::fix(ProjectExplorer::Kit *k) +void QtKitAspect::fix(ProjectExplorer::Kit *k) { QTC_ASSERT(QtVersionManager::isLoaded(), return); BaseQtVersion *version = qtVersion(k); @@ -91,33 +91,33 @@ void QtKitInformation::fix(ProjectExplorer::Kit *k) } } -ProjectExplorer::KitConfigWidget *QtKitInformation::createConfigWidget(ProjectExplorer::Kit *k) const +ProjectExplorer::KitAspectWidget *QtKitAspect::createConfigWidget(ProjectExplorer::Kit *k) const { QTC_ASSERT(k, return nullptr); - return new Internal::QtKitConfigWidget(k, this); + return new Internal::QtKitAspectWidget(k, this); } -QString QtKitInformation::displayNamePostfix(const ProjectExplorer::Kit *k) const +QString QtKitAspect::displayNamePostfix(const ProjectExplorer::Kit *k) const { BaseQtVersion *version = qtVersion(k); return version ? version->displayName() : QString(); } -ProjectExplorer::KitInformation::ItemList -QtKitInformation::toUserOutput(const ProjectExplorer::Kit *k) const +ProjectExplorer::KitAspect::ItemList +QtKitAspect::toUserOutput(const ProjectExplorer::Kit *k) const { BaseQtVersion *version = qtVersion(k); return ItemList() << qMakePair(tr("Qt version"), version ? version->displayName() : tr("None")); } -void QtKitInformation::addToEnvironment(const ProjectExplorer::Kit *k, Utils::Environment &env) const +void QtKitAspect::addToEnvironment(const ProjectExplorer::Kit *k, Utils::Environment &env) const { BaseQtVersion *version = qtVersion(k); if (version) version->addToEnvironment(k, env); } -ProjectExplorer::IOutputParser *QtKitInformation::createOutputParser(const ProjectExplorer::Kit *k) const +ProjectExplorer::IOutputParser *QtKitAspect::createOutputParser(const ProjectExplorer::Kit *k) const { if (qtVersion(k)) return new QtParser; @@ -129,7 +129,7 @@ class QtMacroSubProvider public: QtMacroSubProvider(Kit *kit) : expander(BaseQtVersion::createMacroExpander( - [kit] { return QtKitInformation::qtVersion(kit); })) + [kit] { return QtKitAspect::qtVersion(kit); })) {} MacroExpander *operator()() const @@ -140,7 +140,7 @@ public: std::shared_ptr expander; }; -void QtKitInformation::addToMacroExpander(Kit *kit, MacroExpander *expander) const +void QtKitAspect::addToMacroExpander(Kit *kit, MacroExpander *expander) const { QTC_ASSERT(kit, return); expander->registerSubProvider(QtMacroSubProvider(kit)); @@ -157,18 +157,18 @@ void QtKitInformation::addToMacroExpander(Kit *kit, MacroExpander *expander) con }); } -Core::Id QtKitInformation::id() +Core::Id QtKitAspect::id() { return "QtSupport.QtInformation"; } -int QtKitInformation::qtVersionId(const ProjectExplorer::Kit *k) +int QtKitAspect::qtVersionId(const ProjectExplorer::Kit *k) { if (!k) return -1; int id = -1; - QVariant data = k->value(QtKitInformation::id(), -1); + QVariant data = k->value(QtKitAspect::id(), -1); if (data.type() == QVariant::Int) { bool ok; id = data.toInt(&ok); @@ -183,18 +183,18 @@ int QtKitInformation::qtVersionId(const ProjectExplorer::Kit *k) return id; } -void QtKitInformation::setQtVersionId(ProjectExplorer::Kit *k, const int id) +void QtKitAspect::setQtVersionId(ProjectExplorer::Kit *k, const int id) { QTC_ASSERT(k, return); - k->setValue(QtKitInformation::id(), id); + k->setValue(QtKitAspect::id(), id); } -BaseQtVersion *QtKitInformation::qtVersion(const ProjectExplorer::Kit *k) +BaseQtVersion *QtKitAspect::qtVersion(const ProjectExplorer::Kit *k) { return QtVersionManager::version(qtVersionId(k)); } -void QtKitInformation::setQtVersion(ProjectExplorer::Kit *k, const BaseQtVersion *v) +void QtKitAspect::setQtVersion(ProjectExplorer::Kit *k, const BaseQtVersion *v) { if (!v) setQtVersionId(k, -1); @@ -202,7 +202,7 @@ void QtKitInformation::setQtVersion(ProjectExplorer::Kit *k, const BaseQtVersion setQtVersionId(k, v->uniqueId()); } -void QtKitInformation::qtVersionsChanged(const QList &addedIds, +void QtKitAspect::qtVersionsChanged(const QList &addedIds, const QList &removedIds, const QList &changedIds) { @@ -216,29 +216,29 @@ void QtKitInformation::qtVersionsChanged(const QList &addedIds, } } -void QtKitInformation::kitsWereLoaded() +void QtKitAspect::kitsWereLoaded() { foreach (ProjectExplorer::Kit *k, ProjectExplorer::KitManager::kits()) fix(k); connect(QtVersionManager::instance(), &QtVersionManager::qtVersionsChanged, - this, &QtKitInformation::qtVersionsChanged); + this, &QtKitAspect::qtVersionsChanged); } -Kit::Predicate QtKitInformation::platformPredicate(Core::Id platform) +Kit::Predicate QtKitAspect::platformPredicate(Core::Id platform) { return [platform](const Kit *kit) -> bool { - BaseQtVersion *version = QtKitInformation::qtVersion(kit); + BaseQtVersion *version = QtKitAspect::qtVersion(kit); return version && version->targetDeviceTypes().contains(platform); }; } -Kit::Predicate QtKitInformation::qtVersionPredicate(const QSet &required, +Kit::Predicate QtKitAspect::qtVersionPredicate(const QSet &required, const QtVersionNumber &min, const QtVersionNumber &max) { return [required, min, max](const Kit *kit) -> bool { - BaseQtVersion *version = QtKitInformation::qtVersion(kit); + BaseQtVersion *version = QtKitAspect::qtVersion(kit); if (!version) return false; QtVersionNumber current = version->qtVersion(); @@ -250,15 +250,15 @@ Kit::Predicate QtKitInformation::qtVersionPredicate(const QSet &requir }; } -QSet QtKitInformation::supportedPlatforms(const Kit *k) const +QSet QtKitAspect::supportedPlatforms(const Kit *k) const { - BaseQtVersion *version = QtKitInformation::qtVersion(k); + BaseQtVersion *version = QtKitAspect::qtVersion(k); return version ? version->targetDeviceTypes() : QSet(); } -QSet QtKitInformation::availableFeatures(const Kit *k) const +QSet QtKitAspect::availableFeatures(const Kit *k) const { - BaseQtVersion *version = QtKitInformation::qtVersion(k); + BaseQtVersion *version = QtKitAspect::qtVersion(k); return version ? version->features() : QSet(); } diff --git a/src/plugins/qtsupport/qtkitinformation.h b/src/plugins/qtsupport/qtkitinformation.h index 459b9b2440..56f79cee03 100644 --- a/src/plugins/qtsupport/qtkitinformation.h +++ b/src/plugins/qtsupport/qtkitinformation.h @@ -35,19 +35,19 @@ namespace Utils { class MacroExpander; } namespace QtSupport { -class QTSUPPORT_EXPORT QtKitInformation : public ProjectExplorer::KitInformation +class QTSUPPORT_EXPORT QtKitAspect : public ProjectExplorer::KitAspect { Q_OBJECT public: - QtKitInformation(); + QtKitAspect(); QVariant defaultValue(const ProjectExplorer::Kit *k) const override; QList validate(const ProjectExplorer::Kit *k) const override; void fix(ProjectExplorer::Kit *) override; - ProjectExplorer::KitConfigWidget *createConfigWidget(ProjectExplorer::Kit *k) const override; + ProjectExplorer::KitAspectWidget *createConfigWidget(ProjectExplorer::Kit *k) const override; QString displayNamePostfix(const ProjectExplorer::Kit *k) const override; diff --git a/src/plugins/qtsupport/qtprojectimporter.cpp b/src/plugins/qtsupport/qtprojectimporter.cpp index a218ee2b5e..0350995736 100644 --- a/src/plugins/qtsupport/qtprojectimporter.cpp +++ b/src/plugins/qtsupport/qtprojectimporter.cpp @@ -47,7 +47,7 @@ namespace QtSupport { QtProjectImporter::QtProjectImporter(const Utils::FileName &path) : ProjectImporter(path) { - useTemporaryKitInformation(QtKitInformation::id(), + useTemporaryKitAspect(QtKitAspect::id(), [this](Kit *k, const QVariantList &vl) {cleanupTemporaryQt(k, vl);}, [this](Kit *k, const QVariantList &vl) {persistTemporaryQt(k, vl);}); } @@ -60,7 +60,7 @@ QtProjectImporter::findOrCreateQtVersion(const Utils::FileName &qmakePath) const if (result.qt) { // Check if version is a temporary qt const int qtId = result.qt->uniqueId(); - result.isTemporary = hasKitWithTemporaryData(QtKitInformation::id(), qtId); + result.isTemporary = hasKitWithTemporaryData(QtKitAspect::id(), qtId); return result; } @@ -80,10 +80,10 @@ Kit *QtProjectImporter::createTemporaryKit(const QtVersionData &versionData, const ProjectImporter::KitSetupFunction &additionalSetup) const { return ProjectImporter::createTemporaryKit([&additionalSetup, &versionData, this](Kit *k) -> void { - QtKitInformation::setQtVersion(k, versionData.qt); + QtKitAspect::setQtVersion(k, versionData.qt); if (versionData.qt) { if (versionData.isTemporary) - addTemporaryData(QtKitInformation::id(), versionData.qt->uniqueId(), k); + addTemporaryData(QtKitAspect::id(), versionData.qt->uniqueId(), k); k->setUnexpandedDisplayName(versionData.qt->displayName());; } @@ -108,7 +108,7 @@ void QtProjectImporter::cleanupTemporaryQt(Kit *k, const QVariantList &vl) BaseQtVersion *version = versionFromVariant(vl.at(0)); QTC_ASSERT(version, return); QtVersionManager::removeVersion(version); - QtKitInformation::setQtVersion(k, nullptr); // Always mark Kit as not using this Qt + QtKitAspect::setQtVersion(k, nullptr); // Always mark Kit as not using this Qt } void QtProjectImporter::persistTemporaryQt(Kit *k, const QVariantList &vl) @@ -118,7 +118,7 @@ void QtProjectImporter::persistTemporaryQt(Kit *k, const QVariantList &vl) QTC_ASSERT(vl.count() == 1, return); const QVariant data = vl.at(0); BaseQtVersion *tmpVersion = versionFromVariant(data); - BaseQtVersion *actualVersion = QtKitInformation::qtVersion(k); + BaseQtVersion *actualVersion = QtKitAspect::qtVersion(k); // User changed Kit away from temporary Qt that was set up: if (tmpVersion && actualVersion != tmpVersion) @@ -228,7 +228,7 @@ Kit *TestQtProjectImporter::createKit(void *directoryData) const // New temporary kit: return createTemporaryKit(findOrCreateQtVersion(dd->qmakePath), [dd](Kit *k) { - BaseQtVersion *qt = QtKitInformation::qtVersion(k); + BaseQtVersion *qt = QtKitAspect::qtVersion(k); QMap toKeep; for (const Core::Id &key : k->allKeys()) { if (key.toString().startsWith("PE.tmp.")) @@ -237,7 +237,7 @@ Kit *TestQtProjectImporter::createKit(void *directoryData) const k->copyFrom(dd->kit); for (auto i = toKeep.constBegin(); i != toKeep.constEnd(); ++i) k->setValue(i.key(), i.value()); - QtKitInformation::setQtVersion(k, qt); + QtKitAspect::setQtVersion(k, qt); }); } @@ -362,7 +362,7 @@ void QtSupportPlugin::testQtProjectImporter_oneProject() Kit *defaultKit = KitManager::defaultKit(); QVERIFY(defaultKit); - BaseQtVersion *defaultQt = QtKitInformation::qtVersion(defaultKit); + BaseQtVersion *defaultQt = QtKitAspect::qtVersion(defaultKit); QVERIFY(defaultQt); const Utils::TemporaryDirectory tempDir1("tmp1"); @@ -373,10 +373,10 @@ void QtSupportPlugin::testQtProjectImporter_oneProject() // Templates referrenced by test data: QVector kitTemplates = {defaultKit, defaultKit->clone(), defaultKit->clone()}; // Customize kit numbers 1 and 2: - QtKitInformation::setQtVersion(kitTemplates[1], nullptr); - QtKitInformation::setQtVersion(kitTemplates[2], nullptr); - SysRootKitInformation::setSysRoot(kitTemplates[1], Utils::FileName::fromString("/some/path")); - SysRootKitInformation::setSysRoot(kitTemplates[2], Utils::FileName::fromString("/some/other/path")); + QtKitAspect::setQtVersion(kitTemplates[1], nullptr); + QtKitAspect::setQtVersion(kitTemplates[2], nullptr); + SysRootKitAspect::setSysRoot(kitTemplates[1], Utils::FileName::fromString("/some/path")); + SysRootKitAspect::setSysRoot(kitTemplates[2], Utils::FileName::fromString("/some/other/path")); QVector qmakePaths = {defaultQt->qmakeCommand(), setupQmake(defaultQt, tempDir1.path()), @@ -445,7 +445,7 @@ void QtSupportPlugin::testQtProjectImporter_oneProject() Kit *newKit = KitManager::kit(bi.kitId); QVERIFY(newKit); - const int newQtId = QtKitInformation::qtVersionId(newKit); + const int newQtId = QtKitAspect::qtVersionId(newKit); // VALIDATE: Qt id is unchanged (unless it is a new Qt) if (!dd->isNewQt) @@ -468,7 +468,7 @@ void QtSupportPlugin::testQtProjectImporter_oneProject() QCOMPARE(templateKeys.count(), newKitKeys.count()); // existing kit needs to be unchanged! for (Core::Id id : templateKeys) { - if (id == QtKitInformation::id()) + if (id == QtKitAspect::id()) continue; // with the exception of the Qt one... QVERIFY(newKit->hasValue(id)); QVERIFY(dd->kit->value(id) == newKit->value(id)); @@ -497,7 +497,7 @@ void QtSupportPlugin::testQtProjectImporter_oneProject() templateKit = defaultKit; } else { templateKit = dd->kit->clone(true); - QtKitInformation::setQtVersionId(templateKit, QtKitInformation::qtVersionId(newKit)); + QtKitAspect::setQtVersionId(templateKit, QtKitAspect::qtVersionId(newKit)); } const QList templateKitKeys = templateKit->allKeys(); @@ -522,7 +522,7 @@ void QtSupportPlugin::testQtProjectImporter_oneProject() const QList newKitKeys = newKit->allKeys(); const Core::Id newKitId = newKit->id(); - const int qtId = QtKitInformation::qtVersionId(newKit); + const int qtId = QtKitAspect::qtVersionId(newKit); // VALIDATE: Kit Id has not changed QCOMPARE(newKitId, newKitIdAfterImport); @@ -539,7 +539,7 @@ void QtSupportPlugin::testQtProjectImporter_oneProject() // VALIDATE: All the kit values are as set up in the template before QCOMPARE(newKitKeys.count(), templateKitKeys.count()); for (Core::Id id : templateKitKeys) { - if (id == QtKitInformation::id()) + if (id == QtKitAspect::id()) continue; QVERIFY(newKit->hasValue(id)); QVERIFY(newKit->value(id) == templateKit->value(id)); @@ -553,7 +553,7 @@ void QtSupportPlugin::testQtProjectImporter_oneProject() // VALIDATE: All keys that got added during import are gone QCOMPARE(newKitKeys.count(), templateKitKeys.count()); for (Core::Id id : newKitKeys) { - if (id == QtKitInformation::id()) + if (id == QtKitAspect::id()) continue; // Will be checked by Qt version later QVERIFY(templateKit->hasValue(id)); QVERIFY(newKit->value(id) == templateKit->value(id)); @@ -562,7 +562,7 @@ void QtSupportPlugin::testQtProjectImporter_oneProject() if (qtIsPersistent) { // VALIDATE: Qt is used in the Kit: - QVERIFY(QtKitInformation::qtVersionId(newKit) == qtId); + QVERIFY(QtKitAspect::qtVersionId(newKit) == qtId); // VALIDATE: Qt is still in QtVersionManager QVERIFY(QtVersionManager::version(qtId)); @@ -571,10 +571,10 @@ void QtSupportPlugin::testQtProjectImporter_oneProject() QCOMPARE(QtVersionManager::version(qtId)->qmakeCommand(), dd->qmakePath); // VALIDATE: Kit uses the expected Qt - QCOMPARE(QtKitInformation::qtVersionId(newKit), qtId); + QCOMPARE(QtKitAspect::qtVersionId(newKit), qtId); } else { // VALIDATE: Qt was reset in the kit - QVERIFY(QtKitInformation::qtVersionId(newKit) == -1); + QVERIFY(QtKitAspect::qtVersionId(newKit) == -1); // VALIDATE: New kit is still visible in KitManager QVERIFY(KitManager::kit(newKitId)); // Cleanup Kit does not unregister Kits, so it does @@ -584,7 +584,7 @@ void QtSupportPlugin::testQtProjectImporter_oneProject() QVERIFY(!QtVersionManager::version(qtId)); // VALIDATE: Qt version was reset on the kit - QVERIFY(newKit->value(QtKitInformation::id()).toInt() == -1); // new Qt will be reset to invalid! + QVERIFY(newKit->value(QtKitAspect::id()).toInt() == -1); // new Qt will be reset to invalid! } if (templateKit != defaultKit) diff --git a/src/plugins/qtsupport/qtsupportplugin.cpp b/src/plugins/qtsupport/qtsupportplugin.cpp index 2d99d01e38..bfb12a671a 100644 --- a/src/plugins/qtsupport/qtsupportplugin.cpp +++ b/src/plugins/qtsupport/qtsupportplugin.cpp @@ -84,7 +84,7 @@ bool QtSupportPlugin::initialize(const QStringList &arguments, QString *errorMes d = new QtSupportPluginPrivate; - ProjectExplorer::KitManager::registerKitInformation(); + ProjectExplorer::KitManager::registerKitAspect(); (void) new UicGeneratorFactory(this); (void) new QScxmlcGeneratorFactory(this); @@ -100,7 +100,7 @@ static QString qmakeProperty(const char *propertyName) if (!project || !project->activeTarget()) return QString(); - const BaseQtVersion *qtVersion = QtKitInformation::qtVersion(project->activeTarget()->kit()); + const BaseQtVersion *qtVersion = QtKitAspect::qtVersion(project->activeTarget()->kit()); if (!qtVersion) return QString(); return qtVersion->qmakeProperty(propertyName); diff --git a/src/plugins/qtsupport/uicgenerator.cpp b/src/plugins/qtsupport/uicgenerator.cpp index a88619e521..fd201a525c 100644 --- a/src/plugins/qtsupport/uicgenerator.cpp +++ b/src/plugins/qtsupport/uicgenerator.cpp @@ -55,9 +55,9 @@ Utils::FileName UicGenerator::command() const QtSupport::BaseQtVersion *version = nullptr; Target *target; if ((target = project()->activeTarget())) - version = QtSupport::QtKitInformation::qtVersion(target->kit()); + version = QtSupport::QtKitAspect::qtVersion(target->kit()); else - version = QtSupport::QtKitInformation::qtVersion(KitManager::defaultKit()); + version = QtSupport::QtKitAspect::qtVersion(KitManager::defaultKit()); if (!version) return Utils::FileName(); diff --git a/src/plugins/remotelinux/abstractremotelinuxdeployservice.cpp b/src/plugins/remotelinux/abstractremotelinuxdeployservice.cpp index 12e47ca0d2..2d5f308ee5 100644 --- a/src/plugins/remotelinux/abstractremotelinuxdeployservice.cpp +++ b/src/plugins/remotelinux/abstractremotelinuxdeployservice.cpp @@ -114,7 +114,7 @@ bool AbstractRemoteLinuxDeployService::hasRemoteFileChanged( void AbstractRemoteLinuxDeployService::setTarget(Target *target) { d->target = target; - d->deviceConfiguration = DeviceKitInformation::device(profile()); + d->deviceConfiguration = DeviceKitAspect::device(profile()); } void AbstractRemoteLinuxDeployService::setDevice(const IDevice::ConstPtr &device) diff --git a/src/plugins/remotelinux/deploymenttimeinfo.cpp b/src/plugins/remotelinux/deploymenttimeinfo.cpp index d3b9dcee61..e43dd75ca7 100644 --- a/src/plugins/remotelinux/deploymenttimeinfo.cpp +++ b/src/plugins/remotelinux/deploymenttimeinfo.cpp @@ -88,8 +88,8 @@ public: QString host; if (kit) { - systemRoot = SysRootKitInformation::sysRoot(kit).toString(); - const IDevice::ConstPtr deviceConfiguration = DeviceKitInformation::device(kit); + systemRoot = SysRootKitAspect::sysRoot(kit).toString(); + const IDevice::ConstPtr deviceConfiguration = DeviceKitAspect::device(kit); host = deviceConfiguration->sshParameters().host(); } diff --git a/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp b/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp index 11723a5a25..5f2ad0b594 100644 --- a/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp +++ b/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp @@ -63,11 +63,11 @@ RemoteLinuxDeployConfigurationFactory::RemoteLinuxDeployConfigurationFactory() addInitialStep(RemoteLinuxCheckForFreeDiskSpaceStep::stepId()); addInitialStep(RemoteLinuxKillAppStep::stepId()); addInitialStep(RsyncDeployStep::stepId(), [](Target *target) { - auto device = DeviceKitInformation::device(target->kit()).staticCast(); + auto device = DeviceKitAspect::device(target->kit()).staticCast(); return device && device->supportsRSync(); }); addInitialStep(GenericDirectUploadStep::stepId(), [](Target *target) { - auto device = DeviceKitInformation::device(target->kit()).staticCast(); + auto device = DeviceKitAspect::device(target->kit()).staticCast(); return device && !device->supportsRSync(); }); } diff --git a/src/plugins/remotelinux/remotelinuxenvironmentaspectwidget.cpp b/src/plugins/remotelinux/remotelinuxenvironmentaspectwidget.cpp index 4f06d741e7..28e87fd880 100644 --- a/src/plugins/remotelinux/remotelinuxenvironmentaspectwidget.cpp +++ b/src/plugins/remotelinux/remotelinuxenvironmentaspectwidget.cpp @@ -50,7 +50,7 @@ RemoteLinuxEnvironmentAspectWidget::RemoteLinuxEnvironmentAspectWidget (RemoteLinuxEnvironmentAspect *aspect, Target *target) : EnvironmentAspectWidget(aspect, new QPushButton) { - IDevice::ConstPtr device = DeviceKitInformation::device(target->kit()); + IDevice::ConstPtr device = DeviceKitAspect::device(target->kit()); deviceEnvReader = new RemoteLinuxEnvironmentReader(device, this); connect(target, &ProjectExplorer::Target::kitChanged, diff --git a/src/plugins/remotelinux/remotelinuxplugin.cpp b/src/plugins/remotelinux/remotelinuxplugin.cpp index 25b8eb5e89..c9b3277681 100644 --- a/src/plugins/remotelinux/remotelinuxplugin.cpp +++ b/src/plugins/remotelinux/remotelinuxplugin.cpp @@ -103,7 +103,7 @@ bool RemoteLinuxPlugin::initialize(const QStringList &arguments, QString *errorM dd = new RemoteLinuxPluginPrivate; auto constraint = [](RunConfiguration *runConfig) { - const Core::Id devType = ProjectExplorer::DeviceTypeKitInformation::deviceTypeId( + const Core::Id devType = ProjectExplorer::DeviceTypeKitAspect::deviceTypeId( runConfig->target()->kit()); if (devType != Constants::GenericLinuxOsType) diff --git a/src/plugins/remotelinux/typespecificdeviceconfigurationlistmodel.cpp b/src/plugins/remotelinux/typespecificdeviceconfigurationlistmodel.cpp index 56068064ec..86a9d608fa 100644 --- a/src/plugins/remotelinux/typespecificdeviceconfigurationlistmodel.cpp +++ b/src/plugins/remotelinux/typespecificdeviceconfigurationlistmodel.cpp @@ -126,7 +126,7 @@ bool TypeSpecificDeviceConfigurationListModel::deviceMatches(IDevice::ConstPtr d { if (dev.isNull()) return false; - Core::Id typeId = DeviceTypeKitInformation::deviceTypeId(target()->kit()); + Core::Id typeId = DeviceTypeKitAspect::deviceTypeId(target()->kit()); return dev->type() == typeId; } diff --git a/src/plugins/valgrind/memchecktool.cpp b/src/plugins/valgrind/memchecktool.cpp index aaea6ba4d5..c32a2a1ab7 100644 --- a/src/plugins/valgrind/memchecktool.cpp +++ b/src/plugins/valgrind/memchecktool.cpp @@ -709,14 +709,14 @@ void MemcheckTool::heobAction() if (RunConfiguration *rc = target->activeRunConfiguration()) { kit = target->kit(); if (kit) { - abi = ToolChainKitInformation::targetAbi(kit); + abi = ToolChainKitAspect::targetAbi(kit); const Runnable runnable = rc->runnable(); sr = runnable; const IDevice::ConstPtr device = sr.device; hasLocalRc = device && device->type() == ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE; if (!hasLocalRc) - hasLocalRc = DeviceTypeKitInformation::deviceTypeId(kit) == ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE; + hasLocalRc = DeviceTypeKitAspect::deviceTypeId(kit) == ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE; } } } @@ -1512,7 +1512,7 @@ void HeobData::processFinished() auto debugger = new DebuggerRunTool(m_runControl, m_kit); debugger->setAttachPid(ProcessHandle(m_data[1])); debugger->setRunControlName(tr("Process %1").arg(m_data[1])); - debugger->setInferiorDevice(DeviceKitInformation::device(m_kit)); + debugger->setInferiorDevice(DeviceKitAspect::device(m_kit)); debugger->setStartMode(AttachExternal); debugger->setCloseMode(DetachAtClose); debugger->setContinueAfterAttach(true); diff --git a/src/plugins/winrt/winrtpackagedeploymentstep.cpp b/src/plugins/winrt/winrtpackagedeploymentstep.cpp index 6798338227..093947c64d 100644 --- a/src/plugins/winrt/winrtpackagedeploymentstep.cpp +++ b/src/plugins/winrt/winrtpackagedeploymentstep.cpp @@ -87,7 +87,7 @@ bool WinRtPackageDeploymentStep::init() if (!m_targetDirPath.endsWith(QLatin1Char('/'))) m_targetDirPath += QLatin1Char('/'); - const QtSupport::BaseQtVersion *qt = QtSupport::QtKitInformation::qtVersion(target()->kit()); + const QtSupport::BaseQtVersion *qt = QtSupport::QtKitAspect::qtVersion(target()->kit()); if (!qt) return false; @@ -116,7 +116,7 @@ bool WinRtPackageDeploymentStep::init() void WinRtPackageDeploymentStep::doRun() { - const QtSupport::BaseQtVersion *qt = QtSupport::QtKitInformation::qtVersion(target()->kit()); + const QtSupport::BaseQtVersion *qt = QtSupport::QtKitAspect::qtVersion(target()->kit()); if (!qt) return; diff --git a/src/plugins/winrt/winrtplugin.cpp b/src/plugins/winrt/winrtplugin.cpp index e2156b6d82..f2325a59ff 100644 --- a/src/plugins/winrt/winrtplugin.cpp +++ b/src/plugins/winrt/winrtplugin.cpp @@ -75,14 +75,14 @@ bool WinRtPlugin::initialize(const QStringList &arguments, QString *errorMessage m_runData = new WinRtPluginRunData; auto runConstraint = [](RunConfiguration *runConfig) { - IDevice::ConstPtr device = DeviceKitInformation::device(runConfig->target()->kit()); + IDevice::ConstPtr device = DeviceKitAspect::device(runConfig->target()->kit()); if (!device) return false; return qobject_cast(runConfig) != nullptr; }; auto debugConstraint = [](RunConfiguration *runConfig) { - IDevice::ConstPtr device = DeviceKitInformation::device(runConfig->target()->kit()); + IDevice::ConstPtr device = DeviceKitAspect::device(runConfig->target()->kit()); if (!device) return false; if (device->type() != Internal::Constants::WINRT_DEVICE_TYPE_LOCAL) diff --git a/src/plugins/winrt/winrtrunconfiguration.cpp b/src/plugins/winrt/winrtrunconfiguration.cpp index 09986bd95b..663ffdea91 100644 --- a/src/plugins/winrt/winrtrunconfiguration.cpp +++ b/src/plugins/winrt/winrtrunconfiguration.cpp @@ -71,7 +71,7 @@ WinRtRunConfiguration::WinRtRunConfiguration(Target *target, Core::Id id) addAspect(); const QtSupport::BaseQtVersion *qt - = QtSupport::QtKitInformation::qtVersion(target->kit()); + = QtSupport::QtKitAspect::qtVersion(target->kit()); if (qt && qt->qtVersion() >= QtSupport::QtVersionNumber(5, 12, 0)) { addAspect(); addAspect(); diff --git a/src/plugins/winrt/winrtruncontrol.cpp b/src/plugins/winrt/winrtruncontrol.cpp index d8faa0ab48..c5a365edef 100644 --- a/src/plugins/winrt/winrtruncontrol.cpp +++ b/src/plugins/winrt/winrtruncontrol.cpp @@ -41,7 +41,7 @@ #include -using ProjectExplorer::DeviceKitInformation; +using ProjectExplorer::DeviceKitAspect; using ProjectExplorer::IDevice; using ProjectExplorer::RunControl; using Core::Id; diff --git a/src/plugins/winrt/winrtrunnerhelper.cpp b/src/plugins/winrt/winrtrunnerhelper.cpp index 1ddc49c005..bbb17f67b3 100644 --- a/src/plugins/winrt/winrtrunnerhelper.cpp +++ b/src/plugins/winrt/winrtrunnerhelper.cpp @@ -55,7 +55,7 @@ WinRtRunnerHelper::WinRtRunnerHelper(ProjectExplorer::RunWorker *runWorker, QStr ProjectExplorer::Target *target = runConfiguration->target(); m_device = runWorker->device().dynamicCast(); - const QtSupport::BaseQtVersion *qt = QtSupport::QtKitInformation::qtVersion(target->kit()); + const QtSupport::BaseQtVersion *qt = QtSupport::QtKitAspect::qtVersion(target->kit()); if (!qt) { *errorMessage = tr("The current kit has no Qt version."); return; diff --git a/src/tools/sdktool/addkitoperation.cpp b/src/tools/sdktool/addkitoperation.cpp index b1c480811e..9cdba2a0b2 100644 --- a/src/tools/sdktool/addkitoperation.cpp +++ b/src/tools/sdktool/addkitoperation.cpp @@ -57,7 +57,7 @@ const char SDK[] = "PE.Profile.SDK"; const char ENV[] = "PE.Profile.Environment"; const char DATA[] = "PE.Profile.Data"; -// Standard KitInformation: +// Standard KitAspects: const char DEBUGGER[] = "Debugger.Information"; const char DEBUGGER_ENGINE[] = "EngineType"; const char DEBUGGER_BINARY[] = "Binary"; -- cgit v1.2.1