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/qwebsocket_p.cpp | 22 ---------------------- 1 file changed, 22 deletions(-) (limited to 'src/websockets/qwebsocket_p.cpp') diff --git a/src/websockets/qwebsocket_p.cpp b/src/websockets/qwebsocket_p.cpp index bcbb205..d620008 100644 --- a/src/websockets/qwebsocket_p.cpp +++ b/src/websockets/qwebsocket_p.cpp @@ -1039,28 +1039,6 @@ QAbstractSocket::SocketState QWebSocketPrivate::state() const return m_socketState; } -/*! - \internal - */ -bool QWebSocketPrivate::waitForConnected(int msecs) -{ - bool result = false; - if (Q_LIKELY(m_pSocket)) - result = m_pSocket->waitForConnected(msecs); - return result; -} - -/*! - \internal - */ -bool QWebSocketPrivate::waitForDisconnected(int msecs) -{ - bool result = false; - if (Q_LIKELY(m_pSocket)) - result = m_pSocket->waitForDisconnected(msecs); - return result; -} - /*! \internal */ -- cgit v1.2.1