diff options
| author | Alex Trotsenko <alex1973tr@gmail.com> | 2020-07-31 19:33:41 +0300 |
|---|---|---|
| committer | Alex Trotsenko <alex1973tr@gmail.com> | 2020-08-20 08:33:09 +0300 |
| commit | c0097d1521383ce49956c9f4da8be01ad178f43e (patch) | |
| tree | b7b665ebafeda21840de451eda06fae45326424e /src/network/socket | |
| parent | 0a1241617255d54a3616420d69dd2fa9ade99b4d (diff) | |
Remove QSslSocket::abort()
QAbstractSocket::abort() is not a virtual function and
QSslSocket::abort() does not override it. Having two alternatives
requires a dynamic typecasting and violates the principles of object-
oriented programming.
Due to the BC, we were unable to fix that in Qt5. Now, we can modify
QSslSocket::close() to handle QAbstractSocket::abort() requests and
remove the duplicate.
Change-Id: I49d6f32a571ae6e35b08cb366816f917e580dae8
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Diffstat (limited to 'src/network/socket')
| -rw-r--r-- | src/network/socket/qabstractsocket.cpp | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/network/socket/qabstractsocket.cpp b/src/network/socket/qabstractsocket.cpp index 21f1f742f7..cf6a7672fb 100644 --- a/src/network/socket/qabstractsocket.cpp +++ b/src/network/socket/qabstractsocket.cpp @@ -479,10 +479,6 @@ #include <qscopedvaluerollback.h> #include <qvarlengtharray.h> -#ifndef QT_NO_SSL -#include <QtNetwork/qsslsocket.h> -#endif - #include <private/qthread_p.h> #ifdef QABSTRACTSOCKET_DEBUG @@ -2406,13 +2402,6 @@ void QAbstractSocket::abort() qDebug("QAbstractSocket::abort()"); #endif d->setWriteChannelCount(0); -#ifndef QT_NO_SSL - if (QSslSocket *socket = qobject_cast<QSslSocket *>(this)) { - socket->abort(); - return; - } -#endif - d->abortCalled = true; close(); } |