From 4172b33b1222a586d95dbc7e69dad7a19a307ea1 Mon Sep 17 00:00:00 2001 From: Linus Jahn Date: Tue, 14 May 2019 17:15:11 +0200 Subject: Replace Q_FOREACH (foreach) by C++11 ranged for-loops Q_FOREACH is bad and will be deprecated in the future: https://www.kdab.com/goodbye-q_foreach/ This also disables Q_FOREACH by defining QT_NO_FOREACH. --- src/client/QXmppDiscoveryManager.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'src/client/QXmppDiscoveryManager.cpp') diff --git a/src/client/QXmppDiscoveryManager.cpp b/src/client/QXmppDiscoveryManager.cpp index 49628d9d..ab8f816a 100644 --- a/src/client/QXmppDiscoveryManager.cpp +++ b/src/client/QXmppDiscoveryManager.cpp @@ -122,9 +122,8 @@ QXmppDiscoveryIq QXmppDiscoveryManager::capabilities() << ns_attention // XEP-0224: Attention << ns_chat_markers; // XEP-0333: Chat Markers - foreach(QXmppClientExtension* extension, client()->extensions()) - { - if(extension) + for (auto *extension : client()->extensions()) { + if (extension) features << extension->discoveryFeatures(); } @@ -139,9 +138,8 @@ QXmppDiscoveryIq QXmppDiscoveryManager::capabilities() identity.setName(clientName()); identities << identity; - foreach(QXmppClientExtension* extension, client()->extensions()) - { - if(extension) + for (auto *extension : client()->extensions()) { + if (extension) identities << extension->discoveryIdentities(); } -- cgit v1.2.3