aboutsummaryrefslogtreecommitdiffstats
path: root/mobile-widgets/qmlmanager.h
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2017-06-05 19:41:57 -0700
committerGravatar Dirk Hohndel <dirk@hohndel.org>2017-06-11 13:55:41 -0700
commitb14a522f4f308aed41ab49b5529cc10c05168716 (patch)
tree2b3540e4aeefbe9c21ab9d3af1af2b07a4f503e0 /mobile-widgets/qmlmanager.h
parent3b993fbaad0738efe54e797b60e4f49270951323 (diff)
downloadsubsurface-b14a522f4f308aed41ab49b5529cc10c05168716.tar.gz
QML UI: move BT handling into core code
This shouldn't be part of the UI (qmlmanager), but part of our overall handling of dive computers and BT devices. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'mobile-widgets/qmlmanager.h')
-rw-r--r--mobile-widgets/qmlmanager.h29
1 files changed, 1 insertions, 28 deletions
diff --git a/mobile-widgets/qmlmanager.h b/mobile-widgets/qmlmanager.h
index b10ae9af2..a41ee509a 100644
--- a/mobile-widgets/qmlmanager.h
+++ b/mobile-widgets/qmlmanager.h
@@ -16,6 +16,7 @@
#include <QAndroidJniObject>
#endif
+#include "core/btdiscovery.h"
#include "core/gpslocation.h"
#include "qt-models/divelistmodel.h"
@@ -121,18 +122,6 @@ public:
QStringList cylinderInit() const;
bool showPin() const;
void setShowPin(bool enable);
- Q_INVOKABLE QStringList getDCListFromVendor(const QString& vendor);
- Q_INVOKABLE int getVendorIndex();
- Q_INVOKABLE int getProductIndex();
- Q_INVOKABLE QString getBtAddress();
-#if defined(BT_SUPPORT)
- struct btPairedDevice {
- QBluetoothAddress address;
- QString name;
- };
- void btDeviceDiscovered(const QBluetoothDeviceInfo &device);
- void getBluetoothDevices();
-#endif
public slots:
void applicationStateChanged(Qt::ApplicationState state);
@@ -216,22 +205,6 @@ private:
bool currentGitLocalOnly;
bool m_showPin;
-#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;
- struct btVendorProduct {
- QBluetoothDeviceInfo btdi;
- int vendorIdx;
- int productIdx;
- };
- QList<struct btVendorProduct> btDCs;
-#endif
-
signals:
void cloudUserNameChanged();
void cloudPasswordChanged();