summaryrefslogtreecommitdiff
path: root/src/websockets/qwebsocketserver.cpp
diff options
context:
space:
mode:
authorKurt Pattyn <pattyn.kurt@gmail.com>2013-12-07 12:54:09 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-12-10 11:46:11 +0100
commit7d35f5c6b7b8b187388523674b4a95585f369d78 (patch)
tree9c56fc7bc7eddc0da37e0d144e054eef288eb1e2 /src/websockets/qwebsocketserver.cpp
parent7c8d645c4759f7290fd31fe439abf0a99aac9161 (diff)
downloadqtwebsockets-7d35f5c6b7b8b187388523674b4a95585f369d78.tar.gz
Cleanup code to comply with Qt style
- Correct placement of curly braces - Remove commented-out code - Remove superfluous qDebug statements - Add missing QT_BEGIN_NAMESPACE declarations - Add move semantics - Add cleanup handling to QWebSocketServerPrivate - Add error handling to handshake response, QWebSocketServerPrivate, QWebSocketServer, dataprocessor Change-Id: I0690dc2c444fd6fc0db974d1459bf41bd8c31d40 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
Diffstat (limited to 'src/websockets/qwebsocketserver.cpp')
-rw-r--r--src/websockets/qwebsocketserver.cpp21
1 files changed, 18 insertions, 3 deletions
diff --git a/src/websockets/qwebsocketserver.cpp b/src/websockets/qwebsocketserver.cpp
index 461e75f..3198c13 100644
--- a/src/websockets/qwebsocketserver.cpp
+++ b/src/websockets/qwebsocketserver.cpp
@@ -103,6 +103,14 @@
*/
/*!
+ \fn void QWebSocketServer::serverError(QNetworkProtocol::CloseCode closeCode)
+ This signal is emitted when an error occurs during the setup of a web socket connection.
+ The \a closeCode parameter describes the type of error that occurred
+
+ \sa errorString()
+*/
+
+/*!
\fn void QWebSocketServer::newConnection()
This signal is emitted every time a new connection is available.
@@ -110,6 +118,13 @@
*/
/*!
+ \fn void QWebSocketServer::closed()
+ This signal is emitted when the server closed it's connection.
+
+ \sa close()
+*/
+
+/*!
\fn void QWebSocketServer::originAuthenticationRequired(QWebSocketCorsAuthenticator *authenticator)
This signal is emitted when a new connection is requested.
The slot connected to this signal should indicate whether the origin (which can be determined by the origin() call)
@@ -381,7 +396,7 @@ QWebSocketServer::SecureMode QWebSocketServer::secureMode() const
Returns an error code for the last error that occurred.
\sa errorString()
*/
-QAbstractSocket::SocketError QWebSocketServer::serverError() const
+QWebSocketProtocol::CloseCode QWebSocketServer::error() const
{
Q_D(const QWebSocketServer);
return d->serverError();
@@ -468,7 +483,7 @@ QList<QWebSocketProtocol::Version> QWebSocketServer::supportedVersions() const
/*!
Returns a list of websocket subprotocols that this server supports.
*/
-QList<QString> QWebSocketServer::supportedProtocols() const
+QStringList QWebSocketServer::supportedProtocols() const
{
Q_D(const QWebSocketServer);
return d->supportedProtocols();
@@ -477,7 +492,7 @@ QList<QString> QWebSocketServer::supportedProtocols() const
/*!
Returns a list of websocket extensions that this server supports.
*/
-QList<QString> QWebSocketServer::supportedExtensions() const
+QStringList QWebSocketServer::supportedExtensions() const
{
Q_D(const QWebSocketServer);
return d->supportedExtensions();