mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-30 22:20:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

cleanup: move application flags to core/subsurfacehelper.h

Browse source 
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>
This commit is contained in:
Berthold Stoeger 2020-10-25 13:57:18 +01:00 committed by Dirk Hohndel
parent 17d21dbf40
commit 2b86fe84f9
6 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
core/dive.h
View file

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

1
core/parse-xml.c
View file

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

3
core/subsurfacestartup.c
View file

@ -5,7 +5,6 @@
#include <stdbool.h> #include <stdbool.h>
#include <string.h> #include <string.h>
#include "errorhelper.h" #include "errorhelper.h"
#include "dive.h" // for quit and force_root
#include "gettext.h" #include "gettext.h"
#include "qthelper.h" #include "qthelper.h"
#include "git-access.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 .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 #ifdef SUBSURFACE_MOBILE_DESKTOP
char *testqml = NULL; char *testqml = NULL;
#endif #endif

4
core/subsurfacestartup.h
View file

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

1
mobile-widgets/qmlmanager.cpp
View file

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

1
subsurface-helper.cpp
View file

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