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

Port from Java-style QMapIterators

Browse Source 
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
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/tools/iostool/main.cpp
View File

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