From b019b9ccea08bcc7b65fd9f1a497546924ef592d Mon Sep 17 00:00:00 2001 From: Kurt Pattyn Date: Sat, 11 Jan 2014 19:08:28 +0100 Subject: Remove waitXXX() methods from websockets The QWebSocketServer::waitForNewConnection() was just calling QTcpServer::waitForNewConnection(), which was not correct because a connection is only complete when the handshake succeeds. Waiting for the handshake to complete would need a separate thread for the handshake handling code, which would complicate the code a lot. It was decided to leave out all waitXXX() methods from the module, as it is easier to add this functionality later, then to remove it. Change-Id: I778bae45b67f81e151ad2362f772c75e9f537ff0 Reviewed-by: Kurt Pattyn --- src/websockets/qwebsocketserver_p.h | 1 - 1 file changed, 1 deletion(-) (limited to 'src/websockets/qwebsocketserver_p.h') diff --git a/src/websockets/qwebsocketserver_p.h b/src/websockets/qwebsocketserver_p.h index ad76bbf..b9d382e 100644 --- a/src/websockets/qwebsocketserver_p.h +++ b/src/websockets/qwebsocketserver_p.h @@ -103,7 +103,6 @@ public: void setMaxPendingConnections(int numConnections); bool setSocketDescriptor(qintptr socketDescriptor); qintptr socketDescriptor() const; - bool waitForNewConnection(int msec = 0, bool *timedOut = Q_NULLPTR); QList supportedVersions() const; QStringList supportedProtocols() const; -- cgit v1.2.1