diff --git a/libconnman-qt/connmannetworkproxyfactory.cpp b/libconnman-qt/connmannetworkproxyfactory.cpp
index 72874c3..c0cf362 100644
--- a/libconnman-qt/connmannetworkproxyfactory.cpp
+++ b/libconnman-qt/connmannetworkproxyfactory.cpp
@@ -59,12 +59,12 @@ void ConnmanNetworkProxyFactory::onProxyChanged(const QVariantMap &proxy)
         }
     } else if (proxy.value("Method").toString() == QLatin1String("manual")) {
         const QStringList proxyUrlStrings = proxy.value("Servers").toStringList();
-        Q_FOREACH (const QString &proxyUrlString, proxyUrlStrings) {
+        for (const QString &proxyUrlString : proxyUrlStrings) {
             proxyUrls.append(QUrl(proxyUrlString));
         }
     }
 
-    Q_FOREACH (const QUrl &url, proxyUrls) {
+    for (const QUrl &url : proxyUrls) {
         if (url.scheme() == QLatin1String("socks5")) {
             QNetworkProxy proxy(QNetworkProxy::Socks5Proxy, url.host(),
                     url.port() ? url.port() : 1080, url.userName(), url.password());
diff --git a/libconnman-qt/networkservice.cpp b/libconnman-qt/networkservice.cpp
index b67876a..e000dcf 100644
--- a/libconnman-qt/networkservice.cpp
+++ b/libconnman-qt/networkservice.cpp
@@ -722,10 +722,10 @@ void NetworkService::Private::updateManaged()
 QVariantMap NetworkService::Private::adaptToConnmanProperties(const QVariantMap &map)
 {
     QVariantMap buffer;
-    Q_FOREACH (const QString &key, map.keys()) {
+    for (const QString &key : map.keys()) {
         if (map.value(key).type() == QVariant::List) {
             QStringList strList;
-            Q_FOREACH (const QVariant &value, map.value(key).toList()) {
+            for (const QVariant &value : map.value(key).toList()) {
                 strList.append(value.toString());
             }
             buffer.insert(key, strList);
diff --git a/libconnman-qt/networksession.cpp b/libconnman-qt/networksession.cpp
index de55c76..6affbe5 100644
--- a/libconnman-qt/networksession.cpp
+++ b/libconnman-qt/networksession.cpp
@@ -102,7 +102,7 @@ void NetworkSession::requestDisconnect()
 
 void NetworkSession::sessionSettingsUpdated(const QVariantMap &settings)
 {
-    Q_FOREACH(const QString &name, settings.keys()) {
+    for (const QString &name : settings.keys()) {
         settingsMap.insert(name,settings[name]);
 
         if (name == QLatin1String("State")) {
diff --git a/libconnman-qt/networktechnology.cpp b/libconnman-qt/networktechnology.cpp
index 3f97fa1..25b7438 100644
--- a/libconnman-qt/networktechnology.cpp
+++ b/libconnman-qt/networktechnology.cpp
@@ -82,7 +82,7 @@ void NetworkTechnology::getPropertiesFinished(QDBusPendingCallWatcher *call)
 
     if (!reply.isError()) {
         QVariantMap tmpCache = reply.value();
-        Q_FOREACH(const QString &name, tmpCache.keys()) {
+        for (const QString &name : tmpCache.keys()) {
             m_propertiesCache.insert(name, tmpCache[name]);
             emitPropertyChange(name, tmpCache[name]);
         }
diff --git a/libconnman-qt/useragent.cpp b/libconnman-qt/useragent.cpp
index ac07fda..82b2531 100644
--- a/libconnman-qt/useragent.cpp
+++ b/libconnman-qt/useragent.cpp
@@ -205,7 +205,7 @@ void AgentAdaptor::RequestInput(const QDBusObjectPath &service_path,
                                        const QDBusMessage &message)
 {
     QVariantMap json;
-    Q_FOREACH (const QString &key, fields.keys()){
+    for (const QString &key : fields.keys()){
         QVariantMap payload = qdbus_cast<QVariantMap>(fields[key]);
         json.insert(key, payload);
     }
diff --git a/plugin/savedservicemodel.cpp b/plugin/savedservicemodel.cpp
index ff6bcd8..6560ab7 100644
--- a/plugin/savedservicemodel.cpp
+++ b/plugin/savedservicemodel.cpp
@@ -148,7 +148,7 @@ int SavedServiceModel::indexOf(const QString &dbusObjectPath) const
 {
     int idx(-1);
 
-    Q_FOREACH (NetworkService *service, m_services) {
+    for (NetworkService *service : m_services) {
         idx++;
         if (service->path() == dbusObjectPath) return idx;
     }
diff --git a/plugin/technologymodel.cpp b/plugin/technologymodel.cpp
index 0d3cb17..53549e9 100644
--- a/plugin/technologymodel.cpp
+++ b/plugin/technologymodel.cpp
@@ -247,7 +247,7 @@ int TechnologyModel::indexOf(const QString &dbusObjectPath) const
 {
     int idx(-1);
 
-    Q_FOREACH (NetworkService *service, m_services) {
+    for (const NetworkService *service : m_services) {
         idx++;
         if (service->path() == dbusObjectPath) return idx;
     }