diff options
Diffstat (limited to 'qt-ui')
| -rw-r--r-- | qt-ui/diveplanner.h | 3 | ||||
| -rw-r--r-- | qt-ui/maintab.cpp | 8 | ||||
| -rw-r--r-- | qt-ui/mainwindow.cpp | 3 | ||||
| -rw-r--r-- | qt-ui/subsurfacewebservices.cpp | 6 |
4 files changed, 11 insertions, 9 deletions
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..b19638b69 100644 --- a/qt-ui/maintab.cpp +++ b/qt-ui/maintab.cpp @@ -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 { diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp index 84b1bc50b..bd2d9d0fb 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() 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; |