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

QSslSocket: do not bypass the base class' overrides

Browse Source 
Change-Id: Ifd0842c70af764827a7e815efbc96da6cad99672
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
This commit is contained in:
Giuseppe D'Angelo 2019-05-13 23:46:14 +02:00
parent e92d2f5852
commit e9f383497f
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/network/ssl/qsslsocket.cpp
View File

@ -761,8 +761,8 @@ qint64 QSslSocket::bytesAvailable() const
{
Q_D(const QSslSocket);
if (d->mode == UnencryptedMode)
return QIODevice::bytesAvailable() + (d->plainSocket ? d->plainSocket->bytesAvailable() : 0);
return QIODevice::bytesAvailable();
return QAbstractSocket::bytesAvailable() + (d->plainSocket ? d->plainSocket->bytesAvailable() : 0);
return QAbstractSocket::bytesAvailable();
}
/*!
@ -818,8 +818,8 @@ bool QSslSocket::canReadLine() const
{
Q_D(const QSslSocket);
if (d->mode == UnencryptedMode)
return QIODevice::canReadLine() || (d->plainSocket && d->plainSocket->canReadLine());
return QIODevice::canReadLine();
return QAbstractSocket::canReadLine() || (d->plainSocket && d->plainSocket->canReadLine());
return QAbstractSocket::canReadLine();
}
/*!
@ -849,8 +849,8 @@ bool QSslSocket::atEnd() const
{
Q_D(const QSslSocket);
if (d->mode == UnencryptedMode)
return QIODevice::atEnd() && (!d->plainSocket || d->plainSocket->atEnd());
return QIODevice::atEnd();
return QAbstractSocket::atEnd() && (!d->plainSocket || d->plainSocket->atEnd());
return QAbstractSocket::atEnd();
}
/*!