summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/websockets/qwebsocket_p.cpp4
-rw-r--r--src/websockets/qwebsocketframe.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/websockets/qwebsocket_p.cpp b/src/websockets/qwebsocket_p.cpp
index 8f55e24..1a47e76 100644
--- a/src/websockets/qwebsocket_p.cpp
+++ b/src/websockets/qwebsocket_p.cpp
@@ -1085,8 +1085,8 @@ void QWebSocketPrivate::processStateChanged(QAbstractSocket::SocketState socketS
m_key = generateKey();
QList<QPair<QString, QString> > headers;
- const auto keys = m_request.rawHeaderList();
- for (const QByteArray &key : keys)
+ 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/qwebsocketframe.cpp b/src/websockets/qwebsocketframe.cpp
index ebc3c33..d51ae7c 100644
--- a/src/websockets/qwebsocketframe.cpp
+++ b/src/websockets/qwebsocketframe.cpp
@@ -289,7 +289,7 @@ bool QWebSocketFrame::isValid() const
// The arm compiler of Visual Studio 2013 Update 3 crashes when
// trying to optimize QWebSocketFrame::readFrame. Hence turn
// those off for this snippet
-#if (defined(Q_OS_WINPHONE) || defined(Q_OS_WINRT)) && defined(__ARM__)
+#if defined(Q_OS_WINRT) && defined(__ARM__)
# pragma optimize("", off)
#endif
@@ -501,7 +501,7 @@ QWebSocketFrame QWebSocketFrame::readFrame(QIODevice *pIoDevice)
return frame;
}
-#if (defined(Q_OS_WINPHONE) || defined(Q_OS_WINRT)) && defined(__ARM__)
+#if defined(Q_OS_WINRT) && defined(__ARM__)
# pragma optimize("", on)
#endif