diff options
| author | Denis Shienkov <denis.shienkov@gmail.com> | 2015-11-17 12:24:31 +0300 |
|---|---|---|
| committer | Denis Shienkov <denis.shienkov@gmail.com> | 2015-11-17 11:23:15 +0000 |
| commit | 4baa345ffd7d7d826c3d40a37bc3d4fb0c48c9aa (patch) | |
| tree | 5a7c097c6518de050c3e3c44ccd6b2b56af865db /src | |
| parent | ef0342fdbfbf26a4c872deac9eac0ab244a199af (diff) | |
Windows: Use QT_WIN_BLUETOOTH macro where it is possible
Change-Id: I77811a65b530c8994b622d4d18718c50ec629684
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 | 6 | ||||
| -rw-r--r-- | src/bluetooth/qbluetoothlocaldevice_p.h | 2 | ||||
| -rw-r--r-- | src/bluetooth/qlowenergycontroller_p.h | 2 | ||||
| -rw-r--r-- | src/bluetooth/qlowenergyserviceprivate_p.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_p.h b/src/bluetooth/qbluetoothdevicediscoveryagent_p.h index 81015544..cf4fd0c5 100644 --- a/src/bluetooth/qbluetoothdevicediscoveryagent_p.h +++ b/src/bluetooth/qbluetoothdevicediscoveryagent_p.h @@ -73,14 +73,14 @@ class QDBusVariant; QT_END_NAMESPACE #endif -#ifdef Q_OS_WIN32 +#ifdef QT_WIN_BLUETOOTH #include <QtConcurrent> #endif QT_BEGIN_NAMESPACE class QBluetoothDeviceDiscoveryAgentPrivate -#if defined(QT_ANDROID_BLUETOOTH) || defined(Q_OS_WIN32) +#if defined(QT_ANDROID_BLUETOOTH) || defined(QT_WIN_BLUETOOTH) : public QObject { Q_OBJECT @@ -154,7 +154,7 @@ private: QTimer extendedDiscoveryTimer; #endif -#ifdef Q_OS_WIN32 +#ifdef QT_WIN_BLUETOOTH public: typedef void* SearchHandle; static QString discoveredLeDeviceSystemPath(const QBluetoothAddress &deviceAddress); diff --git a/src/bluetooth/qbluetoothlocaldevice_p.h b/src/bluetooth/qbluetoothlocaldevice_p.h index 66f5c1c0..4a6aa529 100644 --- a/src/bluetooth/qbluetoothlocaldevice_p.h +++ b/src/bluetooth/qbluetoothlocaldevice_p.h @@ -200,7 +200,7 @@ private: void initializeAdapterBluez5(); }; -#elif defined(Q_OS_WIN32) +#elif defined(QT_WIN_BLUETOOTH) class QBluetoothLocalDevicePrivate : public QObject { diff --git a/src/bluetooth/qlowenergycontroller_p.h b/src/bluetooth/qlowenergycontroller_p.h index 95a8beec..ca99ae58 100644 --- a/src/bluetooth/qlowenergycontroller_p.h +++ b/src/bluetooth/qlowenergycontroller_p.h @@ -220,7 +220,7 @@ private slots: QLowEnergyService::ServiceError errorCode); void characteristicChanged(int charHandle, const QByteArray &data); void serviceError(int attributeHandle, QLowEnergyService::ServiceError errorCode); -#elif defined(Q_OS_WIN32) +#elif defined(QT_WIN_BLUETOOTH) protected: void customEvent(QEvent *e); private: diff --git a/src/bluetooth/qlowenergyserviceprivate_p.h b/src/bluetooth/qlowenergyserviceprivate_p.h index 51c92045..50a258d5 100644 --- a/src/bluetooth/qlowenergyserviceprivate_p.h +++ b/src/bluetooth/qlowenergyserviceprivate_p.h @@ -62,7 +62,7 @@ public: QLowEnergyCharacteristic::PropertyTypes properties; QByteArray value; QHash<QLowEnergyHandle, DescData> descriptorList; -#ifdef Q_OS_WIN32 +#ifdef QT_WIN_BLUETOOTH Qt::HANDLE hValueChangeEvent; #endif }; |