Add function for non-BT connection addresses

Simple rewrite of a piece of code separated to its own function
so that is can be used in other places as well. To avoid code
duplication for dynamic BT on/off switching on mobile.

Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>

1 files changed, 15 insertions, 10 deletions

diff --git a/subsurface-mobile-helper.cpp b/subsurface-mobile-helper.cpp
index 56ad029e1..ae7143404 100644
--- a/subsurface-mobile-helper.cpp
+++ b/subsurface-mobile-helper.cpp
@@ -30,6 +30,19 @@
 
 QObject *qqWindowObject = NULL;
 
+void set_non_bt_addresses() {
+#if defined(Q_OS_ANDROID)
+	connectionListModel.addAddress("FTDI");
+#elif defined(Q_OS_LINUX) // since this is in the else, it does NOT include Android
+	connectionListModel.addAddress("/dev/ttyS0");
+	connectionListModel.addAddress("/dev/ttyS1");
+	connectionListModel.addAddress("/dev/ttyS2");
+	connectionListModel.addAddress("/dev/ttyS3");
+	// this makes debugging so much easier - use the simulator
+	connectionListModel.addAddress("/tmp/ttyS1");
+#endif
+}
+
 void init_ui()
 {
 	init_qt_late();
@@ -76,16 +89,8 @@ void run_ui()
 	ctxt->setContextProperty("diveModel", sortModel);
 	ctxt->setContextProperty("gpsModel", gpsSortModel);
 	ctxt->setContextProperty("vendorList", vendorList);
-#if defined(Q_OS_ANDROID)
-	connectionListModel.addAddress("FTDI");
-#elif defined(Q_OS_LINUX) // since this is in the else, it does NOT include Android
-	connectionListModel.addAddress("/dev/ttyS0");
-	connectionListModel.addAddress("/dev/ttyS1");
-	connectionListModel.addAddress("/dev/ttyS2");
-	connectionListModel.addAddress("/dev/ttyS3");
-	// this makes debugging so much easier - use the simulator
-	connectionListModel.addAddress("/tmp/ttyS1");
-#endif
+	set_non_bt_addresses();
+
 	ctxt->setContextProperty("connectionListModel", &connectionListModel);
 	ctxt->setContextProperty("logModel", MessageHandlerModel::self());