From 982656351be2f4ec84803022f5ce92f3755a44ad Mon Sep 17 00:00:00 2001 From: Alex Trotsenko Date: Fri, 8 Jan 2016 12:48:50 +0200 Subject: QAbstractSocket: remove redundant handling of recursive calls Recursion is alredy prevented by the emittedReadyRead member. Disabling the read notifications also occurs when: - a new chunk of data has arrived on an unbuffered socket; - the buffer size limit has been reached on a buffered socket; - pauseSocketNotifiers() has been called Subsequent calls to read() or resumeSocketNotifiers() should re-enable the notifications independently from possible nesting. Change-Id: I4587265b8d3ed137516e08fbe92dce2f5eab508c Reviewed-by: Oswald Buddenhagen Reviewed-by: Markus Goetz (Woboq GmbH) --- src/network/socket/qabstractsocket_p.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src/network/socket/qabstractsocket_p.h') diff --git a/src/network/socket/qabstractsocket_p.h b/src/network/socket/qabstractsocket_p.h index 89de5f2684..7b911b450e 100644 --- a/src/network/socket/qabstractsocket_p.h +++ b/src/network/socket/qabstractsocket_p.h @@ -97,10 +97,6 @@ public: void _q_abortConnectionAttempt(); void _q_forceDisconnect(); - bool readSocketNotifierCalled; - bool readSocketNotifierState; - bool readSocketNotifierStateSet; - bool emittedReadyRead; bool emittedBytesWritten; -- cgit v1.2.3