diff options
author | Alex Trotsenko <alex1973tr@gmail.com> | 2020-08-06 18:57:43 +0300 |
---|---|---|
committer | Alex Trotsenko <alex1973tr@gmail.com> | 2020-08-11 17:21:45 +0300 |
commit | 8f53d66e3e412911f4648e88e3e753043fcbfad8 (patch) | |
tree | a14e015a4517f0d99a137cbf3e1ad0106ce665ed /src/network/socket/qabstractsocket.cpp | |
parent | a99cee1c7b095a552c04c2aa832574a6f0f44720 (diff) |
Introduce QIODevice::skipData()
QIODevice::skip() called a virtual QIODevicePrivate::skip() to
implement an efficient skipping on I/O devices for the internal
subclasses. The user subclasses cannot inherit QIODevicePrivate, so
this functionality was not externally accessible.
This patch replaces QIODevicePrivate::skip() with a virtual protected
QIODevice::skipData(). While the basic implementation simply discards
the data by reading into a dummy buffer, users can reimplement this
function to improve the performance in their subclasses.
[ChangeLog][QtCore][QIODevice] Added virtual protected skipData().
Now, subclasses can implement device-specific skipping of data.
Change-Id: I9522f7f7ab9d03ac06e972a525f8ec2fa909a617
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/network/socket/qabstractsocket.cpp')
-rw-r--r-- | src/network/socket/qabstractsocket.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/network/socket/qabstractsocket.cpp b/src/network/socket/qabstractsocket.cpp index 0f9e22d131..1850265141 100644 --- a/src/network/socket/qabstractsocket.cpp +++ b/src/network/socket/qabstractsocket.cpp @@ -1361,20 +1361,23 @@ void QAbstractSocketPrivate::fetchConnectionParameters() emit q->connected(); } -/*! \internal +/*! \reimp */ -qint64 QAbstractSocketPrivate::skip(qint64 maxSize) +qint64 QAbstractSocket::skipData(qint64 maxSize) { + Q_D(const QAbstractSocket); + // if we're not connected, return -1 indicating EOF - if (!socketEngine || !socketEngine->isValid() || state != QAbstractSocket::ConnectedState) + if (!d->socketEngine || !d->socketEngine->isValid() + || d->state != QAbstractSocket::ConnectedState) return -1; // Caller, QIODevice::skip(), has ensured buffer is empty. So, wait // for more data in buffered mode. - if (isBuffered) + if (d->isBuffered) return 0; - return QIODevicePrivate::skip(maxSize); + return QIODevice::skipData(maxSize); } void QAbstractSocketPrivate::pauseSocketNotifiers(QAbstractSocket *socket) |