diff options
| author | Nedim Hadzic <nhadzic@blackberry.com> | 2013-08-29 12:46:56 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-05 10:23:47 +0200 |
| commit | ecb93e0f63f317039c0bba2c6c754c67b80a9d5e (patch) | |
| tree | b98cc16f8d5416e4dabc9dce101ab068136cecf5 /src/bluetooth/qbluetoothdevicediscoveryagent_p.h | |
| parent | fcb5d4d992b660305c764d54ee70d977c0833602 (diff) | |
Make Bluetooth adapter choosable for device and service search
In case there are more Bluetooth adapter, device and service search
might give different results.
Addition to Change-Id: Ideddb39460985c18547baec986b15e43946c85de - added option
for setting the device adapter for service search. QBluetoothLocalDevice was used
in both classes (device and service search) for passing an argument for setting
adapter. The reason for this to keep the same approach, because in
QBluetoothServiceDiscoveryAgent class there is already a constructor
with QBluetoothAddress argument.
Auto tests and examples updated.
Change-Id: Ib5d7ff23e4846d9d42dae68d8d424031748811e5
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Diffstat (limited to 'src/bluetooth/qbluetoothdevicediscoveryagent_p.h')
| -rw-r--r-- | src/bluetooth/qbluetoothdevicediscoveryagent_p.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_p.h b/src/bluetooth/qbluetoothdevicediscoveryagent_p.h index df3282c9..3f9dd2b3 100644 --- a/src/bluetooth/qbluetoothdevicediscoveryagent_p.h +++ b/src/bluetooth/qbluetoothdevicediscoveryagent_p.h @@ -48,6 +48,8 @@ #include <qbluetoothaddress.h> +#include <qbluetoothlocaldevice.h> + #ifdef QT_BLUEZ_BLUETOOTH class OrgBluezManagerInterface; class OrgBluezAdapterInterface; @@ -71,7 +73,7 @@ class QBluetoothDeviceDiscoveryAgentPrivate #endif Q_DECLARE_PUBLIC(QBluetoothDeviceDiscoveryAgent) public: - QBluetoothDeviceDiscoveryAgentPrivate(const QBluetoothAddress &address); + QBluetoothDeviceDiscoveryAgentPrivate(const QBluetoothAddress &deviceAdapter); ~QBluetoothDeviceDiscoveryAgentPrivate(); void start(); @@ -91,7 +93,7 @@ private: QString errorString; #ifdef QT_BLUEZ_BLUETOOTH - QBluetoothAddress m_deviceAddress; + QBluetoothAddress m_adapterAddress; bool pendingCancel; bool pendingStart; OrgBluezManagerInterface *manager; |