summaryrefslogtreecommitdiff
path: root/src/bluetooth/qbluetoothtransferreply.cpp
diff options
context:
space:
mode:
authorAlex Blasche <alexander.blasche@digia.com>2014-09-16 14:04:02 +0200
committerAlex Blasche <alexander.blasche@digia.com>2014-09-18 10:09:50 +0200
commitea917cfce56186ac7cddddd701cfb83f8127a751 (patch)
tree41ef97aba23df27474ca19322b28f9230588ce47 /src/bluetooth/qbluetoothtransferreply.cpp
parente04e8f8aec8afe130427d88a3ae891f0d1bc751f (diff)
downloadqtconnectivity-ea917cfce56186ac7cddddd701cfb83f8127a751.tar.gz
Add missing error() signal to QBluetoothTransferReply
The signal makes error handling much more conveniant. One error situation on QNX did not emit the required finished()/errorType() signals when required. A few minor typo fixes. Task-number: QTBUG-38983 Change-Id: I89c3fbee43921c8894a0ab200ee5550e7dc44543 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/bluetooth/qbluetoothtransferreply.cpp')
-rw-r--r--src/bluetooth/qbluetoothtransferreply.cpp17
1 files changed, 16 insertions, 1 deletions
diff --git a/src/bluetooth/qbluetoothtransferreply.cpp b/src/bluetooth/qbluetoothtransferreply.cpp
index 6ade4808..44f2f6f8 100644
--- a/src/bluetooth/qbluetoothtransferreply.cpp
+++ b/src/bluetooth/qbluetoothtransferreply.cpp
@@ -90,12 +90,23 @@ void QBluetoothTransferReply::abort()
*/
/*!
+ \fn void QBluetoothTransferReply::error(QBluetoothTransferReply::TransferError errorType)
+ \since 5.4
+
+ This signal is emitted whenever an error has occurred. The \a errorType
+ parameter indicates the type of error.
+
+ \sa error(), errorString()
+*/
+
+/*!
Constructs a new QBluetoothTransferReply with \a parent.
*/
QBluetoothTransferReply::QBluetoothTransferReply(QObject *parent)
: QObject(parent), d_ptr(new QBluetoothTransferReplyPrivate())
{
- qRegisterMetaType<QBluetoothTransferReply*>("QBluetoothTransferReply");
+ qRegisterMetaType<QBluetoothTransferReply*>();
+ qRegisterMetaType<QBluetoothTransferReply::TransferError>();
}
/*!
@@ -165,12 +176,16 @@ void QBluetoothTransferReply::setRequest(const QBluetoothTransferRequest &reques
\fn TransferError QBluetoothTransferReply::error() const
The error code of the error that occurred.
+
+ \sa errorString()
*/
/*!
\fn QString QBluetoothTransferReply::errorString() const
String describing the error. Can be displayed to the user.
+
+ \sa error()
*/
QBluetoothTransferReplyPrivate::QBluetoothTransferReplyPrivate()