diff options
author | Luca Niccoli <lultimouomo@gmail.com> | 2015-04-02 07:28:20 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-08 08:46:04 +0000 |
commit | ba3b71327577f3ea348e9511c1475cf48f821880 (patch) | |
tree | 823caec3379843d8f4b564fe6eed37b5b0204a45 /src/websockets/qwebsocket_p.h | |
parent | 01eaae540cace513fa73340631dbb3a854c713b5 (diff) | |
download | qtwebsockets-ba3b71327577f3ea348e9511c1475cf48f821880.tar.gz |
Add open(const QNetworkRequest &) and request()
Request headers are not yet handled, only the QNetworkRequest::url() is
taken into consideration.
[ChangeLog][QWebSocket] Added open(const QNetworkRequest &) and request()
Task-number: QTBUG-40842
Change-Id: Ia2e10f22c79b0a085afb9a2eb8437b7a73d4a045
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
Diffstat (limited to 'src/websockets/qwebsocket_p.h')
-rw-r--r-- | src/websockets/qwebsocket_p.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/websockets/qwebsocket_p.h b/src/websockets/qwebsocket_p.h index d9d0689..e688463 100644 --- a/src/websockets/qwebsocket_p.h +++ b/src/websockets/qwebsocket_p.h @@ -126,7 +126,7 @@ public: QWebSocketProtocol::Version version() const; QString resourceName() const; - QUrl requestUrl() const; + QNetworkRequest request() const; QString origin() const; QString protocol() const; QString extension() const; @@ -144,7 +144,7 @@ public: #endif void close(QWebSocketProtocol::CloseCode closeCode, QString reason); - void open(const QUrl &url, bool mask); + void open(const QNetworkRequest &request, bool mask); void ping(const QByteArray &payload); QWebSocket * const q_ptr; @@ -154,7 +154,7 @@ private: QWebSocket *pWebSocket); void setVersion(QWebSocketProtocol::Version version); void setResourceName(const QString &resourceName); - void setRequestUrl(const QUrl &requestUrl); + void setRequest(const QNetworkRequest &request); void setOrigin(const QString &origin); void setProtocol(const QString &protocol); void setExtension(const QString &extension); @@ -199,7 +199,7 @@ private: QWebSocketProtocol::Version m_version; QUrl m_resource; QString m_resourceName; - QUrl m_requestUrl; + QNetworkRequest m_request; QString m_origin; QString m_protocol; QString m_extension; |