Port from Java-style QMapIterators

So that it compiles against qtbase/dev

Change-Id: I628ee8b935cfde11c0a67ccc09f3b64aa7a884d3
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Volker Hilsheimer
2019-08-11 08:41:43 +02:00
parent c77447d491
commit a5da571ed5

View File

@@ -31,7 +31,6 @@
#include <QDebug>
#include <QXmlStreamWriter>
#include <QFile>
#include <QMapIterator>
#include <QScopedArrayPointer>
#include <QTcpServer>
#include <QSocketNotifier>
@@ -816,9 +815,7 @@ void IosTool::deviceInfo(const QString &deviceId, const Ios::IosDeviceManager::D
QMutexLocker l(&m_xmlMutex);
out.writeTextElement(QLatin1String("device_id"), deviceId);
out.writeStartElement(QLatin1String("device_info"));
QMapIterator<QString,QString> i(devInfo);
while (i.hasNext()) {
i.next();
for (auto i = devInfo.cbegin(); i != devInfo.cend(); ++i) {
out.writeStartElement(QLatin1String("item"));
out.writeTextElement(QLatin1String("key"), i.key());
out.writeTextElement(QLatin1String("value"), i.value());