diff options
| author | Alex Blasche <alexander.blasche@digia.com> | 2014-05-07 16:56:17 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-22 09:07:46 +0200 |
| commit | 26e9cf5bc608c7b50fc27a73442966b3880f0825 (patch) | |
| tree | d5a845e0052c5f65b159a7442724b10ecba7e4d6 /src/bluetooth/qbluetoothservicediscoveryagent_p.h | |
| parent | 91914f0c1f69f3cd79518333cf088a141bb721a0 (diff) | |
Service discovery via Bluez5
At the same time we shift the ServiceClassUUID to service name mapping
to QBluetoothUuid. It was used by Android and now Bluez 5 uses it too.
Task-number: QTBUG-32085
Change-Id: I9f2d4dc4e2997683485f2ba7aaefb646cb72fb75
Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
Diffstat (limited to 'src/bluetooth/qbluetoothservicediscoveryagent_p.h')
| -rw-r--r-- | src/bluetooth/qbluetoothservicediscoveryagent_p.h | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/bluetooth/qbluetoothservicediscoveryagent_p.h b/src/bluetooth/qbluetoothservicediscoveryagent_p.h index d878869d..b3910a7e 100644 --- a/src/bluetooth/qbluetoothservicediscoveryagent_p.h +++ b/src/bluetooth/qbluetoothservicediscoveryagent_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtBluetooth module of the Qt Toolkit. @@ -53,6 +53,7 @@ class OrgBluezManagerInterface; class OrgBluezAdapterInterface; class OrgBluezDeviceInterface; +class OrgFreedesktopDBusObjectManagerInterface; QT_BEGIN_NAMESPACE class QDBusPendingCallWatcher; class QXmlStreamReader; @@ -116,6 +117,9 @@ public: #ifdef QT_BLUEZ_BLUETOOTH void _q_discoveredServices(QDBusPendingCallWatcher *watcher); void _q_createdDevice(QDBusPendingCallWatcher *watcher); + void _q_finishSdpScan(QBluetoothServiceDiscoveryAgent::Error errorCode, + const QString &errorDescription, + const QStringList &xmlRecords); #endif #ifdef QT_ANDROID_BLUETOOTH void _q_processFetchedUuids(const QBluetoothAddress &address, const QList<QBluetoothUuid> &uuids); @@ -131,7 +135,12 @@ private: void stop(); #ifdef QT_BLUEZ_BLUETOOTH + void startBluez5(const QBluetoothAddress &address); + void runSdpScan(const QBluetoothAddress &remoteAddress, + const QBluetoothAddress localAddress); QVariant readAttributeValue(QXmlStreamReader &xml); + QBluetoothServiceInfo parseServiceXml(const QString& xml); + void performMinimalServiceDiscovery(const QBluetoothAddress &deviceAddress); #endif #ifdef QT_QNX_BLUETOOTH @@ -170,7 +179,9 @@ private: bool singleDevice; #ifdef QT_BLUEZ_BLUETOOTH + QString foundHostAdapterPath; OrgBluezManagerInterface *manager; + OrgFreedesktopDBusObjectManagerInterface *managerBluez5; OrgBluezAdapterInterface *adapter; OrgBluezDeviceInterface *device; #endif |