cleanup: move application flags to core/subsurfacehelper.h

These flags are not dive-related, therefore move their declaration
to the appropriate header file. Likewise, move their definition
from parse-xml.c to subsurfacehelper.c

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>

core/dive.h

@@ -127,11 +127,6 @@ extern depth_t gas_mnd(struct gasmix mix, depth_t end, const struct dive *dive,
 
 extern bool autogroup;
 
-extern int quit, force_root, ignore_bt;
-#ifdef SUBSURFACE_MOBILE_DESKTOP
-extern char *testqml;
-#endif
-
 extern struct dive displayed_dive;
 extern unsigned int dc_number;
 extern struct dive *current_dive;

core/parse-xml.c

@@ -36,7 +36,6 @@
 #include "tag.h"
 #include "xmlparams.h"
 
-int quit, force_root;
 int last_xml_version = -1;
 
 static xmlDoc *test_xslt_transforms(xmlDoc *doc, const struct xml_params *params);

core/subsurfacestartup.c

@@ -5,7 +5,6 @@
 #include <stdbool.h>
 #include <string.h>
 #include "errorhelper.h"
-#include "dive.h" // for quit and force_root
 #include "gettext.h"
 #include "qthelper.h"
 #include "git-access.h"
@@ -103,7 +102,7 @@ struct preferences default_prefs = {
 	.extract_video_thumbnails_position = 20,		// The first fifth seems like a reasonable place
 };
 
-int ignore_bt;
+int quit, force_root, ignore_bt;
 #ifdef SUBSURFACE_MOBILE_DESKTOP
 char *testqml = NULL;
 #endif

core/subsurfacestartup.h

@@ -9,6 +9,10 @@ extern "C" {
 #endif
 
 extern bool imported;
+extern int quit, force_root, ignore_bt;
+#ifdef SUBSURFACE_MOBILE_DESKTOP
+extern char *testqml;
+#endif
 
 void setup_system_prefs(void);
 void parse_argument(const char *arg);

mobile-widgets/qmlmanager.cpp

@@ -36,6 +36,7 @@
 #include "core/cloudstorage.h"
 #include "core/membuffer.h"
 #include "core/downloadfromdcthread.h"
+#include "core/subsurfacestartup.h" // for ignore_bt flag
 #include "core/subsurface-string.h"
 #include "core/pref.h"
 #include "core/selection.h"

subsurface-helper.cpp

@@ -21,6 +21,7 @@
 #include "qt-models/mobilelistmodel.h"
 #include "profile-widget/qmlprofile.h"
 #include "core/downloadfromdcthread.h"
+#include "core/subsurfacestartup.h" // for testqml
 #include "qt-models/diveimportedmodel.h"
 #include "mobile-widgets/qml/kirigami/src/kirigamiplugin.h"
 #else