From 8557bc3a605e5d2b1a7dae5999501b19c1c99b58 Mon Sep 17 00:00:00 2001 From: JBB Date: Mon, 20 Jan 2020 00:19:38 +0100 Subject: Port majority of old-style connects (#237) This provides more type safety and is future-proof. --- src/base/QXmppStream.cpp | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) (limited to 'src/base/QXmppStream.cpp') diff --git a/src/base/QXmppStream.cpp b/src/base/QXmppStream.cpp index 68496c93..0a2b0c4b 100644 --- a/src/base/QXmppStream.cpp +++ b/src/base/QXmppStream.cpp @@ -173,29 +173,15 @@ QSslSocket *QXmppStream::socket() const void QXmppStream::setSocket(QSslSocket *socket) { - bool check; - Q_UNUSED(check); - d->socket = socket; if (!d->socket) return; // socket events - check = connect(socket, SIGNAL(connected()), - this, SLOT(_q_socketConnected())); - Q_ASSERT(check); - - check = connect(socket, SIGNAL(encrypted()), - this, SLOT(_q_socketEncrypted())); - Q_ASSERT(check); - - check = connect(socket, SIGNAL(error(QAbstractSocket::SocketError)), - this, SLOT(_q_socketError(QAbstractSocket::SocketError))); - Q_ASSERT(check); - - check = connect(socket, SIGNAL(readyRead()), - this, SLOT(_q_socketReadyRead())); - Q_ASSERT(check); + connect(socket, &QAbstractSocket::connected, this, &QXmppStream::_q_socketConnected); + connect(socket, &QSslSocket::encrypted, this, &QXmppStream::_q_socketEncrypted); + connect(socket, QOverload::of(&QSslSocket::error), this, &QXmppStream::_q_socketError); + connect(socket, &QIODevice::readyRead, this, &QXmppStream::_q_socketReadyRead); } void QXmppStream::_q_socketConnected() -- cgit v1.2.3