AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QAbstractSocket::atEnd(): remove redundant checks

Browse Source 
These checks are implemented in QIODevice::atEnd().

Change-Id: I056f05a59e2422ecbe7470557cb4ba03d98e5e45
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Alex Trotsenko 2015-07-14 19:42:27 +03:00
parent 899a815414
commit bfecc2dbc6
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/network/socket/qabstractsocket.cpp
View File

@ -2373,7 +2373,7 @@ bool QAbstractSocket::isSequential() const
*/ */
bool QAbstractSocket::atEnd() const bool QAbstractSocket::atEnd() const
{ {
return QIODevice::atEnd() && (!isOpen() || d_func()->buffer.isEmpty()); return QIODevice::atEnd();
} }
/*! /*!

2
src/network/socket/qabstractsocket.h
View File

@ -176,7 +176,7 @@ public:
// from QIODevice // from QIODevice
void close() Q_DECL_OVERRIDE; void close() Q_DECL_OVERRIDE;
bool isSequential() const 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(); bool flush();
// for synchronous access // for synchronous access