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

ProjectExplorer: Use setter for IDevice::type

Browse Source 
Second step towards streamlining the IDevice::ctor/create lines
of functions.

Change-Id: I8b0f2270a9f6545ff9419ef8cf44b456c2233223
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2019-01-14 16:11:27 +01:00
parent 75bce4332d
commit 09c1c170d2
19 changed files with 52 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -79,11 +79,10 @@ namespace Ios {
namespace Internal {
IosDevice::IosDevice()
: IDevice(Core::Id(Constants::IOS_DEVICE_TYPE),
IDevice::AutoDetected,
Constants::IOS_DEVICE_ID),
: IDevice(IDevice::AutoDetected, Constants::IOS_DEVICE_ID),
m_lastPort(Constants::IOS_DEVICE_PORT_START)
{
setType(Constants::IOS_DEVICE_TYPE);
setDisplayName(IosDevice::name());
setMachineType(IDevice::Hardware);
setDeviceState(DeviceDisconnected);
@@ -96,11 +95,10 @@ IosDevice::IosDevice()
IosDevice::IosDevice(const IosDevice &other) = default;
IosDevice::IosDevice(const QString &uid)
: IDevice(Core::Id(Constants::IOS_DEVICE_TYPE),
IDevice::AutoDetected,
Core::Id(Constants::IOS_DEVICE_ID).withSuffix(uid)),
: IDevice(IDevice::AutoDetected, Core::Id(Constants::IOS_DEVICE_ID).withSuffix(uid)),
m_lastPort(Constants::IOS_DEVICE_PORT_START)
{
setType(Constants::IOS_DEVICE_TYPE);
setDisplayName(IosDevice::name());
setMachineType(IDevice::Hardware);
setDeviceState(DeviceDisconnected);

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

@@ -45,22 +45,20 @@ static const QLatin1String iosDeviceTypeTypeKey = QLatin1String("type");
static const QLatin1String iosDeviceTypeIdentifierKey = QLatin1String("identifier");
IosSimulator::IosSimulator(Core::Id id)
: IDevice(Core::Id(Constants::IOS_SIMULATOR_TYPE),
IDevice::AutoDetected,
id),
: IDevice(IDevice::AutoDetected, id),
m_lastPort(Constants::IOS_SIMULATOR_PORT_START)
{
setType(Constants::IOS_SIMULATOR_TYPE);
setMachineType(IDevice::Emulator);
setDisplayName(QCoreApplication::translate("Ios::Internal::IosSimulator", "iOS Simulator"));
setDeviceState(DeviceReadyToUse);
}
IosSimulator::IosSimulator()
: IDevice(Core::Id(Constants::IOS_SIMULATOR_TYPE),
IDevice::AutoDetected,
Core::Id(Constants::IOS_SIMULATOR_DEVICE_ID)),
: IDevice(IDevice::AutoDetected, Core::Id(Constants::IOS_SIMULATOR_DEVICE_ID)),
m_lastPort(Constants::IOS_SIMULATOR_PORT_START)
{
setType(Constants::IOS_SIMULATOR_TYPE);
setMachineType(IDevice::Emulator);
setDisplayName(QCoreApplication::translate("Ios::Internal::IosSimulator", "iOS Simulator"));
setDeviceState(DeviceReadyToUse);