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

Finish removal of informational_prefs

Browse source 
And make export-html build again.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2017-02-05 12:44:11 -08:00
parent 0277d5aacc
commit f6cd21ce5a
2 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/subsurfacestartup.c
View file

@ -7,7 +7,7 @@
#include "git-access.h"
#include "libdivecomputer/version.h"
struct preferences prefs, informational_prefs, git_prefs;
struct preferences prefs, git_prefs;
struct preferences default_prefs = {
.cloud_base_url = "https://cloud.subsurface-divelog.org/",
#if defined(SUBSURFACE_MOBILE)

23
export-html.cpp
View file

@ -2,18 +2,19 @@
#include <QString>
#include <QCommandLineParser>
#include <QApplication>
#include <QDebug>
#include "qt-gui.h"
#include "qthelper.h"
#include "dive.h"
#include "save-html.h"
#include "stdio.h"
#include "core/qt-gui.h"
#include "core/qthelper.h"
#include "core/dive.h"
#include "core/save-html.h"
#include <stdio.h>
#include "git2.h"
#include "subsurfacestartup.h"
#include "divelogexportlogic.h"
#include "windowtitleupdate.h"
#include "statistics.h"
#include "core/subsurfacestartup.h"
#include "core/divelogexportlogic.h"
#include "core/windowtitleupdate.h"
#include "core/statistics.h"
int main(int argc, char **argv)
{
@ -51,8 +52,8 @@ int main(int argc, char **argv)
// this should have set up the informational preferences - let's grab
// the units from there
prefs.unit_system = informational_prefs.unit_system;
prefs.units = informational_prefs.units;
prefs.unit_system = git_prefs.unit_system;
prefs.units = git_prefs.units;
// populate the statistics
struct dive *d = get_dive(0);