diff options
| author | Denis Shienkov <denis.shienkov@gmail.com> | 2015-10-14 18:49:15 +0300 |
|---|---|---|
| committer | Denis Shienkov <denis.shienkov@gmail.com> | 2015-10-16 09:53:48 +0000 |
| commit | 4cb5575e9ce38f74c471bbecde139bf4f83fa22f (patch) | |
| tree | 683c6e70f7d92049f839d8705f5f4a7d0676d672 /src/bluetooth/qlowenergycontroller_p.h | |
| parent | e624e7e63c6ac2b330720fea465b05190c70023b (diff) | |
Windows: Refactor code related to a services discovering
* We do not need QtConcurrent for a services discovering
because they returns from a cache immediately.
* We don't need to hold the opened device all the time after
connection to it. It is enough to open a device only for a
some time to request of services.
* Now the windows/qwinlowenergybluetooth_p.h file contains
only resolved system LE functions and data types.
Change-Id: I248666d78cc9141bf987987dfd5dd9280decf4b8
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Diffstat (limited to 'src/bluetooth/qlowenergycontroller_p.h')
| -rw-r--r-- | src/bluetooth/qlowenergycontroller_p.h | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/src/bluetooth/qlowenergycontroller_p.h b/src/bluetooth/qlowenergycontroller_p.h index 6d81316d..fde057cf 100644 --- a/src/bluetooth/qlowenergycontroller_p.h +++ b/src/bluetooth/qlowenergycontroller_p.h @@ -65,12 +65,6 @@ QT_END_NAMESPACE #include "android/lowenergynotificationhub_p.h" #endif -#if defined(Q_OS_WIN32) -#include <QtConcurrent> -#include <QtBluetooth/qbluetoothuuid.h> -#include "windows/qwinlowenergybluetooth_p.h" -#endif - QT_BEGIN_NAMESPACE #if defined(QT_BLUEZ_BLUETOOTH) && !defined(QT_BLUEZ_NO_BTLE) @@ -227,15 +221,8 @@ private slots: void characteristicChanged(int charHandle, const QByteArray &data); void serviceError(int attributeHandle, QLowEnergyService::ServiceError errorCode); #elif defined(Q_OS_WIN32) -private slots: - void primaryServicesDiscoveryCompleted(); - private: - void startDiscoveryOfPrimaryServices(); - bool isConnected() const; - - HANDLE hRemoteDevice; - QFutureWatcher<WinLowEnergyBluetooth::ServicesDiscoveryResult> *primaryServicesDiscoveryWatcher; + QString deviceSystemPath; #endif private: QLowEnergyController *q_ptr; |