Changeset f6cd21c in subsurface


Ignore:
Timestamp:
Feb 5, 2017, 12:44:11 PM (10 months ago)
Author:
Dirk Hohndel <dirk@…>
Branches:
master
Children:
c2ea3c2
Parents:
0277d5a
Message:

Finish removal of informational_prefs

And make export-html build again.

Signed-off-by: Dirk Hohndel <dirk@…>

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • core/subsurfacestartup.c

    r11dcae4 rf6cd21c  
    88#include "libdivecomputer/version.h"
    99
    10 struct preferences prefs, informational_prefs, git_prefs;
     10struct preferences prefs, git_prefs;
    1111struct preferences default_prefs = {
    1212        .cloud_base_url = "https://cloud.subsurface-divelog.org/",
  • export-html.cpp

    r8f35b73 rf6cd21c  
    33#include <QString>
    44#include <QCommandLineParser>
     5#include <QApplication>
    56#include <QDebug>
    67
    7 #include "qt-gui.h"
    8 #include "qthelper.h"
    9 #include "dive.h"
    10 #include "save-html.h"
    11 #include "stdio.h"
     8#include "core/qt-gui.h"
     9#include "core/qthelper.h"
     10#include "core/dive.h"
     11#include "core/save-html.h"
     12#include <stdio.h>
    1213#include "git2.h"
    13 #include "subsurfacestartup.h"
    14 #include "divelogexportlogic.h"
    15 #include "windowtitleupdate.h"
    16 #include "statistics.h"
     14#include "core/subsurfacestartup.h"
     15#include "core/divelogexportlogic.h"
     16#include "core/windowtitleupdate.h"
     17#include "core/statistics.h"
    1718
    1819int main(int argc, char **argv)
     
    5253        // the units from there
    5354
    54         prefs.unit_system = informational_prefs.unit_system;
    55         prefs.units = informational_prefs.units;
     55        prefs.unit_system = git_prefs.unit_system;
     56        prefs.units = git_prefs.units;
    5657
    5758        // populate the statistics
Note: See TracChangeset for help on using the changeset viewer.