diff options
| author | Denis Shienkov <denis.shienkov@gmail.com> | 2015-11-17 12:34:01 +0300 |
|---|---|---|
| committer | Denis Shienkov <denis.shienkov@gmail.com> | 2015-11-17 16:17:16 +0000 |
| commit | 49875b3f1165a78a05fca4f3b3e27dfec4001ab0 (patch) | |
| tree | 4f9d4e2e51c3a859ca288cdeab5e5c8fc3243b52 /src | |
| parent | 4baa345ffd7d7d826c3d40a37bc3d4fb0c48c9aa (diff) | |
Windows: Use Qt::HANDLE instead of typedef void*
Change-Id: I4f2194501f652c38cff43ac1716a5853cd1e1b13
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/bluetooth/qbluetoothdevicediscoveryagent_p.h | 3 | ||||
| -rw-r--r-- | src/bluetooth/qbluetoothservicediscoveryagent_p.h | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_p.h b/src/bluetooth/qbluetoothdevicediscoveryagent_p.h index cf4fd0c5..16ebe63c 100644 --- a/src/bluetooth/qbluetoothdevicediscoveryagent_p.h +++ b/src/bluetooth/qbluetoothdevicediscoveryagent_p.h @@ -156,7 +156,6 @@ private: #ifdef QT_WIN_BLUETOOTH public: - typedef void* SearchHandle; static QString discoveredLeDeviceSystemPath(const QBluetoothAddress &deviceAddress); private slots: @@ -171,7 +170,7 @@ private: QFutureWatcher<QBluetoothDeviceInfo> *scanWatcher; bool active; int systemErrorCode; - SearchHandle hSearch; + Qt::HANDLE hSearch; #endif QBluetoothDeviceDiscoveryAgent *q_ptr; diff --git a/src/bluetooth/qbluetoothservicediscoveryagent_p.h b/src/bluetooth/qbluetoothservicediscoveryagent_p.h index c9620ffd..86eccb12 100644 --- a/src/bluetooth/qbluetoothservicediscoveryagent_p.h +++ b/src/bluetooth/qbluetoothservicediscoveryagent_p.h @@ -187,8 +187,6 @@ private: #endif #ifdef QT_WIN_BLUETOOTH -public: - typedef void* SearchHandle; private: int systemError; bool pendingStop; @@ -196,7 +194,7 @@ private: QFutureWatcher<QBluetoothServiceInfo> *searchWatcher; - SearchHandle hSearch; + Qt::HANDLE hSearch; #endif protected: |