diff options
author | hjk <hjk@qt.io> | 2019-05-27 10:07:10 +0200 |
---|---|---|
committer | hjk <hjk@qt.io> | 2019-05-27 08:19:27 +0000 |
commit | a8896693693e342899d5eb7103c189823a752b32 (patch) | |
tree | 955820956cefeaf0e9fa6b10c4626fd987fede4a /src/plugins/ios | |
parent | 967f20ab89d84381a467ebe7b35e291a9935aec9 (diff) |
iOS: Use base IDevice::clone() instead of local toMap/fromMap
Some non-persistent data is handled in the base.
Change-Id: I5f6c5429b88178115bf26f885b80fa3daebf227e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/plugins/ios')
-rw-r--r-- | src/plugins/ios/iosdevice.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/plugins/ios/iosdevice.cpp b/src/plugins/ios/iosdevice.cpp index 224ce59573b..6fe7bfe40c7 100644 --- a/src/plugins/ios/iosdevice.cpp +++ b/src/plugins/ios/iosdevice.cpp @@ -227,14 +227,10 @@ void IosDeviceManager::deviceConnected(const QString &uid, const QString &name) } else if (dev->deviceState() != IDevice::DeviceConnected && dev->deviceState() != IDevice::DeviceReadyToUse) { qCDebug(detectLog) << "updating ios device " << uid; - IosDevice *newDev = nullptr; - if (dev->type() == devType) { - newDev = new IosDevice(); - newDev->fromMap(dev->toMap()); - } else { - newDev = new IosDevice(uid); - } - devManager->addDevice(IDevice::ConstPtr(newDev)); + if (dev->type() == devType) // FIXME: Should that be a QTC_ASSERT? + devManager->addDevice(dev->clone()); + else + devManager->addDevice(IDevice::ConstPtr(new IosDevice(uid))); } updateInfo(uid); } |