From b14a522f4f308aed41ab49b5529cc10c05168716 Mon Sep 17 00:00:00 2001
From: Dirk Hohndel <dirk@hohndel.org>
Date: Mon, 5 Jun 2017 19:41:57 -0700
Subject: 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>
---
 mobile-widgets/qmlmanager.h | 29 +----------------------------
 1 file changed, 1 insertion(+), 28 deletions(-)

(limited to 'mobile-widgets/qmlmanager.h')

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();
-- 
cgit v1.2.3-70-g09d2