diff options
author | Oleg Shparber <trollixx@gmail.com> | 2014-04-16 19:01:00 -0700 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-22 09:46:38 +0200 |
commit | 8a52d4bd4f2cf1d9a44cd1f95ad3e2d8da4c132b (patch) | |
tree | f6af9e10b099096f5271fd92cc3b7bf663d512a9 | |
parent | 6d9ab3981a1ae9e224b3c6a8cf107049a0ee5095 (diff) | |
download | qtconnectivity-8a52d4bd4f2cf1d9a44cd1f95ad3e2d8da4c132b.tar.gz |
Provide correct code snippet for QBluetoothServiceDiscoveryAgent
Change-Id: I8b975a2f55833c58479edac5d62809c1e83ea417
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
-rw-r--r-- | src/bluetooth/doc/snippets/doc_src_qtbluetooth.cpp | 29 | ||||
-rw-r--r-- | src/bluetooth/qbluetoothdevicediscoveryagent.cpp | 2 | ||||
-rw-r--r-- | src/bluetooth/qbluetoothservicediscoveryagent.cpp | 2 |
3 files changed, 29 insertions, 4 deletions
diff --git a/src/bluetooth/doc/snippets/doc_src_qtbluetooth.cpp b/src/bluetooth/doc/snippets/doc_src_qtbluetooth.cpp index 88520c35..0975b966 100644 --- a/src/bluetooth/doc/snippets/doc_src_qtbluetooth.cpp +++ b/src/bluetooth/doc/snippets/doc_src_qtbluetooth.cpp @@ -46,6 +46,7 @@ #include <QtCore/QFile> #include <QtCore/QObject> #include <QtBluetooth/QBluetoothDeviceDiscoveryAgent> +#include <QtBluetooth/QBluetoothServiceDiscoveryAgent> #include <QtBluetooth/QBluetoothTransferManager> #include <QtBluetooth/QBluetoothTransferRequest> #include <QtBluetooth/QBluetoothTransferReply> @@ -65,6 +66,7 @@ public: public slots: void deviceDiscovered(const QBluetoothDeviceInfo &device); + void serviceDiscovered(const QBluetoothServiceInfo &service); void transferFinished(QBluetoothTransferReply* reply); }; @@ -94,7 +96,7 @@ if (localDevice.isValid()) { } -//! [discovery] +//! [device_discovery] void MyClass::startDiscovery() { @@ -114,7 +116,30 @@ void MyClass::deviceDiscovered(const QBluetoothDeviceInfo &device) { qDebug() << "Found new device:" << device.name() << '(' << device.address().toString() << ')'; } -//! [discovery] +//! [device_discovery] + +//! [service_discovery] +void MyClass::startDiscovery() +{ + + // Create a discovery agent and connect to its signals + QBluetoothServiceDiscoveryAgent *discoveryAgent = new QBluetoothServiceDiscoveryAgent(this); + connect(discoveryAgent, SIGNAL(serviceDiscovered(QBluetoothServiceInfo)), + this, SLOT(serviceDiscovered(QBluetoothServiceInfo)); + + // Start a discovery + discoveryAgent->start(); + + //... +} + +// In your local slot, read information about the found devices +void MyClass::serviceDiscovered(const QBluetoothServiceInfo &service) +{ + qDebug() << "Found new service:" << service.serviceName() + << '(' << service.device().address().toString() << ')'; +} +//! [service_discovery] void MyClass::objectPush() { diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent.cpp b/src/bluetooth/qbluetoothdevicediscoveryagent.cpp index eeac8f11..fab8f965 100644 --- a/src/bluetooth/qbluetoothdevicediscoveryagent.cpp +++ b/src/bluetooth/qbluetoothdevicediscoveryagent.cpp @@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE \li and call start(). \endlist - \snippet doc_src_qtbluetooth.cpp discovery + \snippet doc_src_qtbluetooth.cpp device_discovery To retrieve results asynchronously, connect to the deviceDiscovered() signal. To get a list of all discovered devices, call discoveredDevices() after the finished() signal. diff --git a/src/bluetooth/qbluetoothservicediscoveryagent.cpp b/src/bluetooth/qbluetoothservicediscoveryagent.cpp index 7e0e701d..36849eed 100644 --- a/src/bluetooth/qbluetoothservicediscoveryagent.cpp +++ b/src/bluetooth/qbluetoothservicediscoveryagent.cpp @@ -61,7 +61,7 @@ QT_BEGIN_NAMESPACE \li and call start(). \endlist - \snippet doc_src_qtbluetooth.cpp discovery + \snippet doc_src_qtbluetooth.cpp service_discovery By default a minimal service discovery is performed. In this mode, the QBluetotohServiceInfo objects returned are guaranteed to contain only device and service UUID information. Depending |