diff options
| author | Øystein Heskestad <oystein.heskestad@qt.io> | 2022-07-19 10:29:48 +0200 |
|---|---|---|
| committer | Øystein Heskestad <oystein.heskestad@qt.io> | 2022-08-03 15:52:27 +0200 |
| commit | 55cef3a13c8377c55b2fe050751c8a05eb7f9fce (patch) | |
| tree | 6c7e07633931d9fc0179dcfc9fb8cf7afebfbdc9 /src/websockets/qwebsocket.cpp | |
| parent | 398bdb6a318270c9614a56433c273fe62a2bf908 (diff) | |
| download | qtwebsockets-55cef3a13c8377c55b2fe050751c8a05eb7f9fce.tar.gz | |
Replace QWebSocket::error signal with QWebSocket::errorOccurred
The signal error(QAbstractSocket::SocketError) is deprecated because
it overloads the function error() and the naming does not match other
similar signals.
Fixes: QTBUG-101756
Change-Id: Ifbddef73ea39b03a6c72b0e09caa2031135d7687
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'src/websockets/qwebsocket.cpp')
| -rw-r--r-- | src/websockets/qwebsocket.cpp | 33 |
1 files changed, 21 insertions, 12 deletions
diff --git a/src/websockets/qwebsocket.cpp b/src/websockets/qwebsocket.cpp index 9cb58e3..3d96907 100644 --- a/src/websockets/qwebsocket.cpp +++ b/src/websockets/qwebsocket.cpp @@ -172,18 +172,6 @@ not been filled in with new information when the signal returns. \sa textMessageReceived() */ /*! - \fn void QWebSocket::error(QAbstractSocket::SocketError error); - - This signal is emitted after an error occurred. The \a error - parameter describes the type of error that occurred. - - QAbstractSocket::SocketError is not a registered metatype, so for queued - connections, you will have to register it with Q_DECLARE_METATYPE() and - qRegisterMetaType(). - - \sa error(), errorString() -*/ -/*! \fn void QWebSocket::sslErrors(const QList<QSslError> &errors) QWebSocket emits this signal after the SSL handshake to indicate that one or more errors have occurred while establishing the identity of the peer. @@ -996,4 +984,25 @@ quint64 QWebSocket::maxOutgoingFrameSize() return QWebSocketPrivate::maxOutgoingFrameSize(); } +/*! + \fn void QWebSocket::errorOccurred(QAbstractSocket::SocketError error); + + \since 6.5 + \brief This signal is emitted after an error occurred. + + The \a error parameter describes the type of error that occurred. + + QAbstractSocket::SocketError is not a registered metatype, so for queued + connections, you will have to register it with Q_DECLARE_METATYPE() and + qRegisterMetaType(). + + \sa error(), errorString() +*/ +#if QT_DEPRECATED_SINCE(6, 5) +/*! + \fn void QWebSocket::error(QAbstractSocket::SocketError error); + \deprecated [6.5] Use errorOccurred(QAbstractSocket::SocketError error) instead. +*/ +#endif + QT_END_NAMESPACE |