diff --git a/src/activeconnection.cpp b/src/activeconnection.cpp
--- a/src/activeconnection.cpp
+++ b/src/activeconnection.cpp
@@ -257,7 +257,7 @@
         properties << QLatin1String("Dhcp6Config");
     }
 
-    Q_FOREACH (const QString &property, properties) {
+    for (const QString &property : qAsConst(properties)) {
         QDBusMessage message = QDBusMessage::createMethodCall(NetworkManager::NetworkManagerPrivate::DBUS_SERVICE,
                             NetworkManager::NetworkManagerPrivate::DBUS_DAEMON_PATH,
                             NetworkManager::NetworkManagerPrivate::FDO_DBUS_PROPERTIES,
@@ -403,7 +403,8 @@
         Q_EMIT q->uuidChanged(uuid);
     } else if (property == QLatin1String("Devices")) {
         devices.clear();
-        Q_FOREACH (const QDBusObjectPath & path, qdbus_cast< QList<QDBusObjectPath> >(value)) {
+        const QList<QDBusObjectPath> opList = qdbus_cast< QList<QDBusObjectPath> >(value);
+        for (const QDBusObjectPath &path : opList) {
             devices.append(path.path());
         }
         Q_EMIT q->devicesChanged();
diff --git a/src/device.cpp b/src/device.cpp
--- a/src/device.cpp
+++ b/src/device.cpp
@@ -234,18 +234,22 @@
         Q_EMIT q->autoconnectChanged();
     } else if (property == QLatin1String("AvailableConnections")) {
         QStringList newAvailableConnections;
-        QList<QDBusObjectPath> availableConnectionsTmp = qdbus_cast< QList<QDBusObjectPath> >(value);
-        Q_FOREACH (const QDBusObjectPath & availableConnection, availableConnectionsTmp) {
+        const QList<QDBusObjectPath> availableConnectionsTmp = qdbus_cast< QList<QDBusObjectPath> >(value);
+        for (const QDBusObjectPath &availableConnection : availableConnectionsTmp) {
             newAvailableConnections << availableConnection.path();
             if (!availableConnections.contains(availableConnection.path())) {
                 availableConnections << availableConnection.path();
                 Q_EMIT q->availableConnectionAppeared(availableConnection.path());
             }
         }
-        Q_FOREACH (const QString & availableConnection, availableConnections) {
+        auto it = availableConnections.begin();
+        while (it != availableConnections.end()) {
+            const QString availableConnection = *it;
             if (!newAvailableConnections.contains(availableConnection)) {
-                availableConnections.removeOne(availableConnection);
+                it = availableConnections.erase(it);
                 Q_EMIT q->availableConnectionDisappeared(availableConnection);
+            } else {
+                ++it;
             }
         }
         Q_EMIT q->availableConnectionChanged();
@@ -402,7 +406,7 @@
     Q_D(const Device);
 
     NetworkManager::Connection::List list;
-    Q_FOREACH (const QString & availableConnection, d->availableConnections) {
+    for (const QString &availableConnection : qAsConst(d->availableConnections)) {
         NetworkManager::Connection::Ptr connection = NetworkManager::findConnection(availableConnection);
         if (connection) {
             list << connection;
diff --git a/src/dnsconfiguration.cpp b/src/dnsconfiguration.cpp
--- a/src/dnsconfiguration.cpp
+++ b/src/dnsconfiguration.cpp
@@ -93,11 +93,13 @@
     map["options"] = d->options;
 
     QVariantMap domains;
-    Q_FOREACH (const NetworkManager::DnsDomain &domain, d->domains) {
+    for (const NetworkManager::DnsDomain &domain : qAsConst(d->domains)) {
         QVariantMap contents;
         QStringList serversList;
-        Q_FOREACH (const QHostAddress &address, domain.servers())
+        const QList<QHostAddress> servers = domain.servers();
+        for (const QHostAddress &address : servers) {
             serversList.append(address.toString());
+        }
         contents["servers"] = serversList;
         contents["options"] = domain.options();
         domains[domain.name()] = contents;
@@ -116,10 +118,12 @@
     QVariantMap domains = map["domains"].toMap();
     QVariantMap::const_iterator i = domains.constBegin();
     while (i != domains.constEnd()) {
-        QVariantMap contents = i.value().toMap();
+        const QVariantMap contents = i.value().toMap();
         QList<QHostAddress> addressList;
-        Q_FOREACH (const QString &server, contents["servers"].toStringList())
+        const QStringList serversList = contents["servers"].toStringList();
+        for (const QString &server : serversList) {
             addressList.append(QHostAddress(server));
+        }
         NetworkManager::DnsDomain domain(i.key(),
                                          addressList,
                                          contents["options"].toStringList());
diff --git a/src/fakenetwork/fakenetwork.cpp b/src/fakenetwork/fakenetwork.cpp
--- a/src/fakenetwork/fakenetwork.cpp
+++ b/src/fakenetwork/fakenetwork.cpp
@@ -182,15 +182,17 @@
     QDBusConnection::sessionBus().registerObject(QLatin1String("/org/kde/fakenetwork"), this, QDBusConnection::ExportScriptableContents);
     QDBusConnection::sessionBus().registerObject(QLatin1String("/org/kde/fakenetwork/Settings"), m_settings, QDBusConnection::ExportScriptableContents);
 
-    Q_FOREACH (const QDBusObjectPath & devicePath, m_devices.keys()) {
-        QDBusConnection::sessionBus().registerObject(devicePath.path(), m_devices.value(devicePath), QDBusConnection::ExportScriptableContents);
+    for (auto it = m_devices.cbegin(); it != m_devices.cend(); ++it) {
+        const QDBusObjectPath &devicePath = it.key();
+        QDBusConnection::sessionBus().registerObject(devicePath.path(), it.value(), QDBusConnection::ExportScriptableContents);
         Q_EMIT DeviceAdded(devicePath);
     }
 }
 
 void FakeNetwork::unregisterService()
 {
-    Q_FOREACH (const QDBusObjectPath & devicePath, m_devices.keys()) {
+    for (auto it = m_devices.cbegin(); it != m_devices.cend(); ++it) {
+        const QDBusObjectPath &devicePath = it.key();
         QDBusConnection::sessionBus().unregisterObject(devicePath.path());
         Q_EMIT DeviceRemoved(devicePath);
     }
@@ -404,7 +406,7 @@
         NetworkManager::ConnectionSettings::ConnectionType type = NetworkManager::ConnectionSettings::typeFromString(settings.value(QLatin1String("connection")).value(QLatin1String("type")).toString());
         if (!m_devices.isEmpty()) {
             Device *selectedDevice = nullptr;
-            Q_FOREACH (Device * device, m_devices.values()) {
+            for (Device *device : qAsConst(m_devices)) {
                 if (type == NetworkManager::ConnectionSettings::Wired && device->deviceType() == NetworkManager::Device::Ethernet) {
                     selectedDevice = device;
                     device->addAvailableConnection(connection);
@@ -430,7 +432,7 @@
 
 void FakeNetwork::onConnectionRemoved(const QDBusObjectPath &connection)
 {
-    Q_FOREACH (Device * device, m_devices.values()) {
+    for (Device *device : qAsConst(m_devices)) {
         if (device && device->availableConnections().contains(connection)) {
             device->removeAvailableConnection(connection);
 
diff --git a/src/fakenetwork/settings.cpp b/src/fakenetwork/settings.cpp
--- a/src/fakenetwork/settings.cpp
+++ b/src/fakenetwork/settings.cpp
@@ -19,7 +19,8 @@
 
 Settings::~Settings()
 {
-    Q_FOREACH (const QDBusObjectPath & connection, m_connections.keys()) {
+    for (auto it =  m_connections.cbegin(); it != m_connections.cend(); ++it) {
+        const QDBusObjectPath &connection = it.key();
         QDBusConnection::sessionBus().unregisterObject(connection.path());
         Q_EMIT ConnectionRemoved(connection);
     }
diff --git a/src/fakenetwork/wirelessdevice.cpp b/src/fakenetwork/wirelessdevice.cpp
--- a/src/fakenetwork/wirelessdevice.cpp
+++ b/src/fakenetwork/wirelessdevice.cpp
@@ -20,7 +20,8 @@
 
 WirelessDevice::~WirelessDevice()
 {
-    Q_FOREACH (const QDBusObjectPath & ap, m_accessPoints.keys()) {
+    for (auto it = m_accessPoints.cbegin(); it != m_accessPoints.cend(); ++it) {
+         const QDBusObjectPath &ap = it.key();
         QDBusConnection::sessionBus().unregisterObject(ap.path());
         Q_EMIT AccessPointRemoved(ap);
     }
diff --git a/src/settings.cpp b/src/settings.cpp
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -46,9 +46,9 @@
 
 void NetworkManager::SettingsPrivate::init()
 {
-    QList<QDBusObjectPath> connectionList = iface.connections();
+    const QList<QDBusObjectPath> connectionList = iface.connections();
     qCDebug(NMQT) << "Connections list";
-    Q_FOREACH (const QDBusObjectPath & connection, connectionList) {
+    for (const QDBusObjectPath &connection : connectionList) {
         if (!connections.contains(connection.path())) {
             connections.insert(connection.path(), Connection::Ptr());
             Q_EMIT connectionAdded(connection.path());
diff --git a/src/wirelessnetwork.cpp b/src/wirelessnetwork.cpp
--- a/src/wirelessnetwork.cpp
+++ b/src/wirelessnetwork.cpp
@@ -62,7 +62,7 @@
 
     int maximumStrength = -1;
     NetworkManager::AccessPoint::Ptr strongestAp;
-    Q_FOREACH (const NetworkManager::AccessPoint::Ptr & iface, aps) {
+    for (const NetworkManager::AccessPoint::Ptr &iface : qAsConst(aps)) {
         if (maximumStrength <= iface->signalStrength()) {
             maximumStrength = iface->signalStrength();
             strongestAp = iface;