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

First steps towards removing glib dependencies

Browse source 
- 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 <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2013-10-05 00:29:09 -07:00
parent 3e0ecb5ff6
commit 4b12f28ca4
29 changed files with 382 additions and 159 deletions
Download patch file Download diff file Expand all files Collapse all files

3
qt-ui/diveplanner.h
View file

@ -8,7 +8,6 @@
#include <QDateTime>
#include "dive.h"
#include "ui_diveplanner.h"
class QListView;
class QStringListModel;
@ -202,6 +201,8 @@ private:
int dpMaxTime; // this is the time of the dive calculated by the deco.
};
#include "ui_diveplanner.h"
class DivePlannerWidget : public QWidget {
Q_OBJECT
public:

8
qt-ui/maintab.cpp
View file

@ -696,8 +696,12 @@ void MainTab::on_notes_textChanged()
void MainTab::on_coordinates_textChanged(const QString& text)
{
QByteArray textByteArray = text.toLocal8Bit();
gboolean gpsChanged = FALSE;
EDIT_SELECTED_DIVES(gpsChanged |= gps_changed(mydive, NULL, textByteArray.data()));
bool gpsChanged = FALSE;
// EDIT_SELECTED_DIVES(gpsChanged |= gps_changed(mydive, NULL, textByteArray.data()));
// FIXME
// FIXME
// FIXME
// FIXME
if (gpsChanged) {
markChangedWidget(ui.coordinates);
} else {

3
qt-ui/mainwindow.cpp
View file

@ -20,7 +20,6 @@
#include "divelistview.h"
#include "starwidget.h"
#include "glib.h"
#include "../dive.h"
#include "../divelist.h"
#include "../pref.h"
@ -36,8 +35,6 @@
#include "about.h"
#include "printdialog.h"
#include "glib/gi18n.h"
static MainWindow* instance = 0;
MainWindow* mainWindow()

6
qt-ui/subsurfacewebservices.cpp
View file

@ -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;