diff options
Diffstat (limited to 'src/websockets/qwebsocket_p.cpp')
| -rw-r--r-- | src/websockets/qwebsocket_p.cpp | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/src/websockets/qwebsocket_p.cpp b/src/websockets/qwebsocket_p.cpp index 1d23c84..1cfa106 100644 --- a/src/websockets/qwebsocket_p.cpp +++ b/src/websockets/qwebsocket_p.cpp @@ -80,7 +80,7 @@ QWebSocketConfiguration::QWebSocketConfiguration() : #ifndef QT_NO_NETWORKPROXY m_proxy(QNetworkProxy::DefaultProxy), #endif - m_pSocket(Q_NULLPTR) + m_pSocket(nullptr) { } @@ -91,7 +91,7 @@ QWebSocketPrivate::QWebSocketPrivate(const QString &origin, QWebSocketProtocol:: QWebSocket *pWebSocket) : QObjectPrivate(), q_ptr(pWebSocket), - m_pSocket(Q_NULLPTR), + m_pSocket(nullptr), m_errorString(), m_version(version), m_resourceName(), @@ -376,7 +376,7 @@ void QWebSocketPrivate::open(const QNetworkRequest &request, bool mask) if (m_pSocket) { releaseConnections(m_pSocket); m_pSocket->deleteLater(); - m_pSocket = Q_NULLPTR; + m_pSocket = nullptr; } //if (m_url != url) if (Q_LIKELY(!m_pSocket)) { @@ -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,12 +593,11 @@ void QWebSocketPrivate::makeConnections(const QTcpSocket *pTcpSocket) &QWebSocket::preSharedKeyAuthenticationRequired); QObject::connect(sslSocket, &QSslSocket::encryptedBytesWritten, q, &QWebSocket::bytesWritten); - typedef void (QSslSocket:: *sslErrorSignalType)(const QList<QSslError> &); QObjectPrivate::connect(sslSocket, - static_cast<sslErrorSignalType>(&QSslSocket::sslErrors), + QOverload<const QList<QSslError>&>::of(&QSslSocket::sslErrors), this, &QWebSocketPrivate::_q_updateSslConfiguration); 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); @@ -1140,7 +1137,7 @@ void QWebSocketPrivate::socketDestroyed(QObject *socket) { Q_ASSERT(m_pSocket); if (m_pSocket == socket) - m_pSocket = Q_NULLPTR; + m_pSocket = nullptr; } /*! |