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

ProjectExplorer: Use setter for IDevice::machineType

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

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

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

@@ -47,11 +47,11 @@ namespace Internal {
AndroidDevice::AndroidDevice()
: IDevice(Core::Id(Constants::ANDROID_DEVICE_TYPE),
IDevice::AutoDetected,
IDevice::Hardware,
Core::Id(Constants::ANDROID_DEVICE_ID))
IDevice::AutoDetected,
Core::Id(Constants::ANDROID_DEVICE_ID))
{
setDisplayName(QCoreApplication::translate("Android::Internal::AndroidDevice", "Run on Android"));
setMachineType(IDevice::Hardware);
setDeviceState(DeviceReadyToUse);
QString activityPath;
const AndroidConfig &config = AndroidConfigurations::currentConfig();

8
src/plugins/baremetal/baremetaldevice.cpp
View File

@@ -49,9 +49,9 @@ BareMetalDevice::Ptr BareMetalDevice::create()
return Ptr(new BareMetalDevice);
}
BareMetalDevice::Ptr BareMetalDevice::create(const QString &name, Core::Id type, MachineType machineType, Origin origin, Core::Id id)
BareMetalDevice::Ptr BareMetalDevice::create(const QString &name, Core::Id type, Origin origin, Core::Id id)
{
return Ptr(new BareMetalDevice(name, type, machineType, origin, id));
return Ptr(new BareMetalDevice(name, type, origin, id));
}
BareMetalDevice::Ptr BareMetalDevice::create(const BareMetalDevice &other)
@@ -169,8 +169,8 @@ DeviceProcess *BareMetalDevice::createProcess(QObject *parent) const
return new GdbServerProviderProcess(sharedFromThis(), parent);
}
BareMetalDevice::BareMetalDevice(const QString &name, Core::Id type, MachineType machineType, Origin origin, Core::Id id)
: IDevice(type, origin, machineType, id)
BareMetalDevice::BareMetalDevice(const QString &name, Core::Id type, Origin origin, Core::Id id)
: IDevice(type, origin, id)
{
setDisplayName(name);
}

4
src/plugins/baremetal/baremetaldevice.h
View File

@@ -40,7 +40,7 @@ public:
using ConstPtr = QSharedPointer<const BareMetalDevice>;
static Ptr create();
static Ptr create(const QString &name, Core::Id type, MachineType machineType,
static Ptr create(const QString &name, Core::Id type,
Origin origin = ManuallyAdded, Core::Id id = Core::Id());
static Ptr create(const BareMetalDevice &other);
@@ -66,7 +66,7 @@ public:
protected:
BareMetalDevice() = default;
BareMetalDevice(const QString &name, Core::Id type,
MachineType machineType, Origin origin, Core::Id id);
Origin origin, Core::Id id);
BareMetalDevice(const BareMetalDevice &other);
private:

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

@@ -46,9 +46,8 @@ BareMetalDeviceConfigurationWizard::BareMetalDeviceConfigurationWizard(QWidget *
ProjectExplorer::IDevice::Ptr BareMetalDeviceConfigurationWizard::device() const
{
auto dev = BareMetalDevice::create(m_setupPage->configurationName(),
Constants::BareMetalOsType,
ProjectExplorer::IDevice::Hardware);
Constants::BareMetalOsType);
dev->setMachineType(ProjectExplorer::IDevice::Hardware);
dev->setGdbServerProviderId(m_setupPage->gdbServerProviderId());
return dev;
}

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

@@ -81,11 +81,11 @@ namespace Internal {
IosDevice::IosDevice()
: IDevice(Core::Id(Constants::IOS_DEVICE_TYPE),
IDevice::AutoDetected,
IDevice::Hardware,
Constants::IOS_DEVICE_ID),
m_lastPort(Constants::IOS_DEVICE_PORT_START)
{
setDisplayName(IosDevice::name());
setMachineType(IDevice::Hardware);
setDeviceState(DeviceDisconnected);
Utils::PortList ports;
ports.addRange(Utils::Port(Constants::IOS_DEVICE_PORT_START),
@@ -98,11 +98,11 @@ IosDevice::IosDevice(const IosDevice &other) = default;
IosDevice::IosDevice(const QString &uid)
: IDevice(Core::Id(Constants::IOS_DEVICE_TYPE),
IDevice::AutoDetected,
IDevice::Hardware,
Core::Id(Constants::IOS_DEVICE_ID).withSuffix(uid)),
m_lastPort(Constants::IOS_DEVICE_PORT_START)
{
setDisplayName(IosDevice::name());
setMachineType(IDevice::Hardware);
setDeviceState(DeviceDisconnected);
}

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

@@ -47,21 +47,21 @@ static const QLatin1String iosDeviceTypeIdentifierKey = QLatin1String("identifie
IosSimulator::IosSimulator(Core::Id id)
: IDevice(Core::Id(Constants::IOS_SIMULATOR_TYPE),
IDevice::AutoDetected,
IDevice::Emulator,
id),
m_lastPort(Constants::IOS_SIMULATOR_PORT_START)
{
setMachineType(IDevice::Emulator);
setDisplayName(QCoreApplication::translate("Ios::Internal::IosSimulator", "iOS Simulator"));
setDeviceState(DeviceReadyToUse);
}
IosSimulator::IosSimulator()
: IDevice(Core::Id(Constants::IOS_SIMULATOR_TYPE),
IDevice::AutoDetected,
IDevice::Emulator,
Core::Id(Constants::IOS_SIMULATOR_DEVICE_ID)),
IDevice::AutoDetected,
Core::Id(Constants::IOS_SIMULATOR_DEVICE_ID)),
m_lastPort(Constants::IOS_SIMULATOR_PORT_START)
{
setMachineType(IDevice::Emulator);
setDisplayName(QCoreApplication::translate("Ios::Internal::IosSimulator", "iOS Simulator"));
setDeviceState(DeviceReadyToUse);
}

2
src/plugins/projectexplorer/devicesupport/desktopdevice.cpp
View File

@@ -50,11 +50,11 @@ namespace ProjectExplorer {
DesktopDevice::DesktopDevice() : IDevice(Core::Id(DESKTOP_DEVICE_TYPE),
IDevice::AutoDetected,
IDevice::Hardware,
Core::Id(DESKTOP_DEVICE_ID))
{
setDisplayName(QCoreApplication::translate("ProjectExplorer::DesktopDevice", "Local PC"));
setDeviceState(IDevice::DeviceStateUnknown);
setMachineType(IDevice::Hardware);
const QString portRange =
QString::fromLatin1("%1-%2").arg(DESKTOP_PORT_START).arg(DESKTOP_PORT_END);
setFreePorts(Utils::PortList::fromString(portRange));

5
src/plugins/projectexplorer/devicesupport/devicemanager.cpp
View File

@@ -406,7 +406,10 @@ class TestDevice : public IDevice
{
public:
TestDevice()
: IDevice(testTypeId(), AutoDetected, Hardware, Core::Id::fromString(QUuid::createUuid().toString())) {}
: IDevice(testTypeId(), AutoDetected, Core::Id::fromString(QUuid::createUuid().toString()))
{
setMachineType(Hardware);
}
static Core::Id testTypeId() { return "TestType"; }
private:

8
src/plugins/projectexplorer/devicesupport/idevice.cpp
View File

@@ -161,12 +161,11 @@ IDevice::IDevice() : d(new Internal::IDevicePrivate)
{
}
IDevice::IDevice(Core::Id type, Origin origin, MachineType machineType, Core::Id id)
IDevice::IDevice(Core::Id type, Origin origin, Core::Id id)
: d(std::make_unique<Internal::IDevicePrivate>())
{
d->type = type;
d->origin = origin;
d->machineType = machineType;
QTC_CHECK(origin == ManuallyAdded || id.isValid());
d->id = id.isValid() ? id : newId();
}
@@ -438,6 +437,11 @@ IDevice::MachineType IDevice::machineType() const
return d->machineType;
}
void IDevice::setMachineType(MachineType machineType)
{
d->machineType = machineType;
}
QString IDevice::debugServerPath() const
{
return d->debugServerPath;

3
src/plugins/projectexplorer/devicesupport/idevice.h
View File

@@ -203,6 +203,7 @@ public:
void setFreePorts(const Utils::PortList &freePorts);
MachineType machineType() const;
void setMachineType(MachineType machineType);
QString debugServerPath() const;
void setDebugServerPath(const QString &path);
@@ -215,7 +216,7 @@ public:
protected:
IDevice();
IDevice(Core::Id type, Origin origin, MachineType machineType, Core::Id id = Core::Id());
IDevice(Core::Id type, Origin origin, Core::Id id = Core::Id());
IDevice(const IDevice &other);
private:

8
src/plugins/qnx/qnxdevice.cpp
View File

@@ -82,8 +82,8 @@ QnxDevice::QnxDevice()
init();
}
QnxDevice::QnxDevice(const QString &name, Core::Id type, MachineType machineType, Origin origin, Core::Id id)
: RemoteLinux::LinuxDevice(name, type, machineType, origin, id)
QnxDevice::QnxDevice(const QString &name, Core::Id type, Origin origin, Core::Id id)
: RemoteLinux::LinuxDevice(name, type, origin, id)
{
init();
}
@@ -103,9 +103,9 @@ QnxDevice::Ptr QnxDevice::create()
return Ptr(new QnxDevice);
}
QnxDevice::Ptr QnxDevice::create(const QString &name, Core::Id type, MachineType machineType, Origin origin, Core::Id id)
QnxDevice::Ptr QnxDevice::create(const QString &name, Core::Id type, Origin origin, Core::Id id)
{
return Ptr(new QnxDevice(name, type, machineType, origin, id));
return Ptr(new QnxDevice(name, type, origin, id));
}
QString QnxDevice::displayType() const

4
src/plugins/qnx/qnxdevice.h
View File

@@ -40,7 +40,7 @@ public:
using ConstPtr = QSharedPointer<const QnxDevice>;
static Ptr create();
static Ptr create(const QString &name, Core::Id type, MachineType machineType,
static Ptr create(const QString &name, Core::Id type,
Origin origin = ManuallyAdded, Core::Id id = Core::Id());
ProjectExplorer::IDevice::Ptr clone() const override;
@@ -61,7 +61,7 @@ public:
protected:
QnxDevice();
QnxDevice(const QString &name, Core::Id type, MachineType machineType,
QnxDevice(const QString &name, Core::Id type,
Origin origin, Core::Id id);
QnxDevice(const QnxDevice &other);

4
src/plugins/qnx/qnxdevicewizard.cpp
View File

@@ -52,8 +52,8 @@ QnxDeviceWizard::QnxDeviceWizard(QWidget *parent) :
m_finalPage->setCommitPage(true);
QSsh::SshConnectionParameters sshParams;
sshParams.timeout = 10;
m_device = QnxDevice::create(tr("QNX Device"), Core::Id(Constants::QNX_QNX_OS_TYPE),
IDevice::Hardware);
m_device = QnxDevice::create(tr("QNX Device"), Core::Id(Constants::QNX_QNX_OS_TYPE));
m_device->setMachineType(IDevice::Hardware);
m_device->setSshParameters(sshParams);
m_device->setFreePorts(Utils::PortList::fromString(QLatin1String("10000-10100")));
m_setupPage->setDevice(m_device);

3
src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.cpp
View File

@@ -63,7 +63,8 @@ GenericLinuxDeviceConfigurationWizard::GenericLinuxDeviceConfigurationWizard(QWi
setPage(Internal::FinalPageId, &d->finalPage);
d->finalPage.setCommitPage(true);
d->device = LinuxDevice::create(tr("Generic Linux Device"),
Core::Id(Constants::GenericLinuxOsType), IDevice::Hardware);
Core::Id(Constants::GenericLinuxOsType));
d->device->setMachineType(IDevice::Hardware);
d->device->setFreePorts(Utils::PortList::fromString(QLatin1String("10000-10100")));
SshConnectionParameters sshParams;
sshParams.timeout = 10;

10
src/plugins/remotelinux/linuxdevice.cpp
View File

@@ -166,10 +166,9 @@ class LinuxPortsGatheringMethod : public PortsGatheringMethod
};
LinuxDevice::Ptr LinuxDevice::create(const QString &name,
Core::Id type, MachineType machineType, Origin origin, Core::Id id)
LinuxDevice::Ptr LinuxDevice::create(const QString &name, Core::Id type, Origin origin, Core::Id id)
{
return Ptr(new LinuxDevice(name, type, machineType, origin, id));
return Ptr(new LinuxDevice(name, type, origin, id));
}
QString LinuxDevice::displayType() const
@@ -187,9 +186,8 @@ Utils::OsType LinuxDevice::osType() const
return Utils::OsTypeLinux;
}
LinuxDevice::LinuxDevice(const QString &name, Core::Id type, MachineType machineType,
Origin origin, Core::Id id)
: IDevice(type, origin, machineType, id)
LinuxDevice::LinuxDevice(const QString &name, Core::Id type, Origin origin, Core::Id id)
: IDevice(type, origin, id)
{
setDisplayName(name);
init();

5
src/plugins/remotelinux/linuxdevice.h
View File

@@ -43,7 +43,7 @@ public:
using ConstPtr = QSharedPointer<const LinuxDevice>;
static Ptr create();
static Ptr create(const QString &name, Core::Id type, MachineType machineType,
static Ptr create(const QString &name, Core::Id type,
Origin origin = ManuallyAdded, Core::Id id = Core::Id());
QString displayType() const override;
@@ -67,8 +67,7 @@ public:
protected:
LinuxDevice() { init(); }
LinuxDevice(const QString &name, Core::Id type,
MachineType machineType, Origin origin, Core::Id id);
LinuxDevice(const QString &name, Core::Id type, Origin origin, Core::Id id);
LinuxDevice(const LinuxDevice &other);
private:

4
src/plugins/winrt/winrtdevice.cpp
View File

@@ -47,8 +47,8 @@ WinRtDevice::WinRtDevice()
initFreePorts();
}
WinRtDevice::WinRtDevice(Core::Id type, MachineType machineType, Core::Id internalId, int deviceId)
: IDevice(type, AutoDetected, machineType, internalId), m_deviceId(deviceId)
WinRtDevice::WinRtDevice(Core::Id type, Core::Id internalId, int deviceId)
: IDevice(type, AutoDetected, internalId), m_deviceId(deviceId)
{
initFreePorts();
}

2
src/plugins/winrt/winrtdevice.h
View File

@@ -50,7 +50,7 @@ public:
protected:
WinRtDevice();
WinRtDevice(Core::Id type, MachineType machineType, Core::Id internalId, int deviceId);
WinRtDevice(Core::Id type, Core::Id internalId, int deviceId);
WinRtDevice(const WinRtDevice &other);
private:

4
src/plugins/winrt/winrtdevicefactory.cpp
View File

@@ -281,8 +281,8 @@ void WinRtDeviceFactory::parseRunnerOutput(const QByteArray &output) const
continue;
}
WinRtDevice *device = new WinRtDevice(deviceType, machineType,
internalId, deviceId);
WinRtDevice *device = new WinRtDevice(deviceType, internalId, deviceId);
device->setMachineType(machineType);
device->setDisplayName(name);
deviceManager->addDevice(ProjectExplorer::IDevice::ConstPtr(device));
qCDebug(winrtDeviceLog) << __FUNCTION__ << "Added device" << name << "(internal name:"