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.

8 files changed, 51 insertions, 55 deletions

diff --git a/src/client/QXmppCallManager.cpp b/src/client/QXmppCallManager.cpp
index e5e1b901..d669cbc5 100644
--- a/src/client/QXmppCallManager.cpp
+++ b/src/client/QXmppCallManager.cpp
@@ -117,7 +117,7 @@ QXmppCallPrivate::QXmppCallPrivate(QXmppCall *qq)
 
 QXmppCallPrivate::Stream *QXmppCallPrivate::findStreamByMedia(const QString &media)
 {
-    foreach (Stream *stream, streams)
+    for (auto *stream : streams)
         if (stream->media == media)
             return stream;
     return nullptr;
@@ -125,7 +125,7 @@ QXmppCallPrivate::Stream *QXmppCallPrivate::findStreamByMedia(const QString &med
 
 QXmppCallPrivate::Stream *QXmppCallPrivate::findStreamByName(const QString &name)
 {
-    foreach (Stream *stream, streams)
+    for (auto *stream : streams)
         if (stream->name == name)
             return stream;
     return nullptr;
@@ -163,7 +163,8 @@ bool QXmppCallPrivate::handleTransport(QXmppCallPrivate::Stream *stream, const Q
 {
     stream->connection->setRemoteUser(content.transportUser());
     stream->connection->setRemotePassword(content.transportPassword());
-    foreach (const QXmppJingleCandidate &candidate, content.transportCandidates())
+    const auto & candidates = content.transportCandidates();
+    for (const auto &candidate : candidates)
         stream->connection->addRemoteCandidate(candidate);
 
     // perform ICE negotiation
@@ -465,8 +466,7 @@ QXmppCall::QXmppCall(const QString &jid, QXmppCall::Direction direction, QXmppCa
 
 QXmppCall::~QXmppCall()
 {
-    foreach (QXmppCallPrivate::Stream *stream, d->streams)
-        delete stream;
+    qDeleteAll(d->streams);
     delete d;
 }
 
@@ -542,7 +542,7 @@ QIODevice::OpenMode QXmppCall::videoMode() const
 void QXmppCall::terminated()
 {
     // close streams
-    foreach (QXmppCallPrivate::Stream *stream, d->streams) {
+    for (auto *stream : d->streams) {
         stream->channel->close();
         stream->connection->close();
     }
@@ -575,7 +575,7 @@ void QXmppCall::localCandidatesChanged()
     // find the stream
     auto *conn = qobject_cast<QXmppIceConnection*>(sender());
     QXmppCallPrivate::Stream *stream = nullptr;
-    foreach (QXmppCallPrivate::Stream *ptr, d->streams) {
+    for (auto *ptr : d->streams) {
         if (ptr->connection == conn) {
             stream = ptr;
             break;
@@ -701,7 +701,7 @@ QXmppCallManagerPrivate::QXmppCallManagerPrivate(QXmppCallManager *qq)
 
 QXmppCall *QXmppCallManagerPrivate::findCall(const QString &sid) const
 {
-    foreach (QXmppCall *call, calls)
+    for (auto *call : calls)
         if (call->sid() == sid)
            return call;
     return nullptr;
@@ -709,7 +709,7 @@ QXmppCall *QXmppCallManagerPrivate::findCall(const QString &sid) const
 
 QXmppCall *QXmppCallManagerPrivate::findCall(const QString &sid, QXmppCall::Direction direction) const
 {
-    foreach (QXmppCall *call, calls)
+    for (auto *call : calls)
         if (call->sid() == sid && call->direction() == direction)
            return call;
     return nullptr;
@@ -866,7 +866,7 @@ void QXmppCallManager::_q_callDestroyed(QObject *object)
 
 void QXmppCallManager::_q_disconnected()
 {
-    foreach (QXmppCall *call, d->calls)
+    for (auto *call : d->calls)
         call->d->terminate(QXmppJingleIq::Reason::Gone);
 }
 
@@ -879,7 +879,7 @@ void QXmppCallManager::_q_iqReceived(const QXmppIq &ack)
         return;
 
     // find request
-    foreach (QXmppCall *call, d->calls)
+    for (auto *call : d->calls)
         call->d->handleAck(ack);
 }
 
@@ -959,7 +959,7 @@ void QXmppCallManager::_q_presenceReceived(const QXmppPresence &presence)
     if (presence.type() != QXmppPresence::Unavailable)
         return;
 
-    foreach (QXmppCall *call, d->calls) {
+    for (auto *call : d->calls) {
         if (presence.from() == call->jid()) {
             // the remote party has gone away, terminate call
             call->d->terminate(QXmppJingleIq::Reason::Gone);
diff --git a/src/client/QXmppClient.cpp b/src/client/QXmppClient.cpp
index b71fd8e9..dd681f43 100644
--- a/src/client/QXmppClient.cpp
+++ b/src/client/QXmppClient.cpp
@@ -499,10 +499,8 @@ QXmppVersionManager& QXmppClient::versionManager()
 
 void QXmppClient::_q_elementReceived(const QDomElement &element, bool &handled)
 {
-    foreach (QXmppClientExtension *extension, d->extensions)
-    {
-        if (extension->handleStanza(element))
-        {
+    for (auto *extension : d->extensions) {
+        if (extension->handleStanza(element)) {
             handled = true;
             return;
         }
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();
     }
 
diff --git a/src/client/QXmppInvokable.cpp b/src/client/QXmppInvokable.cpp
index 91c646db..f315186d 100644
--- a/src/client/QXmppInvokable.cpp
+++ b/src/client/QXmppInvokable.cpp
@@ -97,7 +97,7 @@ QVariant QXmppInvokable::dispatch( const QByteArray & method, const QList< QVari
 QList< QByteArray > QXmppInvokable::paramTypes( const QList< QVariant > & params )
 {
     QList<QByteArray> types;
-    foreach( QVariant variant, params)
+    for (const auto &variant : qAsConst(params))
         types << variant.typeName();
     return types;
 }
diff --git a/src/client/QXmppMucManager.cpp b/src/client/QXmppMucManager.cpp
index ca199bad..a9854134 100644
--- a/src/client/QXmppMucManager.cpp
+++ b/src/client/QXmppMucManager.cpp
@@ -118,7 +118,7 @@ bool QXmppMucManager::handleStanza(const QDomElement &element)
 
             QXmppMucRoom *room = d->rooms.value(iq.from());
             if (room && iq.type() == QXmppIq::Result && room->d->permissionsQueue.remove(iq.id())) {
-                foreach (const QXmppMucItem &item, iq.items()) {
+                for (const auto &item : iq.items()) {
                     const QString jid = item.jid();
                     if (!room->d->permissions.contains(jid))
                         room->d->permissions.insert(jid, item);
@@ -510,7 +510,7 @@ bool QXmppMucRoom::requestPermissions()
 
     d->permissions.clear();
     d->permissionsQueue.clear();
-    foreach (QXmppMucItem::Affiliation affiliation, affiliations) {
+    for (const auto &affiliation : qAsConst(affiliations)) {
         QXmppMucItem item;
         item.setAffiliation(affiliation);
 
@@ -535,7 +535,7 @@ bool QXmppMucRoom::setPermissions(const QList<QXmppMucItem> &permissions)
     QList<QXmppMucItem> items;
 
     // Process changed members
-    foreach (const QXmppMucItem &item, permissions) {
+    for (const auto &item : qAsConst(permissions)) {
         const QString jid = item.jid();
         if (d->permissions.value(jid).affiliation() != item.affiliation())
             items << item;
@@ -543,7 +543,8 @@ bool QXmppMucRoom::setPermissions(const QList<QXmppMucItem> &permissions)
     }
 
     // Process deleted members
-    foreach (const QString &jid, d->permissions.keys()) {
+    const auto &jids = d->permissions.keys();
+    for (const auto &jid : jids) {
         QXmppMucItem item;
         item.setAffiliation(QXmppMucItem::NoAffiliation);
         item.setJid(jid);
@@ -569,7 +570,7 @@ void QXmppMucRoom::_q_disconnected()
     // clear chat room participants
     const QStringList removed = d->participants.keys();
     d->participants.clear();
-    foreach (const QString &jid, removed)
+    for (const auto &jid : removed)
         emit participantRemoved(jid);
     emit participantsChanged();
 
@@ -588,7 +589,8 @@ void QXmppMucRoom::_q_discoveryInfoReceived(const QXmppDiscoveryIq &iq)
 {
     if (iq.from() == d->jid) {
         QString name;
-        foreach (const QXmppDiscoveryIq::Identity &identity, iq.identities()) {
+        const auto &identities = iq.identities();
+        for (const auto &identity : identities) {
             if (identity.category() == "conference") {
                 name = identity.name();
                 break;
@@ -698,7 +700,7 @@ void QXmppMucRoom::_q_presenceReceived(const QXmppPresence &presence)
                 // clear chat room participants
                 const QStringList removed = d->participants.keys();
                 d->participants.clear();
-                foreach (const QString &jid, removed)
+                for (const auto &jid : removed)
                     emit participantRemoved(jid);
                 emit participantsChanged();
 
diff --git a/src/client/QXmppOutgoingClient.cpp b/src/client/QXmppOutgoingClient.cpp
index 3a454e79..6c8b5e62 100644
--- a/src/client/QXmppOutgoingClient.cpp
+++ b/src/client/QXmppOutgoingClient.cpp
@@ -470,7 +470,7 @@ void QXmppOutgoingClient::handleStanza(const QDomElement &nodeRecv)
             // determine SASL Authentication mechanism to use
             QStringList commonMechanisms;
             QString usedMechanism;
-            foreach (const QString &mechanism, supportedMechanisms) {
+            for (const auto &mechanism : qAsConst(supportedMechanisms)) {
                 if (features.authMechanisms().contains(mechanism))
                     commonMechanisms << mechanism;
             }
diff --git a/src/client/QXmppRosterManager.cpp b/src/client/QXmppRosterManager.cpp
index c1c41ad4..fe13c8d8 100644
--- a/src/client/QXmppRosterManager.cpp
+++ b/src/client/QXmppRosterManager.cpp
@@ -143,7 +143,7 @@ bool QXmppRosterManager::handleStanza(const QDomElement &element)
 
             // store updated entries and notify changes
             const QList<QXmppRosterIq::Item> items = rosterIq.items();
-            foreach (const QXmppRosterIq::Item &item, items) {
+            for (const auto &item : items) {
                 const QString bareJid = item.bareJid();
                 if (item.subscriptionType() == QXmppRosterIq::Item::Remove) {
                     if (d->entries.remove(bareJid)) {
@@ -167,7 +167,7 @@ bool QXmppRosterManager::handleStanza(const QDomElement &element)
     case QXmppIq::Result:
         {
             const QList<QXmppRosterIq::Item> items = rosterIq.items();
-            foreach (const QXmppRosterIq::Item &item, items) {
+            for (const auto &item : items) {
                 const QString bareJid = item.bareJid();
                 d->entries.insert(bareJid, item);
             }
diff --git a/src/client/QXmppTransferManager.cpp b/src/client/QXmppTransferManager.cpp
index 57e19fdd..0cb7b31f 100644
--- a/src/client/QXmppTransferManager.cpp
+++ b/src/client/QXmppTransferManager.cpp
@@ -758,11 +758,12 @@ QXmppTransferManagerPrivate::QXmppTransferManagerPrivate(QXmppTransferManager *q
 
 QXmppTransferJob* QXmppTransferManagerPrivate::getJobByRequestId(QXmppTransferJob::Direction direction, const QString &jid, const QString &id)
 {
-    foreach (QXmppTransferJob *job, jobs)
+    for (auto *job : jobs) {
         if (job->d->direction == direction &&
             job->d->jid == jid &&
             job->d->requestId == id)
             return job;
+    }
     return nullptr;
 }
 
@@ -773,11 +774,12 @@ QXmppTransferIncomingJob *QXmppTransferManagerPrivate::getIncomingJobByRequestId
 
 QXmppTransferIncomingJob* QXmppTransferManagerPrivate::getIncomingJobBySid(const QString &jid, const QString &sid)
 {
-    foreach (QXmppTransferJob *job, jobs)
+    for (auto *job : jobs) {
         if (job->d->direction == QXmppTransferJob::IncomingDirection &&
             job->d->jid == jid &&
             job->d->sid == sid)
             return static_cast<QXmppTransferIncomingJob*>(job);
+    }
     return nullptr;
 }
 
@@ -814,12 +816,9 @@ QXmppTransferManager::~QXmppTransferManager()
 void QXmppTransferManager::byteStreamIqReceived(const QXmppByteStreamIq &iq)
 {
     // handle IQ from proxy
-    foreach (QXmppTransferJob *job, d->jobs)
-    {
-        if (job->d->socksProxy.jid() == iq.from() && job->d->requestId == iq.id())
-        {
-            if (iq.type() == QXmppIq::Result && iq.streamHosts().size() > 0)
-            {
+    for (auto *job : d->jobs) {
+        if (job->d->socksProxy.jid() == iq.from() && job->d->requestId == iq.id()) {
+            if (iq.type() == QXmppIq::Result && iq.streamHosts().size() > 0) {
                 job->d->socksProxy = iq.streamHosts().first();
                 socksServerSendOffer(job);
                 return;
@@ -1138,14 +1137,11 @@ void QXmppTransferManager::_q_iqReceived(const QXmppIq &iq)
     bool check;
     Q_UNUSED(check);
 
-    foreach (QXmppTransferJob *ptr, d->jobs)
-    {
+    for (auto *ptr : d->jobs) {
         // handle IQ from proxy
-        if (ptr->direction() == QXmppTransferJob::OutgoingDirection && ptr->d->socksProxy.jid() == iq.from() && ptr->d->requestId == iq.id())
-        {
+        if (ptr->direction() == QXmppTransferJob::OutgoingDirection && ptr->d->socksProxy.jid() == iq.from() && ptr->d->requestId == iq.id()) {
             auto *job = static_cast<QXmppTransferOutgoingJob*>(ptr);
-            if (job->d->socksSocket)
-            {
+            if (job->d->socksSocket) {
                 // proxy connection activation result
                 if (iq.type() == QXmppIq::Result)
                 {
@@ -1427,10 +1423,8 @@ QXmppTransferJob *QXmppTransferManager::sendFile(const QString &jid, QIODevice *
 void QXmppTransferManager::_q_socksServerConnected(QTcpSocket *socket, const QString &hostName, quint16 port)
 {
     const QString ownJid = client()->configuration().jid();
-    foreach (QXmppTransferJob *job, d->jobs)
-    {
-        if (hostName == streamHash(job->d->sid, ownJid, job->jid()) && port == 0)
-        {
+    for (auto *job : d->jobs) {
+        if (hostName == streamHash(job->d->sid, ownJid, job->jid()) && port == 0) {
             job->d->socksSocket = socket;
             return;
         }
@@ -1446,7 +1440,8 @@ void QXmppTransferManager::socksServerSendOffer(QXmppTransferJob *job)
 
     // discover local IPs
     if (!d->proxyOnly) {
-        foreach (const QHostAddress &address, QXmppIceComponent::discoverAddresses()) {
+        const auto &addresses = QXmppIceComponent::discoverAddresses();
+        for (const auto &address : addresses) {
             QXmppByteStreamIq::StreamHost streamHost;
             streamHost.setJid(ownJid);
             streamHost.setHost(address.toString());
@@ -1493,7 +1488,8 @@ void QXmppTransferManager::streamInitiationResultReceived(const QXmppStreamIniti
         job->state() != QXmppTransferJob::OfferState)
         return;
 
-    foreach (const QXmppDataForm::Field &field, iq.featureForm().fields()) {
+    const auto &fields = iq.featureForm().fields();
+    for (const auto &field : fields) {
         if (field.key() == "stream-method") {
             if ((field.value().toString() == ns_ibb) &&
                 (d->supportedMethods & QXmppTransferJob::InBandMethod))
@@ -1580,10 +1576,12 @@ void QXmppTransferManager::streamInitiationSetReceived(const QXmppStreamInitiati
     job->d->sid = iq.siId();
     job->d->mimeType = iq.mimeType();
     job->d->fileInfo = iq.fileInfo();
-    foreach (const QXmppDataForm::Field &field, iq.featureForm().fields()) {
+    const auto &fields = iq.featureForm().fields();
+    for (const auto &field : fields) {
         if (field.key() == "stream-method") {
             QPair<QString, QString> option;
-            foreach (option, field.options()) {
+            const auto &options = field.options();
+            for (const auto &option : options) {
                 if (option.second == ns_ibb)
                     offeredMethods = offeredMethods | QXmppTransferJob::InBandMethod;
                 else if (option.second == ns_bytestreams)