ProjectExplorer: More name disambiguation for device kit aspects

Finishing 73b0875498b662128c18f794fa9b7e477b0571de.

Change-Id: I225ec83400a4e70d0fe933e8529db289b46f4a81
Reviewed-by: hjk <[email protected]>

3 files changed, 11 insertions, 11 deletions

diff --git a/src/plugins/ios/iosbuildconfiguration.cpp b/src/plugins/ios/iosbuildconfiguration.cpp
index ba911f773e7..cdccff57fa4 100644
--- a/src/plugins/ios/iosbuildconfiguration.cpp
+++ b/src/plugins/ios/iosbuildconfiguration.cpp
@@ -87,7 +87,7 @@ IosSigningSettingsWidget::IosSigningSettingsWidget(BuildConfiguration *buildConf
     : NamedWidget(Tr::tr("iOS Settings"))
     , m_autoManagedSigning(autoManagedSigning)
     , m_signingIdentifier(signingIdentifier)
-    , m_isDevice(DeviceTypeKitAspect::deviceTypeId(buildConfiguration->kit())
+    , m_isDevice(RunDeviceTypeKitAspect::deviceTypeId(buildConfiguration->kit())
                  == Constants::IOS_DEVICE_TYPE)
 {
     auto detailsWidget = new Utils::DetailsWidget(this);
@@ -455,7 +455,7 @@ void IosQmakeBuildConfiguration::updateQmakeCommand()
         if (signingIdentifier.isEmpty() )
             extraArgs << forceOverrideArg;
 
-        Utils::Id devType = DeviceTypeKitAspect::deviceTypeId(kit());
+        Utils::Id devType = RunDeviceTypeKitAspect::deviceTypeId(kit());
         if (devType == Constants::IOS_DEVICE_TYPE && !signingIdentifier.isEmpty()) {
             if (m_autoManagedSigning()) {
                 extraArgs << qmakeIosTeamSettings + signingIdentifier;
@@ -533,7 +533,7 @@ QList<NamedWidget *> IosCMakeBuildConfiguration::createSubConfigWidgets()
 
 CMakeConfig IosCMakeBuildConfiguration::signingFlags() const
 {
-    if (DeviceTypeKitAspect::deviceTypeId(kit()) != Constants::IOS_DEVICE_TYPE)
+    if (RunDeviceTypeKitAspect::deviceTypeId(kit()) != Constants::IOS_DEVICE_TYPE)
         return {};
     const QString signingIdentifier = m_signingIdentifier();
     if (m_autoManagedSigning()) {
diff --git a/src/plugins/ios/iosconfigurations.cpp b/src/plugins/ios/iosconfigurations.cpp
index ce66978151e..b9eeea159be 100644
--- a/src/plugins/ios/iosconfigurations.cpp
+++ b/src/plugins/ios/iosconfigurations.cpp
@@ -154,7 +154,7 @@ static QHash<XcodePlatform::ToolchainTarget, ToolchainPair> findToolchains(const
 static QSet<Kit *> existingAutoDetectedIosKits()
 {
     return toSet(filtered(KitManager::kits(), [](Kit *kit) -> bool {
-        Id deviceKind = DeviceTypeKitAspect::deviceTypeId(kit);
+        Id deviceKind = RunDeviceTypeKitAspect::deviceTypeId(kit);
         return kit->isAutoDetected() && (deviceKind == Constants::IOS_DEVICE_TYPE
                                          || deviceKind == Constants::IOS_SIMULATOR_TYPE);
     }));
@@ -169,7 +169,7 @@ static void printKits(const QSet<Kit *> &kits)
 static void setupKit(Kit *kit, Id pDeviceType, const ToolchainPair& toolchains,
                      const QVariant &debuggerId, const FilePath &sdkPath, QtVersion *qtVersion)
 {
-    DeviceTypeKitAspect::setDeviceTypeId(kit, pDeviceType);
+    RunDeviceTypeKitAspect::setDeviceTypeId(kit, pDeviceType);
     if (toolchains.first)
         ToolchainKitAspect::setToolchain(kit, toolchains.first);
     else
@@ -190,7 +190,7 @@ static void setupKit(Kit *kit, Id pDeviceType, const ToolchainPair& toolchains,
 
     kit->setSticky(QtKitAspect::id(), true);
     kit->setSticky(ToolchainKitAspect::id(), true);
-    kit->setSticky(DeviceTypeKitAspect::id(), true);
+    kit->setSticky(RunDeviceTypeKitAspect::id(), true);
     kit->setSticky(SysRootKitAspect::id(), true);
     kit->setSticky(DebuggerKitAspect::id(), false);
 
@@ -272,7 +272,7 @@ void IosConfigurations::updateAutomaticKitList()
                 Kit *kit = 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 DeviceTypeKitAspect::deviceTypeId(kit) == pDeviceType
+                    return RunDeviceTypeKitAspect::deviceTypeId(kit) == pDeviceType
                             && ToolchainKitAspect::cxxToolchain(kit) == platformToolchains.second
                             && ToolchainKitAspect::cToolchain(kit) == platformToolchains.first
                             && QtKitAspect::qtVersion(kit) == qtVersion;
diff --git a/src/plugins/ios/iosrunconfiguration.cpp b/src/plugins/ios/iosrunconfiguration.cpp
index 224ee7e313f..df7cc2bff64 100644
--- a/src/plugins/ios/iosrunconfiguration.cpp
+++ b/src/plugins/ios/iosrunconfiguration.cpp
@@ -82,7 +82,7 @@ void IosDeviceTypeAspect::deviceChanges()
 
 void IosDeviceTypeAspect::updateDeviceType()
 {
-    if (DeviceTypeKitAspect::deviceTypeId(m_runConfiguration->kit())
+    if (RunDeviceTypeKitAspect::deviceTypeId(m_runConfiguration->kit())
             == Constants::IOS_DEVICE_TYPE)
         m_deviceType = IosDeviceType(IosDeviceType::IosDevice);
     else if (m_deviceType.type == IosDeviceType::IosDevice)
@@ -91,7 +91,7 @@ void IosDeviceTypeAspect::updateDeviceType()
 
 bool IosRunConfiguration::isEnabled(Id runMode) const
 {
-    Utils::Id devType = DeviceTypeKitAspect::deviceTypeId(kit());
+    Utils::Id devType = RunDeviceTypeKitAspect::deviceTypeId(kit());
     if (devType != Constants::IOS_DEVICE_TYPE && devType != Constants::IOS_SIMULATOR_TYPE)
         return false;
     if (devType == Constants::IOS_SIMULATOR_TYPE)
@@ -120,7 +120,7 @@ QString IosRunConfiguration::applicationName() const
 
 FilePath IosRunConfiguration::bundleDirectory() const
 {
-    Utils::Id devType = DeviceTypeKitAspect::deviceTypeId(kit());
+    Utils::Id devType = RunDeviceTypeKitAspect::deviceTypeId(kit());
     bool isDevice = (devType == Constants::IOS_DEVICE_TYPE);
     if (!isDevice && devType != Constants::IOS_SIMULATOR_TYPE) {
         qCWarning(iosLog) << "unexpected device type in bundleDirForTarget: " << devType.toString();
@@ -233,7 +233,7 @@ void IosDeviceTypeAspect::toMap(Store &map) const
 
 QString IosRunConfiguration::disabledReason(Id runMode) const
 {
-    Utils::Id devType = DeviceTypeKitAspect::deviceTypeId(kit());
+    Utils::Id devType = RunDeviceTypeKitAspect::deviceTypeId(kit());
     if (devType != Constants::IOS_DEVICE_TYPE && devType != Constants::IOS_SIMULATOR_TYPE)
         return Tr::tr("Kit has incorrect device type for running on iOS devices.");
     IDevice::ConstPtr dev = RunDeviceKitAspect::device(kit());