From 3d93fb077109e2190ca5f2c7ad04a46768ccad50 Mon Sep 17 00:00:00 2001 From: Alex Trotsenko Date: Tue, 14 Apr 2015 11:30:15 +0300 Subject: QAbstractSocket: simplify a check for data availability We know that the QAbstractSocketPrivate::canReadNotification() slot is called by the engine's read notifier only when new data is available for reading, or when the socket has been closed. This allows us to remove additional checks for engine validity and data availability for unbuffered sockets. Change-Id: Ic278cf2214d418d8fe471ea24a765b8d5840b0a5 Reviewed-by: Oswald Buddenhagen Reviewed-by: Thiago Macieira --- src/network/socket/qabstractsocket.cpp | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'src/network/socket') diff --git a/src/network/socket/qabstractsocket.cpp b/src/network/socket/qabstractsocket.cpp index 08ccff83fa..ed86dbbbae 100644 --- a/src/network/socket/qabstractsocket.cpp +++ b/src/network/socket/qabstractsocket.cpp @@ -723,14 +723,7 @@ bool QAbstractSocketPrivate::canReadNotification() } // Only emit readyRead() if there is data available. - bool hasData = newBytes > 0 -#ifndef QT_NO_UDPSOCKET - || (!isBuffered && socketType != QAbstractSocket::TcpSocket && socketEngine && socketEngine->hasPendingDatagrams()) -#endif - || (!isBuffered && socketType == QAbstractSocket::TcpSocket && socketEngine) - ; - - if (hasData) + if (newBytes > 0 || !isBuffered) emitReadyRead(); // If we were closed as a result of the readyRead() signal, -- cgit v1.2.3