summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKurt Pattyn <pattyn.kurt@gmail.com>2014-01-25 14:44:50 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-02-01 15:36:18 +0100
commit88de191cfbde67fffedad211317afad0ff3cee3c (patch)
tree389346d0365abc3c93b9f3b8d9eb660d4a88f145 /src
parentc82c6ab73b2adbeaa64febcab591cbaa3a29de3e (diff)
downloadqtwebsockets-88de191cfbde67fffedad211317afad0ff3cee3c.tar.gz
Removed unsupported functionality
Removed subprotocol and extension getter functionality, as this is currently not supported by QtWebSockets. I left the backend implementation intact (in the _p files), for future reference. Change-Id: Ia00739f6f225cd557ceb10b40c83fc81d98aae0b Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com> Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
Diffstat (limited to 'src')
-rw-r--r--src/websockets/qwebsocket.cpp18
-rw-r--r--src/websockets/qwebsocket.h2
-rw-r--r--src/websockets/qwebsocketserver.cpp18
-rw-r--r--src/websockets/qwebsocketserver.h2
4 files changed, 0 insertions, 40 deletions
diff --git a/src/websockets/qwebsocket.cpp b/src/websockets/qwebsocket.cpp
index c08aed3..40b9da1 100644
--- a/src/websockets/qwebsocket.cpp
+++ b/src/websockets/qwebsocket.cpp
@@ -509,24 +509,6 @@ QString QWebSocket::origin() const
}
/*!
- \brief Returns the currently used protocol.
- */
-QString QWebSocket::protocol() const
-{
- Q_D(const QWebSocket);
- return d->protocol();
-}
-
-/*!
- \brief Returns the currently used extension.
- */
-QString QWebSocket::extension() const
-{
- Q_D(const QWebSocket);
- return d->extension();
-}
-
-/*!
\brief Returns the code indicating why the socket was closed.
\sa QWebSocketProtocol::CloseCode, closeReason()
*/
diff --git a/src/websockets/qwebsocket.h b/src/websockets/qwebsocket.h
index 7f4131e..757cf36 100644
--- a/src/websockets/qwebsocket.h
+++ b/src/websockets/qwebsocket.h
@@ -99,8 +99,6 @@ public:
QString resourceName() const;
QUrl requestUrl() const;
QString origin() const;
- QString protocol() const;
- QString extension() const;
QWebSocketProtocol::CloseCode closeCode() const;
QString closeReason() const;
diff --git a/src/websockets/qwebsocketserver.cpp b/src/websockets/qwebsocketserver.cpp
index f2ae3d5..e52a539 100644
--- a/src/websockets/qwebsocketserver.cpp
+++ b/src/websockets/qwebsocketserver.cpp
@@ -535,22 +535,4 @@ QList<QWebSocketProtocol::Version> QWebSocketServer::supportedVersions() const
return d->supportedVersions();
}
-/*!
- Returns a list of websocket subprotocols that this server supports.
- */
-QStringList QWebSocketServer::supportedProtocols() const
-{
- Q_D(const QWebSocketServer);
- return d->supportedProtocols();
-}
-
-/*!
- Returns a list of websocket extensions that this server supports.
- */
-QStringList QWebSocketServer::supportedExtensions() const
-{
- Q_D(const QWebSocketServer);
- return d->supportedExtensions();
-}
-
QT_END_NAMESPACE
diff --git a/src/websockets/qwebsocketserver.h b/src/websockets/qwebsocketserver.h
index 59472fe..630a42d 100644
--- a/src/websockets/qwebsocketserver.h
+++ b/src/websockets/qwebsocketserver.h
@@ -118,8 +118,6 @@ public:
#endif
QList<QWebSocketProtocol::Version> supportedVersions() const;
- QStringList supportedProtocols() const;
- QStringList supportedExtensions() const;
Q_SIGNALS:
void acceptError(QAbstractSocket::SocketError socketError);