ssrf: add shared helper file

add subsurface-helper.cpp to share functions between mobile and desktop

move mobile qml registrations to a shared function (avoiding differences in registrations)

Target is to replace current subsurface-desktop-main + subsurface-desktop-helper and
subsurface-mobile-main + subsurface-mobile-helper with
subsurface-*-main + subsurface-helper

Signed-off-by: Jan Iversen <jani@apache.org>

1 files changed, 1 insertions, 38 deletions

diff --git a/subsurface-mobile-helper.cpp b/subsurface-mobile-helper.cpp
index 5d7fe6c35..fc0431ef9 100644
--- a/subsurface-mobile-helper.cpp
+++ b/subsurface-mobile-helper.cpp
@@ -17,16 +17,8 @@
 #include <QQmlContext>
 #include <QSortFilterProxyModel>
 #include "mobile-widgets/qmlmanager.h"
-#include "mobile-widgets/qmlprefs.h"
-#include "qt-models/divelistmodel.h"
 #include "qt-models/gpslistmodel.h"
-#include "profile-widget/qmlprofile.h"
-#include "core/downloadfromdcthread.h"
-#include "core/connectionlistmodel.h"
-#include "qt-models/diveimportedmodel.h"
 #include "qt-models/messagehandlermodel.h"
-#include "map-widget/qmlmapwidgethelper.h"
-#include "qt-models/maplocationmodel.h"
 #include "core/settings/qPref.h"
 
 #include "mobile-widgets/qml/kirigami/src/kirigamiplugin.h"
@@ -55,37 +47,8 @@ void init_ui()
 
 void run_ui()
 {
-	int rc;
 	LOG_STP("run_ui starting");
-	rc = qmlRegisterType<qPref>("org.subsurfacedivelog.mobile", 1, 0, "SsrfPrefs");
-	if (rc < 0)
-		qDebug() << "ERROR: Cannot register Prefs (class qPref), QML will not work!!";
-	rc = qmlRegisterType<QMLManager>("org.subsurfacedivelog.mobile", 1, 0, "QMLManager");
-	if (rc < 0)
-		qDebug() << "ERROR: Cannot register QMLManager, QML will not work!!";
-	rc = qmlRegisterType<QMLPrefs>("org.subsurfacedivelog.mobile", 1, 0, "QMLPrefs");
-	if (rc < 0)
-		qDebug() << "ERROR: Cannot register QMLPrefs, QML will not work!!";
-	rc = qmlRegisterType<QMLProfile>("org.subsurfacedivelog.mobile", 1, 0, "QMLProfile");
-	if (rc < 0)
-		qDebug() << "ERROR: Cannot register QMLProfile, QML will not work!!";
-
-	rc = qmlRegisterType<DownloadThread>("org.subsurfacedivelog.mobile", 1, 0, "DCDownloadThread");
-	if (rc < 0)
-		qDebug() << "ERROR: Cannot register DCDownloadThread, QML will not work!!";
-	rc = qmlRegisterType<DiveImportedModel>("org.subsurfacedivelog.mobile", 1, 0, "DCImportModel");
-	if (rc < 0)
-		qDebug() << "ERROR: Cannot register DCImportModel, QML will not work!!";
-
-	rc = qmlRegisterType<MapWidgetHelper>("org.subsurfacedivelog.mobile", 1, 0, "MapWidgetHelper");
-	if (rc < 0)
-		qDebug() << "ERROR: Cannot register MapWidgetHelper, QML will not work!!";
-	rc = qmlRegisterType<MapLocationModel>("org.subsurfacedivelog.mobile", 1, 0, "MapLocationModel");
-	if (rc < 0)
-		qDebug() << "ERROR: Cannot register MapLocationModel, QML will not work!!";
-	rc = qmlRegisterType<MapLocation>("org.subsurfacedivelog.mobile", 1, 0, "MapLocation");
-	if (rc < 0)
-		qDebug() << "ERROR: Cannot register MapLocation, QML will not work!!";
+	register_qml_types();
 
 	QQmlApplicationEngine engine;
 	LOG_STP("run_ui qml engine started");