summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdward Welbourne <edward.welbourne@qt.io>2020-02-25 16:03:28 +0100
committerEdward Welbourne <edward.welbourne@qt.io>2020-03-02 15:56:34 +0100
commit5bc1a1f85fedd7d65298f0a4c8ea79fb0670c0d7 (patch)
tree80fc17d94300708f454381168cf1dc5d81588aa8
parent87c9513aed424f0c97a78271f59a34873cc7e522 (diff)
downloadqtwebsockets-5bc1a1f85fedd7d65298f0a4c8ea79fb0670c0d7.tar.gz
Use Qt::SplitBehavior in preference to QString::SplitBehavior
The Qt version was added in 5.14 "for use as eventual replacement for QString::SplitBehavior." Move another step closer to that goal. Change-Id: If65be10a7c86e7b4173fd31f1d277c63c6accb0a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
-rw-r--r--src/websockets/qwebsocket_p.cpp3
-rw-r--r--src/websockets/qwebsockethandshakerequest.cpp11
2 files changed, 6 insertions, 8 deletions
diff --git a/src/websockets/qwebsocket_p.cpp b/src/websockets/qwebsocket_p.cpp
index 56c4cdd..ed09278 100644
--- a/src/websockets/qwebsocket_p.cpp
+++ b/src/websockets/qwebsocket_p.cpp
@@ -1052,8 +1052,7 @@ void QWebSocketPrivate::processHandshake(QTcpSocket *pSocket)
} else if (m_httpStatusCode == 400) {
//HTTP/1.1 400 Bad Request
if (!version.isEmpty()) {
- const QStringList versions = version.split(QStringLiteral(", "),
- QString::SkipEmptyParts);
+ const QStringList versions = version.split(QStringLiteral(", "), Qt::SkipEmptyParts);
if (!versions.contains(QString::number(QWebSocketProtocol::currentVersion()))) {
//if needed to switch protocol version, then we are finished here
//because we cannot handle other protocols than the RFC one (v13)
diff --git a/src/websockets/qwebsockethandshakerequest.cpp b/src/websockets/qwebsockethandshakerequest.cpp
index 19df09b..17275eb 100644
--- a/src/websockets/qwebsockethandshakerequest.cpp
+++ b/src/websockets/qwebsockethandshakerequest.cpp
@@ -230,7 +230,7 @@ void QWebSocketHandshakeRequest::readHandshake(QTextStream &textStream, int maxH
clear();
return;
}
- const QStringList tokens = requestLine.split(' ', QString::SkipEmptyParts);
+ const QStringList tokens = requestLine.split(' ', Qt::SkipEmptyParts);
if (Q_UNLIKELY(tokens.length() < 3)) {
clear();
return;
@@ -301,7 +301,7 @@ void QWebSocketHandshakeRequest::readHandshake(QTextStream &textStream, int maxH
const QStringList versionLines = m_headers.values(QStringLiteral("sec-websocket-version"));
for (QStringList::const_iterator v = versionLines.begin(); v != versionLines.end(); ++v) {
- const QStringList versions = (*v).split(QStringLiteral(","), QString::SkipEmptyParts);
+ const QStringList versions = (*v).split(QStringLiteral(","), Qt::SkipEmptyParts);
for (QStringList::const_iterator i = versions.begin(); i != versions.end(); ++i) {
bool ok = false;
(void)(*i).toUInt(&ok);
@@ -321,8 +321,7 @@ void QWebSocketHandshakeRequest::readHandshake(QTextStream &textStream, int maxH
const QString upgrade = m_headers.value(QStringLiteral("upgrade"), QString());
//must be equal to "websocket", case-insensitive
const QString connection = m_headers.value(QStringLiteral("connection"), QString());
- const QStringList connectionLine = connection.split(QStringLiteral(","),
- QString::SkipEmptyParts);
+ const QStringList connectionLine = connection.split(QStringLiteral(","), Qt::SkipEmptyParts);
QStringList connectionValues;
for (QStringList::const_iterator c = connectionLine.begin(); c != connectionLine.end(); ++c)
connectionValues << (*c).trimmed();
@@ -331,14 +330,14 @@ void QWebSocketHandshakeRequest::readHandshake(QTextStream &textStream, int maxH
m_origin = m_headers.value(QStringLiteral("origin"), QString());
const QStringList protocolLines = m_headers.values(QStringLiteral("sec-websocket-protocol"));
for (const QString& pl : protocolLines) {
- const QStringList protocols = pl.split(QStringLiteral(","), QString::SkipEmptyParts);
+ const QStringList protocols = pl.split(QStringLiteral(","), Qt::SkipEmptyParts);
for (const QString& p : protocols)
m_protocols << p.trimmed();
}
const QStringList extensionLines = m_headers.values(QStringLiteral("sec-websocket-extensions"));
for (const QString& el : extensionLines) {
- const QStringList extensions = el.split(QStringLiteral(","), QString::SkipEmptyParts);
+ const QStringList extensions = el.split(QStringLiteral(","), Qt::SkipEmptyParts);
for (const QString& e : extensions)
m_extensions << e.trimmed();
}