From c8983382b26a3a701099bfcac5fdf22a4bed21da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Klitzing?= <aklitzing@gmail.com>
Date: Tue, 23 Aug 2016 08:12:38 +0200
Subject: [PATCH] Eradicate Q_FOREACH loops
Change-Id: I08541a4162ceb4ba101ed44d65143dda6eb84e3d
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
---
src/websockets/qwebsocket_p.cpp | 3 ++-
src/websockets/qwebsockethandshakeresponse.cpp | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/websockets/qwebsocket_p.cpp b/src/websockets/qwebsocket_p.cpp
index 3a20b099..436c8194 100644
--- a/src/websockets/qwebsocket_p.cpp
+++ b/src/websockets/qwebsocket_p.cpp
@@ -1087,7 +1087,8 @@ void QWebSocketPrivate::processStateChanged(QAbstractSocket::SocketState socketS
m_key = generateKey();
QList<QPair<QString, QString> > headers;
- foreach (const QByteArray &key, m_request.rawHeaderList())
+ const auto headerList = m_request.rawHeaderList();
+ for (const QByteArray &key : headerList)
headers << qMakePair(QString::fromLatin1(key),
QString::fromLatin1(m_request.rawHeader(key)));
diff --git a/src/websockets/qwebsockethandshakeresponse.cpp b/src/websockets/qwebsockethandshakeresponse.cpp
index b5e10522..ee57d5c3 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(", "));
--
GitLab