diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2017-12-05 11:49:18 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2017-12-05 19:29:59 -0800 |
| commit | 0e789c601652c6d4efeab123e2c6b7416c3260cb (patch) | |
| tree | 0e74ac22d370c1efcbaaf288b8a58e598bb8674b /mobile-widgets | |
| parent | 5be38b2b14af93e9e5880605fee62ab11d3b16fa (diff) | |
| download | subsurface-0e789c601652c6d4efeab123e2c6b7416c3260cb.tar.gz | |
We no longer support Subsurface-mobile without BT support
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'mobile-widgets')
| -rw-r--r-- | mobile-widgets/qmlmanager.cpp | 8 | ||||
| -rw-r--r-- | mobile-widgets/qmlmanager.h | 4 |
2 files changed, 0 insertions, 12 deletions
diff --git a/mobile-widgets/qmlmanager.cpp b/mobile-widgets/qmlmanager.cpp index bffff14f3..3b1ed4aaa 100644 --- a/mobile-widgets/qmlmanager.cpp +++ b/mobile-widgets/qmlmanager.cpp @@ -13,9 +13,7 @@ #include <QTimer> #include <QDateTime> -#if defined(BT_SUPPORT) #include <QBluetoothLocalDevice> -#endif #include "qt-models/divelistmodel.h" #include "qt-models/gpslistmodel.h" @@ -81,7 +79,6 @@ extern "C" int gitProgressCB(const char *text) return 0; } -#if defined(BT_SUPPORT) void QMLManager::btHostModeChange(QBluetoothLocalDevice::HostMode state) { BTDiscovery *btDiscovery = BTDiscovery::instance(); @@ -98,7 +95,6 @@ void QMLManager::btHostModeChange(QBluetoothLocalDevice::HostMode state) } emit btEnabledChanged(); } -#endif QMLManager::QMLManager() : m_locationServiceEnabled(false), m_verboseEnabled(false), @@ -139,16 +135,12 @@ QMLManager::QMLManager() : m_locationServiceEnabled(false), appendTextToLog(QStringLiteral("built with libgit2 %1.%2.%3").arg(git_maj).arg(git_min).arg(git_rev)); setStartPageText(tr("Starting...")); -#if defined(BT_SUPPORT) // ensure that we start the BTDiscovery - this should be triggered by the export of the class // to QML, but that doesn't seem to always work BTDiscovery *btDiscovery = BTDiscovery::instance(); m_btEnabled = btDiscovery->btAvailable(); connect(&btDiscovery->localBtDevice, &QBluetoothLocalDevice::hostModeStateChanged, this, &QMLManager::btHostModeChange); -#else - m_btEnabled = false; -#endif setShowPin(false); // create location manager service locationProvider = new GpsLocation(&appendTextToLogStandalone, this); diff --git a/mobile-widgets/qmlmanager.h b/mobile-widgets/qmlmanager.h index 548f01921..cd827da4d 100644 --- a/mobile-widgets/qmlmanager.h +++ b/mobile-widgets/qmlmanager.h @@ -9,9 +9,7 @@ #include <QElapsedTimer> #include <QColor> -#if defined(BT_SUPPORT) #include "core/btdiscovery.h" -#endif #include "core/gpslocation.h" #include "core/downloadfromdcthread.h" #include "qt-models/divelistmodel.h" @@ -138,9 +136,7 @@ public: bool showPin() const; void setShowPin(bool enable); Q_INVOKABLE void setStatusbarColor(QColor color); -#if defined(BT_SUPPORT) void btHostModeChange(QBluetoothLocalDevice::HostMode state); -#endif #if defined(Q_OS_ANDROID) void writeToAppLogFile(QString logText); |