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 <fbumberger@rim.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>

3 files changed, 17 insertions, 17 deletions

diff --git a/examples/bluetooth/scanner/scanner.qml b/examples/bluetooth/scanner/scanner.qml
index 52182362..7ae0e28e 100644
--- a/examples/bluetooth/scanner/scanner.qml
+++ b/examples/bluetooth/scanner/scanner.qml
@@ -52,7 +52,8 @@ Item {
         running: true
         discoveryMode: BluetoothDiscoveryModel.DeviceDiscovery
         onDiscoveryModeChanged: console.log("Discovery mode: " + discoveryMode)
-        onNewServiceDiscovered: console.log("Found new service " + service.deviceAddress + " " + service.deviceName + " " + service.serviceName);
+        onServiceDiscovered: console.log("Found new service " + service.deviceAddress + " " + service.deviceName + " " + service.serviceName);
+        onDeviceDiscovered: console.log("New device: " + device)
    }
 
     Rectangle {
@@ -86,6 +87,9 @@ Item {
         width: top.width
         anchors.top: busy.bottom
         anchors.bottom: buttonGroup.top
+        anchors.bottomMargin: 10
+        anchors.topMargin: 10
+        clip: true
 
         model: btModel
         delegate: Rectangle {
@@ -128,7 +132,6 @@ Item {
                             if (s.serviceName) { str += "<br>Service: " + s.serviceName; }
                             if (s.serviceDescription) { str += "<br>Description: " + s.serviceDescription; }
                             if (s.serviceProtocol) { str += "<br>Protocol: " + s.serviceProtocol; }
-                            if (s.servicePort) { str += "<br>Port: " + s.servicePort; }
                             return str;
                         }
                     }
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();