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

ProjectExplorer: Use the fromMap(toMap()) pattern to clone devices

Browse Source 
Change-Id: Ie6e73f5ef1019907dd311aac116d71f08b5a5202
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2019-05-07 12:44:45 +02:00
parent bfe3599768
commit 555360c1d4
19 changed files with 33 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -92,8 +92,6 @@ IosDevice::IosDevice()
setFreePorts(ports);
}
IosDevice::IosDevice(const IosDevice &other) = default;
IosDevice::IosDevice(const QString &uid)
: m_lastPort(Constants::IOS_DEVICE_PORT_START)
{
@@ -133,11 +131,6 @@ DeviceProcessSignalOperation::Ptr IosDevice::signalOperation() const
return DeviceProcessSignalOperation::Ptr();
}
IDevice::Ptr IosDevice::clone() const
{
return IDevice::Ptr(new IosDevice(*this));
}
void IosDevice::fromMap(const QVariantMap &map)
{
IDevice::fromMap(map);
@@ -236,8 +229,8 @@ void IosDeviceManager::deviceConnected(const QString &uid, const QString &name)
qCDebug(detectLog) << "updating ios device " << uid;
IosDevice *newDev = nullptr;
if (dev->type() == devType) {
auto iosDev = static_cast<const IosDevice *>(dev.data());
newDev = new IosDevice(*iosDev);
newDev = new IosDevice();
newDev->fromMap(dev->toMap());
} else {
newDev = new IosDevice(uid);
}
@@ -294,7 +287,8 @@ void IosDeviceManager::deviceInfo(IosToolHandler *, const QString &uid,
skipUpdate = true;
newDev = const_cast<IosDevice *>(iosDev);
} else {
newDev = new IosDevice(*iosDev);
newDev = new IosDevice();
newDev->fromMap(iosDev->toMap());
}
} else {
newDev = new IosDevice(uid);