summaryrefslogtreecommitdiff
path: root/src/websockets/qwebsocket_p.cpp
diff options
context:
space:
mode:
authorKurt Pattyn <pattyn.kurt@gmail.com>2014-01-11 19:08:28 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-01-11 19:11:17 +0100
commitb019b9ccea08bcc7b65fd9f1a497546924ef592d (patch)
tree58b2bb768b956ba931d5e60a5e5f6febdd366919 /src/websockets/qwebsocket_p.cpp
parenta3f715c477a86b164c7db7a1740ac2ac3b21dbc7 (diff)
downloadqtwebsockets-b019b9ccea08bcc7b65fd9f1a497546924ef592d.tar.gz
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 <pattyn.kurt@gmail.com>
Diffstat (limited to 'src/websockets/qwebsocket_p.cpp')
-rw-r--r--src/websockets/qwebsocket_p.cpp22
1 files changed, 0 insertions, 22 deletions
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
@@ -1042,28 +1042,6 @@ QAbstractSocket::SocketState QWebSocketPrivate::state() const
/*!
\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
- */
void QWebSocketPrivate::setSocketState(QAbstractSocket::SocketState state)
{
Q_Q(QWebSocket);