diff options
-rw-r--r-- | src/bluetooth/qbluetoothdevicediscoveryagent_p.h | 4 | ||||
-rw-r--r-- | src/bluetooth/qbluetoothservicediscoveryagent_p.h | 8 | ||||
-rw-r--r-- | src/bluetooth/qbluetoothsocket_p.h | 6 | ||||
-rw-r--r-- | src/bluetooth/qlowenergycontroller_p.h | 4 |
4 files changed, 12 insertions, 10 deletions
diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_p.h b/src/bluetooth/qbluetoothdevicediscoveryagent_p.h index 7b57abb2..44834024 100644 --- a/src/bluetooth/qbluetoothdevicediscoveryagent_p.h +++ b/src/bluetooth/qbluetoothdevicediscoveryagent_p.h @@ -78,12 +78,12 @@ class QDBusVariant; QT_END_NAMESPACE #endif +QT_BEGIN_NAMESPACE + #ifdef QT_WINRT_BLUETOOTH class QWinRTBluetoothDeviceDiscoveryWorker; #endif -QT_BEGIN_NAMESPACE - class QBluetoothDeviceDiscoveryAgentPrivate #if defined(QT_ANDROID_BLUETOOTH) || defined(QT_WINRT_BLUETOOTH) : public QObject diff --git a/src/bluetooth/qbluetoothservicediscoveryagent_p.h b/src/bluetooth/qbluetoothservicediscoveryagent_p.h index 9a8da5e3..c4ea20a9 100644 --- a/src/bluetooth/qbluetoothservicediscoveryagent_p.h +++ b/src/bluetooth/qbluetoothservicediscoveryagent_p.h @@ -72,10 +72,6 @@ class QXmlStreamReader; QT_END_NAMESPACE #endif -#ifdef QT_WINRT_BLUETOOTH -class QWinRTBluetoothServiceDiscoveryWorker; -#endif - QT_BEGIN_NAMESPACE class QBluetoothDeviceDiscoveryAgent; @@ -86,6 +82,10 @@ class LocalDeviceBroadcastReceiver; #include <QtBluetooth/QBluetoothLocalDevice> #endif +#ifdef QT_WINRT_BLUETOOTH +class QWinRTBluetoothServiceDiscoveryWorker; +#endif + class QBluetoothServiceDiscoveryAgentPrivate #if defined QT_WINRT_BLUETOOTH : public QObject diff --git a/src/bluetooth/qbluetoothsocket_p.h b/src/bluetooth/qbluetoothsocket_p.h index 9aabf660..907acbe2 100644 --- a/src/bluetooth/qbluetoothsocket_p.h +++ b/src/bluetooth/qbluetoothsocket_p.h @@ -77,8 +77,6 @@ namespace ABI { } } } - -class SocketWorker; #endif // QT_WINRT_BLUETOOTH #ifndef QPRIVATELINEARBUFFER_BUFFERSIZE @@ -92,6 +90,10 @@ QT_FORWARD_DECLARE_CLASS(QSocketNotifier) QT_BEGIN_NAMESPACE +#ifdef QT_WINRT_BLUETOOTH +class SocketWorker; +#endif + class QBluetoothServiceDiscoveryAgent; class QSocketServerPrivate diff --git a/src/bluetooth/qlowenergycontroller_p.h b/src/bluetooth/qlowenergycontroller_p.h index 5c680c3b..b92716e9 100644 --- a/src/bluetooth/qlowenergycontroller_p.h +++ b/src/bluetooth/qlowenergycontroller_p.h @@ -85,8 +85,6 @@ QT_END_NAMESPACE #elif defined(QT_WINRT_BLUETOOTH) #include <wrl.h> #include <windows.devices.bluetooth.h> - -class QWinRTLowEnergyServiceHandler; #endif #include <functional> @@ -103,6 +101,8 @@ class QSocketNotifier; class RemoteDeviceManager; #elif defined(QT_ANDROID_BLUETOOTH) class LowEnergyNotificationHub; +#elif defined(QT_WINRT_BLUETOOTH) +class QWinRTLowEnergyServiceHandler; #endif extern void registerQLowEnergyControllerMetaType(); |