From aa5f17bda3c6c958563c75bf74553c20cd18d6df Mon Sep 17 00:00:00 2001 From: Alex Blasche Date: Thu, 10 Oct 2013 13:38:14 +0200 Subject: BluetoothDiscoveryModel API fixes - rename signal: newServiceDiscovered -> serviceDiscovered - rename signal: newDeviceDiscovered -> deviceDisovered - add parameter to deviceDiscovered signal - improve documentation for above signals - minor example fixes Task-number: QTBUG-33678 Change-Id: I2f9223250ef844564c3e76a85adc25322867fd6e Reviewed-by: Fabian Bumberger Reviewed-by: Alex Blasche --- .../qdeclarativebluetoothdiscoverymodel.cpp | 23 ++++++++++------------ .../qdeclarativebluetoothdiscoverymodel_p.h | 4 ++-- 2 files changed, 12 insertions(+), 15 deletions(-) (limited to 'src/imports') diff --git a/src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel.cpp b/src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel.cpp index 04d08e48..8ec78f85 100644 --- a/src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel.cpp +++ b/src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel.cpp @@ -239,9 +239,12 @@ QVariant QDeclarativeBluetoothDiscoveryModel::data(const QModelIndex &index, int } /*! - \qmlsignal BluetoothDiscoveryModel::newServiceDiscovered() + \qmlsignal BluetoothDiscoveryModel::serviceDiscovered(BluetoothService service) - This handler is called when a new service is discovered. + This handler is called when a new service is discovered. The \a service + parameter contains the service details. + + \sa BluetoothService */ void QDeclarativeBluetoothDiscoveryModel::serviceDiscovered(const QBluetoothServiceInfo &service) @@ -262,13 +265,14 @@ void QDeclarativeBluetoothDiscoveryModel::serviceDiscovered(const QBluetoothServ beginInsertRows(QModelIndex(),d->m_services.count(), d->m_services.count()); d->m_services.append(bs); endInsertRows(); - emit newServiceDiscovered(bs); + emit serviceDiscovered(bs); } /*! - \qmlsignal BluetoothDiscoveryModel::newDeviceDiscovered() + \qmlsignal BluetoothDiscoveryModel::deviceDiscovered(string device) - This handler is called when a new device is discovered. + This handler is called when a new device is discovered. \a device contains + the Bluetooth address of the discovred device. */ void QDeclarativeBluetoothDiscoveryModel::deviceDiscovered(const QBluetoothDeviceInfo &device) @@ -278,16 +282,9 @@ void QDeclarativeBluetoothDiscoveryModel::deviceDiscovered(const QBluetoothDevic beginInsertRows(QModelIndex(),d->m_devices.count(), d->m_devices.count()); d->m_devices.append(device); endInsertRows(); - emit newDeviceDiscovered(); + emit deviceDiscovered(device.address().toString()); } -/*! - \qmlsignal BluetoothDiscoveryModel::discoveryChanged() - - This handler is called when discovery has completed and no - further results will be generated. -*/ - void QDeclarativeBluetoothDiscoveryModel::finishedDiscovery() { setRunning(false); diff --git a/src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel_p.h b/src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel_p.h index feb1a5e1..63f232e0 100644 --- a/src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel_p.h +++ b/src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel_p.h @@ -119,8 +119,8 @@ public: signals: void errorChanged(); void discoveryModeChanged(); - void newServiceDiscovered(QDeclarativeBluetoothService *service); - void newDeviceDiscovered(); + void serviceDiscovered(QDeclarativeBluetoothService *service); + void deviceDiscovered(const QString& device); void runningChanged(); void uuidFilterChanged(); void remoteAddressChanged(); -- cgit v1.2.3