diff options
| author | Alex Trotsenko <alex1973tr@gmail.com> | 2015-07-14 19:42:27 +0300 |
|---|---|---|
| committer | Alex Trotsenko <alex1973tr@gmail.com> | 2015-08-26 10:18:38 +0000 |
| commit | bfecc2dbc670bdb2fa514d96c89ab65cfb10a3c8 (patch) | |
| tree | 064a41ddbcdbd2fb7affa86c7154f8e5a55ee6dd | |
| parent | 899a815414e95da8d9429a4a4f4d7094e49cfc55 (diff) | |
QAbstractSocket::atEnd(): remove redundant checks
These checks are implemented in QIODevice::atEnd().
Change-Id: I056f05a59e2422ecbe7470557cb4ba03d98e5e45
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| -rw-r--r-- | src/network/socket/qabstractsocket.cpp | 2 | ||||
| -rw-r--r-- | src/network/socket/qabstractsocket.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/network/socket/qabstractsocket.cpp b/src/network/socket/qabstractsocket.cpp index 371b9e0264..7d6c18dc2a 100644 --- a/src/network/socket/qabstractsocket.cpp +++ b/src/network/socket/qabstractsocket.cpp @@ -2373,7 +2373,7 @@ bool QAbstractSocket::isSequential() const */ bool QAbstractSocket::atEnd() const { - return QIODevice::atEnd() && (!isOpen() || d_func()->buffer.isEmpty()); + return QIODevice::atEnd(); } /*! diff --git a/src/network/socket/qabstractsocket.h b/src/network/socket/qabstractsocket.h index 23f0d26cbd..f8edc74a24 100644 --- a/src/network/socket/qabstractsocket.h +++ b/src/network/socket/qabstractsocket.h @@ -176,7 +176,7 @@ public: // from QIODevice void close() Q_DECL_OVERRIDE; bool isSequential() const Q_DECL_OVERRIDE; - bool atEnd() const Q_DECL_OVERRIDE; + bool atEnd() const Q_DECL_OVERRIDE; // ### Qt6: remove me bool flush(); // for synchronous access |