diff options
author | Kurt Pattyn <pattyn.kurt@gmail.com> | 2013-12-07 12:54:09 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-12-10 11:46:11 +0100 |
commit | 7d35f5c6b7b8b187388523674b4a95585f369d78 (patch) | |
tree | 9c56fc7bc7eddc0da37e0d144e054eef288eb1e2 /src/websockets/qwebsocketserver_p.h | |
parent | 7c8d645c4759f7290fd31fe439abf0a99aac9161 (diff) | |
download | qtwebsockets-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_p.h')
-rw-r--r-- | src/websockets/qwebsocketserver_p.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/websockets/qwebsocketserver_p.h b/src/websockets/qwebsocketserver_p.h index 5e089d7..ad76bbf 100644 --- a/src/websockets/qwebsocketserver_p.h +++ b/src/websockets/qwebsocketserver_p.h @@ -98,7 +98,7 @@ public: #endif void resumeAccepting(); QHostAddress serverAddress() const; - QAbstractSocket::SocketError serverError() const; + QWebSocketProtocol::CloseCode serverError() const; quint16 serverPort() const; void setMaxPendingConnections(int numConnections); bool setSocketDescriptor(qintptr socketDescriptor); @@ -106,8 +106,8 @@ public: bool waitForNewConnection(int msec = 0, bool *timedOut = Q_NULLPTR); QList<QWebSocketProtocol::Version> supportedVersions() const; - QList<QString> supportedProtocols() const; - QList<QString> supportedExtensions() const; + QStringList supportedProtocols() const; + QStringList supportedExtensions() const; void setServerName(const QString &serverName); QString serverName() const; @@ -119,6 +119,8 @@ public: QSslConfiguration sslConfiguration() const; #endif + void setError(QWebSocketProtocol::CloseCode code, QString errorString); + private Q_SLOTS: void onNewConnection(); void onCloseConnection(); @@ -131,6 +133,8 @@ private: QString m_serverName; SecureMode m_secureMode; QQueue<QWebSocket *> m_pendingConnections; + QWebSocketProtocol::CloseCode m_error; + QString m_errorString; void addPendingConnection(QWebSocket *pWebSocket); }; |