mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Clean up handling of various include file

Browse source 
This is in the context of the iOS port and shouldn't impact any of the
other builds.

[Dirk Hohndel: refactored the iOS patches]

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Tomaz Canabrava 2016-03-06 06:52:55 -08:00 • committed by Dirk Hohndel
parent 710b3615fe
commit 39313c5b33
9 changed files with 17 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
profile-widget/divepixmapitem.cpp
View file

@ -1,6 +1,6 @@
#include "divepixmapitem.h" #include "divepixmapitem.h"
#include "animationfunctions.h" #include "animationfunctions.h"
#include "divepicturemodel.h" #include "qt-models/divepicturemodel.h"
#include "pref.h" #include "pref.h"
#ifndef SUBSURFACE_MOBILE #ifndef SUBSURFACE_MOBILE
#include "preferences/preferencesdialog.h" #include "preferences/preferencesdialog.h"

2
profile-widget/diveprofileitem.cpp
View file

@ -8,7 +8,7 @@
#ifndef SUBSURFACE_MOBILE #ifndef SUBSURFACE_MOBILE
#include "preferences/preferencesdialog.h" #include "preferences/preferencesdialog.h"
#endif #endif
#include "diveplannermodel.h" #include "qt-models/diveplannermodel.h"
#include "helpers.h" #include "helpers.h"
#include <subsurface-qt/SettingsObjectWrapper.h> #include <subsurface-qt/SettingsObjectWrapper.h>
#include "libdivecomputer/parser.h" #include "libdivecomputer/parser.h"

12
profile-widget/profilewidget2.cpp
View file

@ -1,5 +1,5 @@
#include "profilewidget2.h" #include "profilewidget2.h"
#include "diveplotdatamodel.h" #include "qt-models/diveplotdatamodel.h"
#include "helpers.h" #include "helpers.h"
#include "profile.h" #include "profile.h"
#include "diveeventitem.h" #include "diveeventitem.h"
@ -10,15 +10,15 @@
#include "ruleritem.h" #include "ruleritem.h"
#include "tankitem.h" #include "tankitem.h"
#include "pref.h" #include "pref.h"
#include "divepicturewidget.h" #include "qt-models/diveplannermodel.h"
#include "diveplannermodel.h" #include "qt-models/models.h"
#include "models.h" #include "qt-models/divepicturemodel.h"
#include "divepicturemodel.h"
#include "divelist.h" #include "divelist.h"
#include <subsurface-qt/SettingsObjectWrapper.h> #include <subsurface-qt/SettingsObjectWrapper.h>
#ifndef SUBSURFACE_MOBILE #ifndef SUBSURFACE_MOBILE
#include "diveplanner.h" #include "diveplanner.h"
#include "simplewidgets.h" #include "simplewidgets.h"
#include "divepicturewidget.h"
#endif #endif
#include <libdivecomputer/parser.h> #include <libdivecomputer/parser.h>
@ -34,7 +34,9 @@
#ifndef QT_NO_DEBUG #ifndef QT_NO_DEBUG
#include <QTableView> #include <QTableView>
#endif #endif
#ifndef SUBSURFACE_MOBILE
#include "preferences/preferencesdialog.h" #include "preferences/preferencesdialog.h"
#endif
#include <QtWidgets> #include <QtWidgets>
// a couple of helpers we need // a couple of helpers we need

2
qt-models/divelocationmodel.h
View file

@ -4,7 +4,7 @@
#include <QAbstractTableModel> #include <QAbstractTableModel>
#include <QStringListModel> #include <QStringListModel>
#include <stdint.h> #include <stdint.h>
#include "units.h"
#include "ssrfsortfilterproxymodel.h" #include "ssrfsortfilterproxymodel.h"
class QLineEdit; class QLineEdit;

1
subsurface-core/configuredivecomputerthreads.cpp
View file

@ -1,6 +1,7 @@
#include "configuredivecomputerthreads.h" #include "configuredivecomputerthreads.h"
#include "libdivecomputer/hw.h" #include "libdivecomputer/hw.h"
#include "libdivecomputer.h" #include "libdivecomputer.h"
#include <libdivecomputer/version.h>
#define OSTC3_GAS1 0x10 #define OSTC3_GAS1 0x10
#define OSTC3_GAS2 0x11 #define OSTC3_GAS2 0x11

3
subsurface-core/file.c
View file

@ -923,13 +923,14 @@ int parse_csv_file(const char *filename, char **params, int pnr, const char *csv
* input file added as last parameter. * input file added as last parameter.
*/ */
#ifndef SUBSURFACE_MOBILE
if (verbose >= 2) { if (verbose >= 2) {
fprintf(stderr, "(echo '<csv>'; cat %s;echo '</csv>') | xsltproc ", filename); fprintf(stderr, "(echo '<csv>'; cat %s;echo '</csv>') | xsltproc ", filename);
for (i=0; params[i]; i+=2) for (i=0; params[i]; i+=2)
fprintf(stderr, "--stringparam %s %s ", params[i], params[i+1]); fprintf(stderr, "--stringparam %s %s ", params[i], params[i+1]);
fprintf(stderr, "%s/xslt/csv2xml.xslt -\n", SUBSURFACE_SOURCE); fprintf(stderr, "%s/xslt/csv2xml.xslt -\n", SUBSURFACE_SOURCE);
} }
#endif
ret = parse_xml_buffer(filename, mem.buffer, mem.size, &dive_table, (const char **)params); ret = parse_xml_buffer(filename, mem.buffer, mem.size, &dive_table, (const char **)params);
free(mem.buffer); free(mem.buffer);

2
subsurface-core/libdivecomputer.c
View file

@ -11,7 +11,7 @@
#include "libdivecomputer.h" #include "libdivecomputer.h"
#include <libdivecomputer/uwatec.h> #include <libdivecomputer/uwatec.h>
#include <libdivecomputer/hw.h> #include <libdivecomputer/hw.h>
#include <libdivecomputer/version.h>
/* Christ. Libdivecomputer has the worst configuration system ever. */ /* Christ. Libdivecomputer has the worst configuration system ever. */
#ifdef HW_FROG_H #ifdef HW_FROG_H

2
subsurface-core/libdivecomputer.h
View file

@ -7,7 +7,9 @@
#ifdef DC_VERSION /* prevent a warning with wingdi.h */ #ifdef DC_VERSION /* prevent a warning with wingdi.h */
#undef DC_VERSION #undef DC_VERSION
#endif #endif
#ifdef HAVE_LIBDIVECOMPUTER
#include <libdivecomputer/version.h> #include <libdivecomputer/version.h>
#endif
#include <libdivecomputer/device.h> #include <libdivecomputer/device.h>
#include <libdivecomputer/parser.h> #include <libdivecomputer/parser.h>

1
subsurface-core/subsurfacestartup.c
View file

@ -5,6 +5,7 @@
#include "gettext.h" #include "gettext.h"
#include "qthelperfromc.h" #include "qthelperfromc.h"
#include "git-access.h" #include "git-access.h"
#include "libdivecomputer/version.h"
struct preferences prefs, informational_prefs; struct preferences prefs, informational_prefs;
struct preferences default_prefs = { struct preferences default_prefs = {