Eradicate Q_FOREACH and Java-style loops and mark the module as Q_FOREACH-free

Change-Id: I200f72423f13b54c636e995b120a70968b0e0758
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

3 files changed, 10 insertions, 13 deletions

diff --git a/src/websockets/qwebsocket_p.cpp b/src/websockets/qwebsocket_p.cpp
index 3a20b09..8f55e24 100644
--- a/src/websockets/qwebsocket_p.cpp
+++ b/src/websockets/qwebsocket_p.cpp
@@ -305,11 +305,9 @@ QWebSocket *QWebSocketPrivate::upgradeFrom(QTcpSocket *pTcpSocket,
     QWebSocket *pWebSocket = new QWebSocket(pTcpSocket, response.acceptedVersion(), parent);
     if (Q_LIKELY(pWebSocket)) {
         QNetworkRequest netRequest(request.requestUrl());
-        QMapIterator<QString, QString> headerIter(request.headers());
-        while (headerIter.hasNext()) {
-            headerIter.next();
-            netRequest.setRawHeader(headerIter.key().toLatin1(), headerIter.value().toLatin1());
-        }
+        const auto headers = request.headers();
+        for (auto it = headers.begin(), end = headers.end(); it != end; ++it)
+            netRequest.setRawHeader(it.key().toLatin1(), it.value().toLatin1());
 #ifndef QT_NO_SSL
         if (QSslSocket *sslSock = qobject_cast<QSslSocket *>(pTcpSocket))
             pWebSocket->setSslConfiguration(sslSock->sslConfiguration());
@@ -1087,7 +1085,8 @@ void QWebSocketPrivate::processStateChanged(QAbstractSocket::SocketState socketS
             m_key = generateKey();
 
             QList<QPair<QString, QString> > headers;
-            foreach (const QByteArray &key, m_request.rawHeaderList())
+            const auto keys = m_request.rawHeaderList();
+            for (const QByteArray &key : keys)
                 headers << qMakePair(QString::fromLatin1(key),
                                      QString::fromLatin1(m_request.rawHeader(key)));
 
@@ -1203,7 +1202,7 @@ QString QWebSocketPrivate::createHandShakeRequest(QString resourceName,
                                                   QString extensions,
                                                   QString protocols,
                                                   QByteArray key,
-                                                  QList<QPair<QString, QString> > headers)
+                                                  const QList<QPair<QString, QString> > &headers)
 {
     QStringList handshakeRequest;
     if (resourceName.contains(QStringLiteral("\r\n"))) {
@@ -1246,11 +1245,9 @@ QString QWebSocketPrivate::createHandShakeRequest(QString resourceName,
     if (protocols.length() > 0)
         handshakeRequest << QStringLiteral("Sec-WebSocket-Protocol: ") % protocols;
 
-    QListIterator<QPair<QString, QString> > headerIter(headers);
-    while (headerIter.hasNext()) {
-        const QPair<QString,QString> &header = headerIter.next();
+    for (const auto &header : headers)
         handshakeRequest << header.first % QStringLiteral(": ") % header.second;
-    }
+
     handshakeRequest << QStringLiteral("\r\n");
 
     return handshakeRequest.join(QStringLiteral("\r\n"));
diff --git a/src/websockets/qwebsocket_p.h b/src/websockets/qwebsocket_p.h
index 139c7ff..4863de7 100644
--- a/src/websockets/qwebsocket_p.h
+++ b/src/websockets/qwebsocket_p.h
@@ -193,7 +193,7 @@ private:
                                    QString extensions,
                                    QString protocols,
                                    QByteArray key,
-                                   QList<QPair<QString, QString> > headers);
+                                   const QList<QPair<QString, QString> > &headers);
 
     static QWebSocket *upgradeFrom(QTcpSocket *tcpSocket,
                                    const QWebSocketHandshakeRequest &request,
diff --git a/src/websockets/qwebsockethandshakeresponse.cpp b/src/websockets/qwebsockethandshakeresponse.cpp
index b5e1052..ee57d5c 100644
--- a/src/websockets/qwebsockethandshakeresponse.cpp
+++ b/src/websockets/qwebsockethandshakeresponse.cpp
@@ -207,7 +207,7 @@ QString QWebSocketHandshakeResponse::getHandshakeResponse(
         if (Q_UNLIKELY(!m_canUpgrade)) {
             response << QStringLiteral("HTTP/1.1 400 Bad Request");
             QStringList versions;
-            Q_FOREACH (QWebSocketProtocol::Version version, supportedVersions)
+            for (QWebSocketProtocol::Version version : supportedVersions)
                 versions << QString::number(static_cast<int>(version));
             response << QStringLiteral("Sec-WebSocket-Version: ")
                                 % versions.join(QStringLiteral(", "));