diff options
| author | Marcel Krems <m.krems@software-vision.eu> | 2020-08-10 09:59:49 +0200 |
|---|---|---|
| committer | Marcel Krems <m.krems@software-vision.eu> | 2020-08-10 12:05:09 +0200 |
| commit | a9a7d475d58ddc24ffb1b7e2414a9095c79e842e (patch) | |
| tree | 3ec6c57b7b5d2c20c653956d57d0b52d4123a01d | |
| parent | 406fd60aa4ef1852eec6ae3b9cb5a724855d91e9 (diff) | |
| download | qtwebsockets-a9a7d475d58ddc24ffb1b7e2414a9095c79e842e.tar.gz | |
Change return type from QMap to QMultiMap
QMultiMap no longer inherits QMap which causes the conversion to fail:
error C2440: 'return': cannot convert from 'const QMultiMap<QString,QString>' to 'QMap<QString,QString>'
Change-Id: Ie9c0b2588d0b0c27a81949926b36800f6f6c354c
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
| -rw-r--r-- | src/websockets/qwebsockethandshakerequest.cpp | 2 | ||||
| -rw-r--r-- | src/websockets/qwebsockethandshakerequest_p.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/websockets/qwebsockethandshakerequest.cpp b/src/websockets/qwebsockethandshakerequest.cpp index 17275eb..9c1d41b 100644 --- a/src/websockets/qwebsockethandshakerequest.cpp +++ b/src/websockets/qwebsockethandshakerequest.cpp @@ -119,7 +119,7 @@ bool QWebSocketHandshakeRequest::isValid() const /*! \internal */ -QMap<QString, QString> QWebSocketHandshakeRequest::headers() const +QMultiMap<QString, QString> QWebSocketHandshakeRequest::headers() const { return m_headers; } diff --git a/src/websockets/qwebsockethandshakerequest_p.h b/src/websockets/qwebsockethandshakerequest_p.h index e14c05d..c5e9c44 100644 --- a/src/websockets/qwebsockethandshakerequest_p.h +++ b/src/websockets/qwebsockethandshakerequest_p.h @@ -74,7 +74,7 @@ public: int port() const; bool isSecure() const; bool isValid() const; - QMap<QString, QString> headers() const; + QMultiMap<QString, QString> headers() const; QList<QWebSocketProtocol::Version> versions() const; QString key() const; QString origin() const; |