From fbf3b3121f3517a2a0e0595635f2430e46323e9b Mon Sep 17 00:00:00 2001 From: Timur Pocheptsov Date: Wed, 22 Jul 2020 15:08:08 +0200 Subject: QSslSocket::flush - purge the function marked for removal in Qt6 QAbstractSocket::flush stopped being virtual and, instead, QAbstractSocketPrivate::flush is now virtual. So the code in QSslSocket is essentially a duplicate. Change-Id: Iebb33c8490268270b90a662ab64b1ae47c4cbac7 Reviewed-by: Alex Trotsenko Reviewed-by: Edward Welbourne --- src/network/ssl/qsslsocket.cpp | 19 ------------------- src/network/ssl/qsslsocket.h | 1 - 2 files changed, 20 deletions(-) (limited to 'src/network/ssl') diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp index ac928f10c8..e294a45157 100644 --- a/src/network/ssl/qsslsocket.cpp +++ b/src/network/ssl/qsslsocket.cpp @@ -920,25 +920,6 @@ bool QSslSocket::atEnd() const return QAbstractSocket::atEnd(); } -/*! - This function writes as much as possible from the internal write buffer to - the underlying network socket, without blocking. If any data was written, - this function returns \c true; otherwise false is returned. - - Call this function if you need QSslSocket to start sending buffered data - immediately. The number of bytes successfully written depends on the - operating system. In most cases, you do not need to call this function, - because QAbstractSocket will start sending data automatically once control - goes back to the event loop. In the absence of an event loop, call - waitForBytesWritten() instead. - - \sa write(), waitForBytesWritten() -*/ -bool QSslSocket::flush() -{ - return d_func()->flush(); -} - /*! \since 4.4 diff --git a/src/network/ssl/qsslsocket.h b/src/network/ssl/qsslsocket.h index 3408e36197..c63a74a68c 100644 --- a/src/network/ssl/qsslsocket.h +++ b/src/network/ssl/qsslsocket.h @@ -118,7 +118,6 @@ public: bool canReadLine() const override; void close() override; bool atEnd() const override; - bool flush(); // ### Qt6: remove me (implementation moved to private flush()) void abort(); // From QAbstractSocket: -- cgit v1.2.3