diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2017-10-06 07:52:17 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2017-10-07 10:06:47 -0700 |
| commit | 56c82081a537e6c15edd2d58567fb8874d4a9f04 (patch) | |
| tree | 0bd02a0f51793234202ea89facb1edb8807f3eb3 /core/btdiscovery.h | |
| parent | 7aacaf60da7e73b9c57012e1846f709acb4d0ac2 (diff) | |
| download | subsurface-56c82081a537e6c15edd2d58567fb8874d4a9f04.tar.gz | |
Make compile succeed without BT_SUPPORT
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'core/btdiscovery.h')
| -rw-r--r-- | core/btdiscovery.h | 12 |
1 files changed, 3 insertions, 9 deletions
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 <QString> #include <QLoggingCategory> #include <QAbstractListModel> -#if defined(BT_SUPPORT) #include <QBluetoothLocalDevice> #include <QBluetoothDeviceDiscoveryAgent> #include <QBluetoothUuid> #include "core/libdivecomputer.h" -#endif #if defined(Q_OS_ANDROID) #include <QAndroidJniObject> #include <QAndroidJniEnvironment> @@ -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<btVendorProduct> getBtDcs(); -#endif + private: static BTDiscovery *m_instance; bool m_btValid; -#if defined(BT_SUPPORT) + QList<struct btVendorProduct> btDCs; // recognized DCs QList<struct btVendorProduct> 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<struct btPairedDevice> btPairedDevices; QBluetoothLocalDevice localBtDevice; QBluetoothDeviceDiscoveryAgent *discoveryAgent; -#endif signals: void dcVendorChanged(); void dcProductChanged(); void dcBtChanged(); }; - #endif // BTDISCOVERY_H |