summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMårten Nordheim <marten.nordheim@qt.io>2020-01-22 15:51:18 +0100
committerMårten Nordheim <marten.nordheim@qt.io>2020-01-23 13:26:09 +0100
commit51dd88d8963920b850d79e22b1820d207e0569c7 (patch)
treee91b42e3e1614a58e8e60ee0350b1a9ad75791f8
parente3d919e215d987ec8f912c7cec05ba502d4c3f0b (diff)
downloadqtwebsockets-51dd88d8963920b850d79e22b1820d207e0569c7.tar.gz
Change QMap to QMultiMap
Because insertMulti is deprecated Change-Id: I3965ea7159b2516b35c45072115eba1ab621b89a Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
-rw-r--r--src/websockets/qwebsocket_p.cpp4
-rw-r--r--src/websockets/qwebsocket_p.h2
-rw-r--r--src/websockets/qwebsockethandshakerequest.cpp4
-rw-r--r--src/websockets/qwebsockethandshakerequest_p.h2
4 files changed, 6 insertions, 6 deletions
diff --git a/src/websockets/qwebsocket_p.cpp b/src/websockets/qwebsocket_p.cpp
index 434dca4..1493e15 100644
--- a/src/websockets/qwebsocket_p.cpp
+++ b/src/websockets/qwebsocket_p.cpp
@@ -1004,8 +1004,8 @@ void QWebSocketPrivate::processHandshake(QTcpSocket *pSocket)
errorDescription = QWebSocket::tr("Malformed header in response: %1.").arg(headerLine);
break;
}
- lastHeader = m_headers.insertMulti(headerLine.left(colonPos).trimmed().toLower(),
- headerLine.mid(colonPos + 1).trimmed());
+ lastHeader = m_headers.insert(headerLine.left(colonPos).trimmed().toLower(),
+ headerLine.mid(colonPos + 1).trimmed());
}
}
diff --git a/src/websockets/qwebsocket_p.h b/src/websockets/qwebsocket_p.h
index 1db1077..2d56f8a 100644
--- a/src/websockets/qwebsocket_p.h
+++ b/src/websockets/qwebsocket_p.h
@@ -248,7 +248,7 @@ private:
int m_httpStatusCode;
int m_httpMajorVersion, m_httpMinorVersion;
QString m_httpStatusMessage;
- QMap<QString, QString> m_headers;
+ QMultiMap<QString, QString> m_headers;
friend class QWebSocketServerPrivate;
#ifdef Q_OS_WASM
diff --git a/src/websockets/qwebsockethandshakerequest.cpp b/src/websockets/qwebsockethandshakerequest.cpp
index bfc8a3d..19df09b 100644
--- a/src/websockets/qwebsockethandshakerequest.cpp
+++ b/src/websockets/qwebsockethandshakerequest.cpp
@@ -268,8 +268,8 @@ void QWebSocketHandshakeRequest::readHandshake(QTextStream &textStream, int maxH
clear();
return;
}
- lastHeader = m_headers.insertMulti(headerLine.left(colonPos).trimmed().toLower(),
- headerLine.mid(colonPos + 1).trimmed());
+ lastHeader = m_headers.insert(headerLine.left(colonPos).trimmed().toLower(),
+ headerLine.mid(colonPos + 1).trimmed());
}
if (m_headers.size() > maxHeaders) {
clear();
diff --git a/src/websockets/qwebsockethandshakerequest_p.h b/src/websockets/qwebsockethandshakerequest_p.h
index e5762df..e14c05d 100644
--- a/src/websockets/qwebsockethandshakerequest_p.h
+++ b/src/websockets/qwebsockethandshakerequest_p.h
@@ -91,7 +91,7 @@ private:
int m_port;
bool m_isSecure;
bool m_isValid;
- QMap<QString, QString> m_headers;
+ QMultiMap<QString, QString> m_headers;
QList<QWebSocketProtocol::Version> m_versions;
QString m_key;
QString m_origin;