diff options
author | Juha Vuolle <juha.vuolle@insta.fi> | 2022-08-17 13:26:34 +0300 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-08-21 12:09:20 +0000 |
commit | 3f065ce60eb4b687e824d40b70160a0a787a45f9 (patch) | |
tree | 68b2b30cc0a796936aeebee0acef8594e726ae34 | |
parent | dddf877674bf0c7b50ea1c1a102275d046f7c6d5 (diff) |
Fix error() to errorOccurred() in documentation (changed in Qt 6)
Change-Id: I0529f303fa82210853de8d594e67bcdd46f06fe4
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
(cherry picked from commit e3527a10e9861af25784f1afc549770ec4ad5701)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r-- | src/bluetooth/qbluetoothservicediscoveryagent.cpp | 2 | ||||
-rw-r--r-- | src/bluetooth/qbluetoothsocket.cpp | 6 | ||||
-rw-r--r-- | src/bluetooth/qlowenergyservice.cpp | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/bluetooth/qbluetoothservicediscoveryagent.cpp b/src/bluetooth/qbluetoothservicediscoveryagent.cpp index 8a340225..8456c341 100644 --- a/src/bluetooth/qbluetoothservicediscoveryagent.cpp +++ b/src/bluetooth/qbluetoothservicediscoveryagent.cpp @@ -103,7 +103,7 @@ QT_BEGIN_NAMESPACE Unlike the \l QBluetoothDeviceDiscoveryAgent::finished() signal this signal will even be emitted when an error occurred during the service discovery. Therefore - it is recommended to check the \l error() signal to evaluate the success of the + it is recommended to check the \l errorOccurred() signal to evaluate the success of the service discovery discovery. */ diff --git a/src/bluetooth/qbluetoothsocket.cpp b/src/bluetooth/qbluetoothsocket.cpp index 59c09ddc..e05d8a7e 100644 --- a/src/bluetooth/qbluetoothsocket.cpp +++ b/src/bluetooth/qbluetoothsocket.cpp @@ -343,7 +343,7 @@ qint64 QBluetoothSocket::bytesToWrite() const \a service. If a connection is established, QBluetoothSocket enters ConnectedState and emits connected(). - At any point, the socket can emit error() to signal that an error occurred. + At any point, the socket can emit errorOccurred() to signal that an error occurred. Note that most platforms require a pairing prior to connecting to the remote device. Otherwise the connection process may fail. @@ -383,7 +383,7 @@ void QBluetoothSocket::connectToService(const QBluetoothServiceInfo &service, Op the \l ServiceLookupState and \l socketType() is always set to \l QBluetoothServiceInfo::RfcommProtocol. - At any point, the socket can emit error() to signal that an error occurred. + At any point, the socket can emit errorOccurred() to signal that an error occurred. Note that most platforms require a pairing prior to connecting to the remote device. Otherwise the connection process may fail. @@ -404,7 +404,7 @@ void QBluetoothSocket::connectToService(const QBluetoothAddress &address, const The socket first enters ConnectingState, and attempts to connect to \a address. If a connection is established, QBluetoothSocket enters ConnectedState and emits connected(). - At any point, the socket can emit error() to signal that an error occurred. + At any point, the socket can emit errorOccurred() to signal that an error occurred. On Android and BlueZ (version 5.46 or above), a connection to a service can not be established using a port. Calling this function will emit a \l {QBluetoothSocket::SocketError::ServiceNotFoundError}{ServiceNotFoundError}. diff --git a/src/bluetooth/qlowenergyservice.cpp b/src/bluetooth/qlowenergyservice.cpp index d0e74dbd..c823c2a0 100644 --- a/src/bluetooth/qlowenergyservice.cpp +++ b/src/bluetooth/qlowenergyservice.cpp @@ -286,7 +286,7 @@ QT_IMPL_METATYPE_EXTERN_TAGGED(QLowEnergyService::WriteMode, QLowEnergyService__ This signal is emitted when the read request for \a characteristic successfully returned its \a value. The signal might be triggered by calling \l characteristicRead(). If - the read operation is not successful, the \l error() signal is emitted using the + the read operation is not successful, the \l errorOccurred() signal is emitted using the \l CharacteristicReadError flag. \note This signal is only emitted for Central Role related use cases. @@ -301,13 +301,13 @@ QT_IMPL_METATYPE_EXTERN_TAGGED(QLowEnergyService::WriteMode, QLowEnergyService__ This signal is emitted when the value of \a characteristic is successfully changed to \a newValue. The change must have been triggered by calling \l writeCharacteristic(). If the write operation is not successful, - the \l error() signal is emitted using the \l CharacteristicWriteError flag. + the \l errorOccurred() signal is emitted using the \l CharacteristicWriteError flag. The reception of the written signal can be considered as a sign that the target device received the to-be-written value and reports back the status of write request. \note If \l writeCharacteristic() is called using the \l WriteWithoutResponse mode, - this signal and the \l error() are never emitted. + this signal and the \l errorOccurred() are never emitted. \note This signal is only emitted for Central Role related use cases. @@ -339,7 +339,7 @@ QT_IMPL_METATYPE_EXTERN_TAGGED(QLowEnergyService::WriteMode, QLowEnergyService__ This signal is emitted when the read request for \a descriptor successfully returned its \a value. The signal might be triggered by calling \l descriptorRead(). If - the read operation is not successful, the \l error() signal is emitted using the + the read operation is not successful, the \l errorOccurred() signal is emitted using the \l DescriptorReadError flag. \note This signal is only emitted for Central Role related use cases. |