feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Core/Utils: Migrate further to Utils::Id

Browse Source 
The coreplugin/id.h header is kept for downstream for now.

Change-Id: I8c44590f7b988b3770ecdc177c40783e12353e66
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2020-06-26 13:59:38 +02:00
parent 4924392620
commit 430a33dcd9
655 changed files with 2115 additions and 2093 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/ios/iosbuildconfiguration.cpp
View File

@@ -375,7 +375,7 @@ void IosBuildSettingsWidget::updateWarningText()
// IosBuildConfiguration
IosBuildConfiguration::IosBuildConfiguration(Target *target, Core::Id id)
IosBuildConfiguration::IosBuildConfiguration(Target *target, Utils::Id id)
: QmakeBuildConfiguration(target, id)
{
m_signingIdentifier = addAspect<BaseStringAspect>();
@@ -422,7 +422,7 @@ void IosBuildConfiguration::updateQmakeCommand()
if (signingIdentifier.isEmpty() )
extraArgs << forceOverrideArg;
Core::Id devType = DeviceTypeKitAspect::deviceTypeId(target()->kit());
Utils::Id devType = DeviceTypeKitAspect::deviceTypeId(target()->kit());
if (devType == Constants::IOS_DEVICE_TYPE && !signingIdentifier.isEmpty()) {
if (m_autoManagedSigning->value()) {
extraArgs << qmakeIosTeamSettings + signingIdentifier;

2
src/plugins/ios/iosbuildconfiguration.h
View File

@@ -36,7 +36,7 @@ class IosBuildConfiguration : public QmakeProjectManager::QmakeBuildConfiguratio
Q_OBJECT
public:
IosBuildConfiguration(ProjectExplorer::Target *target, Core::Id id);
IosBuildConfiguration(ProjectExplorer::Target *target, Utils::Id id);
private:
friend class IosBuildSettingsWidget;

2
src/plugins/ios/iosbuildstep.cpp
View File

@@ -71,7 +71,7 @@ class IosBuildStep final : public AbstractProcessStep
Q_DECLARE_TR_FUNCTIONS(Ios::Internal::IosBuildStep)
public:
IosBuildStep(BuildStepList *parent, Core::Id id);
IosBuildStep(BuildStepList *parent, Utils::Id id);
BuildStepConfigWidget *createConfigWidget() final;
void setBaseArguments(const QStringList &args);

14
src/plugins/ios/iosconfigurations.cpp
View File

@@ -98,7 +98,7 @@ const char profileTeamIdTag[] = "TeamIdentifier";
static const QString xcodePlistPath = QDir::homePath() + "/Library/Preferences/com.apple.dt.Xcode.plist";
static const QString provisioningProfileDirPath = QDir::homePath() + "/Library/MobileDevice/Provisioning Profiles";
static Core::Id deviceId(const QString &sdkName)
static Utils::Id deviceId(const QString &sdkName)
{
if (sdkName.startsWith("iphoneos", Qt::CaseInsensitive))
return Constants::IOS_DEVICE_TYPE;
@@ -107,7 +107,7 @@ static Core::Id deviceId(const QString &sdkName)
return {};
}
static bool isSimulatorDeviceId(const Core::Id &id)
static bool isSimulatorDeviceId(const Utils::Id &id)
{
return id == Constants::IOS_SIMULATOR_TYPE;
}
@@ -168,7 +168,7 @@ static QHash<XcodePlatform::ToolchainTarget, ToolChainPair> findToolChains(const
static QSet<Kit *> existingAutoDetectedIosKits()
{
return Utils::toSet(Utils::filtered(KitManager::kits(), [](Kit *kit) -> bool {
Core::Id deviceKind = DeviceTypeKitAspect::deviceTypeId(kit);
Utils::Id deviceKind = DeviceTypeKitAspect::deviceTypeId(kit);
return kit->isAutoDetected() && (deviceKind == Constants::IOS_DEVICE_TYPE
|| deviceKind == Constants::IOS_SIMULATOR_TYPE);
}));
@@ -180,7 +180,7 @@ static void printKits(const QSet<Kit *> &kits)
qCDebug(kitSetupLog) << " -" << kit->displayName();
}
static void setupKit(Kit *kit, Core::Id pDeviceType, const ToolChainPair& toolChains,
static void setupKit(Kit *kit, Utils::Id pDeviceType, const ToolChainPair& toolChains,
const QVariant &debuggerId, const Utils::FilePath &sdkPath, BaseQtVersion *qtVersion)
{
DeviceTypeKitAspect::setDeviceTypeId(kit, pDeviceType);
@@ -276,7 +276,7 @@ void IosConfigurations::updateAutomaticKitList()
qCDebug(kitSetupLog) << " - No tool chain found";
continue;
}
Core::Id pDeviceType = deviceId(sdk.directoryName);
Utils::Id pDeviceType = deviceId(sdk.directoryName);
if (!pDeviceType.isValid()) {
qCDebug(kitSetupLog) << "Unsupported/Invalid device type" << sdk.directoryName;
continue;
@@ -416,7 +416,7 @@ void IosConfigurations::updateSimulators()
{
// currently we have just one simulator
DeviceManager *devManager = DeviceManager::instance();
Core::Id devId = Constants::IOS_SIMULATOR_DEVICE_ID;
Utils::Id devId = Constants::IOS_SIMULATOR_DEVICE_ID;
IDevice::ConstPtr dev = devManager->find(devId);
if (dev.isNull()) {
dev = IDevice::ConstPtr(new IosSimulator(devId));
@@ -590,7 +590,7 @@ QList<ToolChain *> IosToolChainFactory::autoDetect(const QList<ToolChain *> &exi
for (const XcodePlatform::ToolchainTarget &target : platform.targets) {
ToolChainPair platformToolchains = findToolChainForPlatform(platform, target,
existingClangToolChains);
auto createOrAdd = [&](ClangToolChain *toolChain, Core::Id l) {
auto createOrAdd = [&](ClangToolChain *toolChain, Utils::Id l) {
if (!toolChain) {
toolChain = new ClangToolChain;
toolChain->setDetection(ToolChain::AutoDetection);

6
src/plugins/ios/iosdeploystep.cpp
View File

@@ -65,7 +65,7 @@ public:
TransferFailed
};
IosDeployStep(BuildStepList *bc, Core::Id id);
IosDeployStep(BuildStepList *bc, Utils::Id id);
private:
void cleanup();
@@ -99,7 +99,7 @@ private:
bool m_expectFail = false;
};
IosDeployStep::IosDeployStep(BuildStepList *parent, Core::Id id)
IosDeployStep::IosDeployStep(BuildStepList *parent, Utils::Id id)
: BuildStep(parent, id)
{
setImmutable(true);
@@ -322,7 +322,7 @@ IosDeployStepFactory::IosDeployStepFactory()
setRepeatable(false);
}
Core::Id IosDeployStepFactory::stepId()
Utils::Id IosDeployStepFactory::stepId()
{
return "Qt4ProjectManager.IosDeployStep";
}

2
src/plugins/ios/iosdeploystep.h
View File

@@ -35,7 +35,7 @@ class IosDeployStepFactory final : public ProjectExplorer::BuildStepFactory
public:
IosDeployStepFactory();
static Core::Id stepId();
static Utils::Id stepId();
};
} // namespace Internal

24
src/plugins/ios/iosdevice.cpp
View File

@@ -112,7 +112,7 @@ IosDevice::IosDevice()
IosDevice::IosDevice(const QString &uid)
: IosDevice(CtorHelper{})
{
setupId(IDevice::AutoDetected, Core::Id(Constants::IOS_DEVICE_ID).withSuffix(uid));
setupId(IDevice::AutoDetected, Utils::Id(Constants::IOS_DEVICE_ID).withSuffix(uid));
}
IDevice::DeviceInfo IosDevice::deviceInformation() const
@@ -158,7 +158,7 @@ QVariantMap IosDevice::toMap() const
QString IosDevice::uniqueDeviceID() const
{
return id().suffixAfter(Core::Id(Constants::IOS_DEVICE_ID));
return id().suffixAfter(Utils::Id(Constants::IOS_DEVICE_ID));
}
QString IosDevice::name()
@@ -209,9 +209,9 @@ IosDeviceManager::TranslationMap IosDeviceManager::translationMap()
void IosDeviceManager::deviceConnected(const QString &uid, const QString &name)
{
DeviceManager *devManager = DeviceManager::instance();
Core::Id baseDevId(Constants::IOS_DEVICE_ID);
Core::Id devType(Constants::IOS_DEVICE_TYPE);
Core::Id devId = baseDevId.withSuffix(uid);
Utils::Id baseDevId(Constants::IOS_DEVICE_ID);
Utils::Id devType(Constants::IOS_DEVICE_TYPE);
Utils::Id devId = baseDevId.withSuffix(uid);
IDevice::ConstPtr dev = devManager->find(devId);
if (dev.isNull()) {
auto newDev = new IosDevice(uid);
@@ -234,9 +234,9 @@ void IosDeviceManager::deviceDisconnected(const QString &uid)
{
qCDebug(detectLog) << "detected disconnection of ios device " << uid;
DeviceManager *devManager = DeviceManager::instance();
Core::Id baseDevId(Constants::IOS_DEVICE_ID);
Core::Id devType(Constants::IOS_DEVICE_TYPE);
Core::Id devId = baseDevId.withSuffix(uid);
Utils::Id baseDevId(Constants::IOS_DEVICE_ID);
Utils::Id devType(Constants::IOS_DEVICE_TYPE);
Utils::Id devId = baseDevId.withSuffix(uid);
IDevice::ConstPtr dev = devManager->find(devId);
if (dev.isNull() || dev->type() != devType) {
qCWarning(detectLog) << "ignoring disconnection of ios device " << uid; // should neve happen
@@ -266,9 +266,9 @@ void IosDeviceManager::deviceInfo(IosToolHandler *, const QString &uid,
const Ios::IosToolHandler::Dict &info)
{
DeviceManager *devManager = DeviceManager::instance();
Core::Id baseDevId(Constants::IOS_DEVICE_ID);
Core::Id devType(Constants::IOS_DEVICE_TYPE);
Core::Id devId = baseDevId.withSuffix(uid);
Utils::Id baseDevId(Constants::IOS_DEVICE_ID);
Utils::Id devType(Constants::IOS_DEVICE_TYPE);
Utils::Id devId = baseDevId.withSuffix(uid);
IDevice::ConstPtr dev = devManager->find(devId);
bool skipUpdate = false;
IosDevice *newDev = nullptr;
@@ -519,7 +519,7 @@ void IosDeviceManager::updateAvailableDevices(const QStringList &devices)
DeviceManager *devManager = DeviceManager::instance();
for (int iDevice = 0; iDevice < devManager->deviceCount(); ++iDevice) {
IDevice::ConstPtr dev = devManager->deviceAt(iDevice);
Core::Id devType(Constants::IOS_DEVICE_TYPE);
Utils::Id devType(Constants::IOS_DEVICE_TYPE);
if (dev.isNull() || dev->type() != devType)
continue;
auto iosDev = static_cast<const IosDevice *>(dev.data());

2
src/plugins/ios/iosdsymbuildstep.h
View File

@@ -42,7 +42,7 @@ class IosDsymBuildStep : public ProjectExplorer::AbstractProcessStep
friend class IosDsymBuildStepConfigWidget;
public:
IosDsymBuildStep(ProjectExplorer::BuildStepList *parent, Core::Id id);
IosDsymBuildStep(ProjectExplorer::BuildStepList *parent, Utils::Id id);
ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override;
void setArguments(const QStringList &args);

6
src/plugins/ios/iosqtversion.cpp
View File

@@ -78,16 +78,16 @@ QString IosQtVersion::description() const
return tr("iOS");
}
QSet<Core::Id> IosQtVersion::availableFeatures() const
QSet<Utils::Id> IosQtVersion::availableFeatures() const
{
QSet<Core::Id> features = QtSupport::BaseQtVersion::availableFeatures();
QSet<Utils::Id> features = QtSupport::BaseQtVersion::availableFeatures();
features.insert(QtSupport::Constants::FEATURE_MOBILE);
features.remove(QtSupport::Constants::FEATURE_QT_CONSOLE);
features.remove(QtSupport::Constants::FEATURE_QT_WEBKIT);
return features;
}
QSet<Core::Id> IosQtVersion::targetDeviceTypes() const
QSet<Utils::Id> IosQtVersion::targetDeviceTypes() const
{
// iOS Qt version supports ios devices as well as simulator.
return {Constants::IOS_DEVICE_TYPE, Constants::IOS_SIMULATOR_TYPE};

4
src/plugins/ios/iosqtversion.h
View File

@@ -45,8 +45,8 @@ public:
ProjectExplorer::Abis detectQtAbis() const override;
QSet<Core::Id> availableFeatures() const override;
QSet<Core::Id> targetDeviceTypes() const override;
QSet<Utils::Id> availableFeatures() const override;
QSet<Utils::Id> targetDeviceTypes() const override;
QString description() const override;
};

8
src/plugins/ios/iosrunconfiguration.cpp
View File

@@ -102,7 +102,7 @@ public:
QComboBox *m_deviceTypeComboBox = nullptr;
};
IosRunConfiguration::IosRunConfiguration(Target *target, Core::Id id)
IosRunConfiguration::IosRunConfiguration(Target *target, Utils::Id id)
: RunConfiguration(target, id)
{
auto executableAspect = addAspect<ExecutableAspect>();
@@ -140,7 +140,7 @@ void IosDeviceTypeAspect::updateDeviceType()
bool IosRunConfiguration::isEnabled() const
{
Core::Id devType = DeviceTypeKitAspect::deviceTypeId(target()->kit());
Utils::Id devType = DeviceTypeKitAspect::deviceTypeId(target()->kit());
if (devType != Constants::IOS_DEVICE_TYPE && devType != Constants::IOS_SIMULATOR_TYPE)
return false;
@@ -162,7 +162,7 @@ QString IosRunConfiguration::applicationName() const
FilePath IosRunConfiguration::bundleDirectory() const
{
Core::Id devType = DeviceTypeKitAspect::deviceTypeId(target()->kit());
Utils::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();
@@ -220,7 +220,7 @@ void IosDeviceTypeAspect::toMap(QVariantMap &map) const
QString IosRunConfiguration::disabledReason() const
{
Core::Id devType = DeviceTypeKitAspect::deviceTypeId(target()->kit());
Utils::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 = DeviceKitAspect::device(target()->kit());

2
src/plugins/ios/iosrunconfiguration.h
View File

@@ -42,7 +42,7 @@ class IosRunConfiguration : public ProjectExplorer::RunConfiguration
Q_OBJECT
public:
IosRunConfiguration(ProjectExplorer::Target *target, Core::Id id);
IosRunConfiguration(ProjectExplorer::Target *target, Utils::Id id);
QString applicationName() const;
Utils::FilePath bundleDirectory() const;

4
src/plugins/ios/iosrunner.cpp
View File

@@ -75,10 +75,10 @@ namespace Internal {
static void stopRunningRunControl(RunControl *runControl)
{
static QMap<Core::Id, QPointer<RunControl>> activeRunControls;
static QMap<Utils::Id, QPointer<RunControl>> activeRunControls;
Target *target = runControl->target();
Core::Id devId = DeviceKitAspect::deviceId(target->kit());
Utils::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)) {

2
src/plugins/ios/iossimulator.cpp
View File

@@ -44,7 +44,7 @@ static const QLatin1String iosDeviceTypeDisplayNameKey = QLatin1String("displayN
static const QLatin1String iosDeviceTypeTypeKey = QLatin1String("type");
static const QLatin1String iosDeviceTypeIdentifierKey = QLatin1String("identifier");
IosSimulator::IosSimulator(Core::Id id)
IosSimulator::IosSimulator(Utils::Id id)
: m_lastPort(Constants::IOS_SIMULATOR_PORT_START)
{
setupId(IDevice::AutoDetected, id);

2
src/plugins/ios/iossimulator.h
View File

@@ -80,7 +80,7 @@ protected:
friend class IosSimulatorFactory;
friend class IosConfigurations;
IosSimulator();
IosSimulator(Core::Id id);
IosSimulator(Utils::Id id);
private:
mutable quint16 m_lastPort;