From 4b12f28ca453b038fdeca8e6ada106e0c157296b Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Sat, 5 Oct 2013 00:29:09 -0700 Subject: First steps towards removing glib dependencies - remove the build flags and libraries from the Makefile / Configure.mk - remove the glib types (gboolean, gchar, gint64, gint) - comment out / hack around gettext - replace the glib file helper functions - replace g_ascii_strtod - replace g_build_filename - use environment variables instead of g_get_home_dir() & g_get_user_name() - comment out GPS string parsing (uses glib utf8 macros) This needs massive cleanup, but it's a snapshot of what I have right now, in case people want to look at it. Signed-off-by: Dirk Hohndel --- qt-ui/subsurfacewebservices.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'qt-ui/subsurfacewebservices.cpp') diff --git a/qt-ui/subsurfacewebservices.cpp b/qt-ui/subsurfacewebservices.cpp index f0d33e53f..cd6273087 100644 --- a/qt-ui/subsurfacewebservices.cpp +++ b/qt-ui/subsurfacewebservices.cpp @@ -13,7 +13,7 @@ #include "../divelist.h" struct dive_table gps_location_table; -static gboolean merge_locations_into_dives(void); +static bool merge_locations_into_dives(void); SubsurfaceWebServices* SubsurfaceWebServices::instance() { @@ -177,7 +177,7 @@ unsigned int SubsurfaceWebServices::download_dialog_parse_response(const QByteAr return status; } -static gboolean is_automatic_fix(struct dive *gpsfix) +static bool is_automatic_fix(struct dive *gpsfix) { if (gpsfix && gpsfix->location && (!strcmp(gpsfix->location, "automatic fix") || @@ -188,7 +188,7 @@ static gboolean is_automatic_fix(struct dive *gpsfix) #define SAME_GROUP 6 * 3600 // six hours -static gboolean merge_locations_into_dives(void) +static bool merge_locations_into_dives(void) { int i, nr = 0, changed = 0; struct dive *gpsfix, *last_named_fix = NULL, *dive; -- cgit v1.2.3-70-g09d2