diff options
| author | Alex Trotsenko <alex1973tr@gmail.com> | 2016-01-08 12:48:50 +0200 |
|---|---|---|
| committer | Alex Trotsenko <alex1973tr@gmail.com> | 2016-01-15 18:24:13 +0000 |
| commit | 982656351be2f4ec84803022f5ce92f3755a44ad (patch) | |
| tree | 6564f3156531f4a669118659a6189ae318ccdf42 /src/network/socket/qabstractsocket_p.h | |
| parent | e666ce162b75e926d8746177a30e38d124767e3d (diff) | |
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 <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Markus Goetz (Woboq GmbH) <markus@woboq.com>
Diffstat (limited to 'src/network/socket/qabstractsocket_p.h')
| -rw-r--r-- | src/network/socket/qabstractsocket_p.h | 4 |
1 files changed, 0 insertions, 4 deletions
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; |