diff options
| author | Lubomir I. Ivanov (VMware) <neolit123@gmail.com> | 2018-05-30 00:49:58 +0200 |
|---|---|---|
| committer | Lubomir I. Ivanov <neolit123@gmail.com> | 2018-06-18 12:41:07 +0000 |
| commit | 3a90cf6d46dc6f34ccedb7f02515573d1db4704a (patch) | |
| tree | 8014f72f78431008923cbbd8a39dca203f5a8d9a /src/bluetooth/qbluetoothservicediscoveryagent.h | |
| parent | 515c20f5f20dfb4e665e635a30485d7931ff12df (diff) | |
win32: remove usage of QFuture in qbluetoothservicediscoveryagent
Introduce usage of QThread for service discovery instead of
QFuture.
Details:
- Make _q_nextSdpScan() accept arguments.
- Make QBluetoothServiceDiscoveryAgentPrivate inherit
QObject for QT_WIN_BLUETOOTH.
- Remove usage of the member variables 'systemError', 'hSearch'.
Pass values around, instead.
- Add the helper structs 'FindServiceArguments' and 'FindServiceResult'.
Change-Id: I4e2178b2a7b333c30a235a02807dd64526db4685
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'src/bluetooth/qbluetoothservicediscoveryagent.h')
| -rw-r--r-- | src/bluetooth/qbluetoothservicediscoveryagent.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/bluetooth/qbluetoothservicediscoveryagent.h b/src/bluetooth/qbluetoothservicediscoveryagent.h index 4b1a72c1..6a3f8f03 100644 --- a/src/bluetooth/qbluetoothservicediscoveryagent.h +++ b/src/bluetooth/qbluetoothservicediscoveryagent.h @@ -43,6 +43,7 @@ #include <QtBluetooth/qtbluetoothglobal.h> #include <QtCore/QObject> +#include <QtCore/QVariant> #include <QtBluetooth/QBluetoothServiceInfo> #include <QtBluetooth/QBluetoothUuid> @@ -130,7 +131,7 @@ private: Q_PRIVATE_SLOT(d_func(), void _q_hostModeStateChanged(QBluetoothLocalDevice::HostMode state)) #endif #ifdef QT_WIN_BLUETOOTH - Q_PRIVATE_SLOT(d_func(), void _q_nextSdpScan()) + Q_PRIVATE_SLOT(d_func(), void _q_nextSdpScan(QVariant input)) #endif }; |