Merge branch 'glib-removal-hack'

Fix obvious merge issue in Rules.mk

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

5 files changed, 11 insertions, 13 deletions

diff --git a/qt-ui/diveplanner.cpp b/qt-ui/diveplanner.cpp
index 1976fcb9d..452d1c848 100644
--- a/qt-ui/diveplanner.cpp
+++ b/qt-ui/diveplanner.cpp
@@ -1184,7 +1184,7 @@ void DivePlannerPointsModel::createTemporaryPlan()
 #endif
 	char *cache = NULL;
 	tempDive = NULL;
-	char *errorString = NULL;
+	const char *errorString = NULL;
 	plan(&diveplan, &cache, &tempDive, isPlanner(), &errorString);
 	if (mode == ADD)
 		copy_samples(tempDive, current_dive);
@@ -1216,7 +1216,7 @@ void DivePlannerPointsModel::createPlan()
 	// to not delete it later. mumble. ;p
 	char *cache = NULL;
 	tempDive = NULL;
-	char *errorString = NULL;
+	const char *errorString = NULL;
 
 	createTemporaryPlan();
 	plan(&diveplan, &cache, &tempDive, isPlanner(), &errorString);
diff --git a/qt-ui/diveplanner.h b/qt-ui/diveplanner.h
index ee81c6996..acb36e63e 100644
--- a/qt-ui/diveplanner.h
+++ b/qt-ui/diveplanner.h
@@ -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:
diff --git a/qt-ui/maintab.cpp b/qt-ui/maintab.cpp
index 2498a0d97..fd40bed86 100644
--- a/qt-ui/maintab.cpp
+++ b/qt-ui/maintab.cpp
@@ -14,6 +14,7 @@
 #include "globe.h"
 #include "completionmodels.h"
 #include "diveplanner.h"
+#include "qthelper.h"
 
 #include <QLabel>
 #include <QCompleter>
@@ -695,9 +696,8 @@ 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 |= gpsHasChanged(mydive, NULL, text));
 	if (gpsChanged) {
 		markChangedWidget(ui.coordinates);
 	} else {
diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp
index 84b1bc50b..247cfdf2f 100644
--- a/qt-ui/mainwindow.cpp
+++ b/qt-ui/mainwindow.cpp
@@ -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()
@@ -271,7 +268,7 @@ void MainWindow::on_actionAddDive_triggered()
 	// now cheat - create one dive that we use to store the info tab data in
 	struct dive *dive = alloc_dive();
 	dive->when = QDateTime::currentMSecsSinceEpoch() / 1000L;
-	dive->dc.model = _("manually added dive"); // do not use tr here since it expects a char*.
+	dive->dc.model = tr("manually added dive").toLocal8Bit().constData(); // do not use tr here since it expects a char*.
 	record_dive(dive);
 	select_dive(get_divenr(dive));
 	ui.InfoWidget->updateDiveInfo(selected_dive);
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;