diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2017-02-05 12:44:11 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2017-02-05 12:44:11 -0800 |
| commit | f6cd21ce5a450f8b3ba9cf844559c26f803ac38b (patch) | |
| tree | a22b1d00d129e095c0a04a657acaa0e991f8f551 | |
| parent | 0277d5aacc27893220c5914778896d2b4d14aa82 (diff) | |
| download | subsurface-f6cd21ce5a450f8b3ba9cf844559c26f803ac38b.tar.gz | |
Finish removal of informational_prefs
And make export-html build again.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | core/subsurfacestartup.c | 2 | ||||
| -rw-r--r-- | export-html.cpp | 23 |
2 files changed, 13 insertions, 12 deletions
diff --git a/core/subsurfacestartup.c b/core/subsurfacestartup.c index 500e91857..1f9518136 100644 --- a/core/subsurfacestartup.c +++ b/core/subsurfacestartup.c @@ -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) diff --git a/export-html.cpp b/export-html.cpp index e030cb6c5..53b3a2791 100644 --- a/export-html.cpp +++ b/export-html.cpp @@ -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); |