diff options
author | hjk <hjk@qt.io> | 2019-07-24 13:43:54 +0200 |
---|---|---|
committer | hjk <hjk@qt.io> | 2019-07-29 08:54:18 +0000 |
commit | e3b1106afae5de6cd54ce627a0b11be041624591 (patch) | |
tree | accfac6791013e79476650b6dd840d5cf243e12b /src/plugins/ios/iosdevice.cpp | |
parent | 02e224fcfa7135f1e32adb02a14426ea153ae618 (diff) |
Compile fix with recent Qt dev
The reasoning in 1b4766e26c6b did not take into account that the scope
of QT_NO_JAVA_STYLE_ITERATORS may change over time, as done with
f70905448f6 in Qt base.
Change-Id: Ib1966ff26c4d36d5f62e149d6b45baa4aecf825d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/plugins/ios/iosdevice.cpp')
-rw-r--r-- | src/plugins/ios/iosdevice.cpp | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/src/plugins/ios/iosdevice.cpp b/src/plugins/ios/iosdevice.cpp index 0ec0302cd5..922cf5009a 100644 --- a/src/plugins/ios/iosdevice.cpp +++ b/src/plugins/ios/iosdevice.cpp @@ -108,9 +108,7 @@ IosDevice::IosDevice(const QString &uid) IDevice::DeviceInfo IosDevice::deviceInformation() const { IDevice::DeviceInfo res; - QMapIterator<QString, QString> i(m_extraInfo); - while (i.hasNext()) { - i.next(); + for (auto i = m_extraInfo.cbegin(), end = m_extraInfo.cend(); i != end; ++i) { IosDeviceManager::TranslationMap tMap = IosDeviceManager::translationMap(); if (tMap.contains(i.key())) res.append(DeviceInfoItem(tMap.value(i.key()), tMap.value(i.value(), i.value()))); @@ -131,24 +129,19 @@ DeviceProcessSignalOperation::Ptr IosDevice::signalOperation() const void IosDevice::fromMap(const QVariantMap &map) { IDevice::fromMap(map); - QVariantMap vMap = map.value(QLatin1String(Constants::EXTRA_INFO_KEY)).toMap(); - QMapIterator<QString, QVariant> i(vMap); + m_extraInfo.clear(); - while (i.hasNext()) { - i.next(); + const QVariantMap vMap = map.value(QLatin1String(Constants::EXTRA_INFO_KEY)).toMap(); + for (auto i = vMap.cbegin(), end = vMap.cend(); i != end; ++i) m_extraInfo.insert(i.key(), i.value().toString()); - } } QVariantMap IosDevice::toMap() const { QVariantMap res = IDevice::toMap(); QVariantMap vMap; - QMapIterator<QString, QString> i(m_extraInfo); - while (i.hasNext()) { - i.next(); + for (auto i = m_extraInfo.cbegin(), end = m_extraInfo.cend(); i != end; ++i) vMap.insert(i.key(), i.value()); - } res.insert(QLatin1String(Constants::EXTRA_INFO_KEY), vMap); return res; } |