diff options
-rw-r--r-- | examples/websockets/sslechoclient/sslechoclient.cpp | 3 | ||||
-rw-r--r-- | src/websockets/qsslserver.cpp | 9 | ||||
-rw-r--r-- | src/websockets/qwebsocket_p.cpp | 9 | ||||
-rw-r--r-- | tests/auto/websockets/qwebsocketserver/tst_qwebsocketserver.cpp | 3 |
4 files changed, 10 insertions, 14 deletions
diff --git a/examples/websockets/sslechoclient/sslechoclient.cpp b/examples/websockets/sslechoclient/sslechoclient.cpp index 3de2fec..6427f88 100644 --- a/examples/websockets/sslechoclient/sslechoclient.cpp +++ b/examples/websockets/sslechoclient/sslechoclient.cpp @@ -59,8 +59,7 @@ SslEchoClient::SslEchoClient(const QUrl &url, QObject *parent) : QObject(parent) { connect(&m_webSocket, &QWebSocket::connected, this, &SslEchoClient::onConnected); - typedef void (QWebSocket:: *sslErrorsSignal)(const QList<QSslError> &); - connect(&m_webSocket, static_cast<sslErrorsSignal>(&QWebSocket::sslErrors), + connect(&m_webSocket, QOverload<const QList<QSslError>&>::of(&QWebSocket::sslErrors), this, &SslEchoClient::onSslErrors); m_webSocket.open(QUrl(url)); } diff --git a/src/websockets/qsslserver.cpp b/src/websockets/qsslserver.cpp index 5df59f7..586e520 100644 --- a/src/websockets/qsslserver.cpp +++ b/src/websockets/qsslserver.cpp @@ -115,11 +115,12 @@ void QSslServer::incomingConnection(qintptr socket) if (Q_LIKELY(pSslSocket->setSocketDescriptor(socket))) { connect(pSslSocket, &QSslSocket::peerVerifyError, this, &QSslServer::peerVerifyError); - typedef void (QSslSocket::* sslErrorsSignal)(const QList<QSslError> &); - connect(pSslSocket, static_cast<sslErrorsSignal>(&QSslSocket::sslErrors), + connect(pSslSocket, QOverload<const QList<QSslError>&>::of(&QSslSocket::sslErrors), this, &QSslServer::sslErrors); - connect(pSslSocket, &QSslSocket::encrypted, this, &QSslServer::newEncryptedConnection); - connect(pSslSocket, &QSslSocket::preSharedKeyAuthenticationRequired, this, &QSslServer::preSharedKeyAuthenticationRequired); + connect(pSslSocket, &QSslSocket::encrypted, + this, &QSslServer::newEncryptedConnection); + connect(pSslSocket, &QSslSocket::preSharedKeyAuthenticationRequired, + this, &QSslServer::preSharedKeyAuthenticationRequired); addPendingConnection(pSslSocket); diff --git a/src/websockets/qwebsocket_p.cpp b/src/websockets/qwebsocket_p.cpp index 5e1a103..1a1bb1f 100644 --- a/src/websockets/qwebsocket_p.cpp +++ b/src/websockets/qwebsocket_p.cpp @@ -563,11 +563,9 @@ void QWebSocketPrivate::makeConnections(const QTcpSocket *pTcpSocket) if (Q_LIKELY(pTcpSocket)) { //pass through signals - typedef void (QAbstractSocket:: *ASErrorSignal)(QAbstractSocket::SocketError); - typedef void (QWebSocket:: *WSErrorSignal)(QAbstractSocket::SocketError); QObject::connect(pTcpSocket, - static_cast<ASErrorSignal>(&QAbstractSocket::error), - q, static_cast<WSErrorSignal>(&QWebSocket::error)); + QOverload<QAbstractSocket::SocketError>::of(&QAbstractSocket::error), + q, QOverload<QAbstractSocket::SocketError>::of(&QWebSocket::error)); #ifndef QT_NO_NETWORKPROXY QObject::connect(pTcpSocket, &QAbstractSocket::proxyAuthenticationRequired, q, &QWebSocket::proxyAuthenticationRequired); @@ -595,9 +593,8 @@ void QWebSocketPrivate::makeConnections(const QTcpSocket *pTcpSocket) &QWebSocket::preSharedKeyAuthenticationRequired); QObject::connect(sslSocket, &QSslSocket::encryptedBytesWritten, q, &QWebSocket::bytesWritten); - typedef void (QSslSocket:: *sslErrorSignalType)(const QList<QSslError> &); QObject::connect(sslSocket, - static_cast<sslErrorSignalType>(&QSslSocket::sslErrors), + QOverload<const QList<QSslError>&>::of(&QSslSocket::sslErrors), q, &QWebSocket::sslErrors); QObjectPrivate::connect(sslSocket, &QSslSocket::encrypted, this, &QWebSocketPrivate::_q_updateSslConfiguration); diff --git a/tests/auto/websockets/qwebsocketserver/tst_qwebsocketserver.cpp b/tests/auto/websockets/qwebsocketserver/tst_qwebsocketserver.cpp index 8f3e293..45394bc 100644 --- a/tests/auto/websockets/qwebsocketserver/tst_qwebsocketserver.cpp +++ b/tests/auto/websockets/qwebsocketserver/tst_qwebsocketserver.cpp @@ -606,9 +606,8 @@ void tst_QWebSocketServer::tst_scheme() QVERIFY(secureServer.listen()); QWebSocket secureSocket; - typedef void (QWebSocket::* ignoreSslErrorsSlot)(); connect(&secureSocket, &QWebSocket::sslErrors, - &secureSocket, static_cast<ignoreSslErrorsSlot>(&QWebSocket::ignoreSslErrors)); + &secureSocket, QOverload<>::of(&QWebSocket::ignoreSslErrors)); secureSocket.open(secureServer.serverUrl().toString()); if (secureServerConnectionSpy.count() == 0) |