From 3dc12a29622c8a8b149533f6dc5abbff701a143b Mon Sep 17 00:00:00 2001 From: Linus Jahn Date: Thu, 2 Jul 2020 18:22:07 +0200 Subject: Replace deprecated QSslSocket::error signal --- src/base/QXmppStream.cpp | 4 ++++ src/client/QXmppOutgoingClient.cpp | 4 ++++ src/server/QXmppOutgoingServer.cpp | 4 ++++ 3 files changed, 12 insertions(+) (limited to 'src') diff --git a/src/base/QXmppStream.cpp b/src/base/QXmppStream.cpp index b05499c4..0cd893a9 100644 --- a/src/base/QXmppStream.cpp +++ b/src/base/QXmppStream.cpp @@ -188,7 +188,11 @@ void QXmppStream::setSocket(QSslSocket *socket) // socket events connect(socket, &QAbstractSocket::connected, this, &QXmppStream::_q_socketConnected); connect(socket, &QSslSocket::encrypted, this, &QXmppStream::_q_socketEncrypted); +#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0) + connect(socket, &QSslSocket::errorOccurred, this, &QXmppStream::_q_socketError); +#else connect(socket, QOverload::of(&QSslSocket::error), this, &QXmppStream::_q_socketError); +#endif connect(socket, &QIODevice::readyRead, this, &QXmppStream::_q_socketReadyRead); } diff --git a/src/client/QXmppOutgoingClient.cpp b/src/client/QXmppOutgoingClient.cpp index 058b629e..2a16b719 100644 --- a/src/client/QXmppOutgoingClient.cpp +++ b/src/client/QXmppOutgoingClient.cpp @@ -176,7 +176,11 @@ QXmppOutgoingClient::QXmppOutgoingClient(QObject *parent) connect(socket, &QAbstractSocket::disconnected, this, &QXmppOutgoingClient::_q_socketDisconnected); connect(socket, QOverload &>::of(&QSslSocket::sslErrors), this, &QXmppOutgoingClient::socketSslErrors); +#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0) + connect(socket, &QSslSocket::errorOccurred, this, &QXmppOutgoingClient::socketError); +#else connect(socket, QOverload::of(&QSslSocket::error), this, &QXmppOutgoingClient::socketError); +#endif // DNS lookups connect(&d->dns, &QDnsLookup::finished, this, &QXmppOutgoingClient::_q_dnsLookupFinished); diff --git a/src/server/QXmppOutgoingServer.cpp b/src/server/QXmppOutgoingServer.cpp index 20e2810a..600f834d 100644 --- a/src/server/QXmppOutgoingServer.cpp +++ b/src/server/QXmppOutgoingServer.cpp @@ -66,7 +66,11 @@ QXmppOutgoingServer::QXmppOutgoingServer(const QString &domain, QObject *parent) setSocket(socket); connect(socket, &QAbstractSocket::disconnected, this, &QXmppOutgoingServer::_q_socketDisconnected); +#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0) + connect(socket, &QSslSocket::errorOccurred, this, &QXmppOutgoingServer::socketError); +#else connect(socket, QOverload::of(&QSslSocket::error), this, &QXmppOutgoingServer::socketError); +#endif // DNS lookups connect(&d->dns, &QDnsLookup::finished, this, &QXmppOutgoingServer::_q_dnsLookupFinished); -- cgit v1.2.3