3 files changed, 10 insertions, 31 deletions
diff --git a/src/plugins/bearer/networkmanager/qnetworkmanagerservice.cpp b/src/plugins/bearer/networkmanager/qnetworkmanagerservice.cpp
index 6c3c661db6..081cb1288d 100644
--- a/src/plugins/bearer/networkmanager/qnetworkmanagerservice.cpp
+++ b/src/plugins/bearer/networkmanager/qnetworkmanagerservice.cpp
@@ -215,9 +215,7 @@ QString QNetworkManagerInterface::version() const
 
 void QNetworkManagerInterface::propertiesSwap(QMap<QString,QVariant> map)
 {
-    QMapIterator<QString, QVariant> i(map);
-    while (i.hasNext()) {
-        i.next();
+    for (auto i = map.cbegin(), end = map.cend(); i != end; ++i) {
         propertyMap.insert(i.key(),i.value());
 
         if (i.key() == QLatin1String("State")) {
@@ -334,11 +332,8 @@ quint32 QNetworkManagerInterfaceAccessPoint::strength() const
 
 void QNetworkManagerInterfaceAccessPoint::propertiesSwap(QMap<QString,QVariant> map)
 {
-    QMapIterator<QString, QVariant> i(map);
-    while (i.hasNext()) {
-        i.next();
+    for (auto i = map.cbegin(), end = map.cend(); i != end; ++i)
         propertyMap.insert(i.key(),i.value());
-    }
 }
 
 QNetworkManagerInterfaceDevice::QNetworkManagerInterfaceDevice(const QString &deviceObjectPath, QObject *parent)
@@ -421,9 +416,7 @@ QDBusObjectPath QNetworkManagerInterfaceDevice::ip4config() const
 
 void QNetworkManagerInterfaceDevice::propertiesSwap(QMap<QString,QVariant> map)
 {
-    QMapIterator<QString, QVariant> i(map);
-    while (i.hasNext()) {
-        i.next();
+    for (auto i = map.cbegin(), end = map.cend(); i != end; ++i) {
         if (i.key() == QLatin1String("AvailableConnections")) { //Device
             const QDBusArgument &dbusArgs = i.value().value<QDBusArgument>();
             QDBusObjectPath path;
@@ -516,9 +509,7 @@ QStringList QNetworkManagerInterfaceDeviceWired::availableConnections()
 
 void QNetworkManagerInterfaceDeviceWired::propertiesSwap(QMap<QString,QVariant> map)
 {
-    QMapIterator<QString, QVariant> i(map);
-    while (i.hasNext()) {
-        i.next();
+    for (auto i = map.cbegin(), end = map.cend(); i != end; ++i) {
         propertyMap.insert(i.key(),i.value());
         if (i.key() == QLatin1String("Carrier"))
             Q_EMIT carrierChanged(i.value().toBool());
@@ -694,9 +685,7 @@ void QNetworkManagerInterfaceDeviceWireless::requestScan()
 
 void QNetworkManagerInterfaceDeviceWireless::propertiesSwap(QMap<QString,QVariant> map)
 {
-    QMapIterator<QString, QVariant> i(map);
-    while (i.hasNext()) {
-        i.next();
+    for (auto i = map.cbegin(), end = map.cend(); i != end; ++i) {
         propertyMap.insert(i.key(),i.value());
         if (i.key() == QLatin1String("ActiveAccessPoint")) //DeviceWireless
             Q_EMIT propertiesChanged(map);
@@ -753,11 +742,8 @@ QNetworkManagerInterfaceDeviceModem::ModemCapabilities QNetworkManagerInterfaceD
 
 void QNetworkManagerInterfaceDeviceModem::propertiesSwap(QMap<QString,QVariant> map)
 {
-    QMapIterator<QString, QVariant> i(map);
-    while (i.hasNext()) {
-        i.next();
+    for (auto i = map.cbegin(), end = map.cend(); i != end; ++i)
         propertyMap.insert(i.key(),i.value());
-    }
     Q_EMIT propertiesChanged(map);
 }
 
@@ -1051,9 +1037,7 @@ bool QNetworkManagerConnectionActive::default6Route() const
 
 void QNetworkManagerConnectionActive::propertiesSwap(QMap<QString,QVariant> map)
 {
-    QMapIterator<QString, QVariant> i(map);
-    while (i.hasNext()) {
-        i.next();
+    for (auto i = map.cbegin(), end = map.cend(); i != end; ++i) {
         propertyMap.insert(i.key(),i.value());
         if (i.key() == QLatin1String("State")) {
             quint32 state = i.value().toUInt();
diff --git a/src/plugins/platforminputcontexts/ibus/qibustypes.cpp b/src/plugins/platforminputcontexts/ibus/qibustypes.cpp
index ac82fa3931..a2551f1320 100644
--- a/src/plugins/platforminputcontexts/ibus/qibustypes.cpp
+++ b/src/plugins/platforminputcontexts/ibus/qibustypes.cpp
@@ -73,10 +73,7 @@ void QIBusSerializable::serializeTo(QDBusArgument &argument) const
 
     argument.beginMap(qMetaTypeId<QString>(), qMetaTypeId<QDBusVariant>());
 
-    QHashIterator<QString, QDBusArgument> i(attachments);
-    while (i.hasNext()) {
-        i.next();
-
+    for (auto i = attachments.begin(), end = attachments.end(); i != end; ++i) {
         argument.beginMapEntry();
         argument << i.key();
 
diff --git a/src/plugins/platforms/qnx/qqnxscreen.cpp b/src/plugins/platforms/qnx/qqnxscreen.cpp
index 678e83cd57..f8ae5121d1 100644
--- a/src/plugins/platforms/qnx/qqnxscreen.cpp
+++ b/src/plugins/platforms/qnx/qqnxscreen.cpp
@@ -385,10 +385,8 @@ Qt::ScreenOrientation QQnxScreen::orientation() const
 
 QWindow *QQnxScreen::topLevelAt(const QPoint &point) const
 {
-    QListIterator<QQnxWindow*> it(m_childWindows);
-    it.toBack();
-    while (it.hasPrevious()) {
-        QWindow *win = it.previous()->window();
+    for (auto it = m_childWindows.rbegin(), end = m_childWindows.rend(); it != end; ++it) {
+        QWindow *win = (*it)->window();
         if (win->geometry().contains(point))
             return win;
     }