From 56c82081a537e6c15edd2d58567fb8874d4a9f04 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Fri, 6 Oct 2017 07:52:17 -0700 Subject: Make compile succeed without BT_SUPPORT Signed-off-by: Dirk Hohndel --- core/btdiscovery.h | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'core/btdiscovery.h') diff --git a/core/btdiscovery.h b/core/btdiscovery.h index 5697c8d0f..61d03f49b 100644 --- a/core/btdiscovery.h +++ b/core/btdiscovery.h @@ -6,13 +6,11 @@ #include #include #include -#if defined(BT_SUPPORT) #include #include #include #include "core/libdivecomputer.h" -#endif #if defined(Q_OS_ANDROID) #include #include @@ -29,7 +27,6 @@ public: ~BTDiscovery(); static BTDiscovery *instance(); -#if defined(BT_SUPPORT) struct btPairedDevice { QString address; QString name; @@ -49,28 +46,25 @@ public: void getBluetoothDevices(); #endif QList getBtDcs(); -#endif + private: static BTDiscovery *m_instance; bool m_btValid; -#if defined(BT_SUPPORT) + QList btDCs; // recognized DCs QList btAllDevices; // all paired BT stuff -#endif + #if defined(Q_OS_ANDROID) bool checkException(const char* method, const QAndroidJniObject* obj); #endif -#if defined(BT_SUPPORT) QList btPairedDevices; QBluetoothLocalDevice localBtDevice; QBluetoothDeviceDiscoveryAgent *discoveryAgent; -#endif signals: void dcVendorChanged(); void dcProductChanged(); void dcBtChanged(); }; - #endif // BTDISCOVERY_H -- cgit v1.2.3-70-g09d2