From 7d35f5c6b7b8b187388523674b4a95585f369d78 Mon Sep 17 00:00:00 2001
From: Kurt Pattyn <pattyn.kurt@gmail.com>
Date: Sat, 7 Dec 2013 12:54:09 +0100
Subject: 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>
---
 src/websockets/qwebsocketserver_p.h | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'src/websockets/qwebsocketserver_p.h')

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);
 };
-- 
cgit v1.2.1