diff --git a/src/core/ktcpsocket.h b/src/core/ktcpsocket.h --- a/src/core/ktcpsocket.h +++ b/src/core/ktcpsocket.h @@ -95,6 +95,7 @@ class KSslErrorPrivate; class KTcpSocket; +/** To be replaced by QSslError. */ class KIOCORE_EXPORT KSslError { public: @@ -114,15 +115,21 @@ HostNameMismatch, PathLengthExceeded }; - KSslError(KSslError::Error error = NoError, const QSslCertificate &cert = QSslCertificate()); - KSslError(const QSslError &error); //### explicit yes or no? + /** @deprecated since 5.63, use the QSslError ctor instead. */ + KIOCORE_DEPRECATED KSslError(KSslError::Error error = NoError, const QSslCertificate &cert = QSslCertificate()); + KSslError(const QSslError &error); KSslError(const KSslError &other); ~KSslError(); KSslError &operator=(const KSslError &other); Error error() const; QString errorString() const; QSslCertificate certificate() const; + /** + * Returns the QSslError wrapped by this KSslError. + * @since 5.63 + */ + QSslError sslError() const; private: KSslErrorPrivate *const d; }; diff --git a/src/core/ktcpsocket.cpp b/src/core/ktcpsocket.cpp --- a/src/core/ktcpsocket.cpp +++ b/src/core/ktcpsocket.cpp @@ -323,6 +323,11 @@ return d->error.certificate(); } +QSslError KSslError::sslError() const +{ + return d->error; +} + class KTcpSocketPrivate { public: diff --git a/src/core/tcpslavebase.cpp b/src/core/tcpslavebase.cpp --- a/src/core/tcpslavebase.cpp +++ b/src/core/tcpslavebase.cpp @@ -103,8 +103,7 @@ for (int i = 0; i < sslErrors.count(); i++) { if (sslErrors[i].certificate().isNull()) { const QList peerCertificateChain = socket.peerCertificateChain(); - sslErrors[i] = KSslError(sslErrors[i].error(), - peerCertificateChain[0]); + sslErrors[i] = QSslError(sslErrors[i].sslError().error(), peerCertificateChain[0]); } }