From d88da535864dde8206359bcdbdda78e7b0847c9c Mon Sep 17 00:00:00 2001
From: Gehad elrobey <gehadelrobey@gmail.com>
Date: Tue, 9 Jun 2015 10:19:52 +0200
Subject: Fix building with NO_MARBLE issue
We can't build with -DNO_MARBLE after some previous commit broke
globe.cpp
- centerOnCurrentDive() is still existing in the code while removed from
header in 6b81fb49d09.
- Some referenced to MainWindow::instance()->globe() even if we are
building with no marble.
- include stdint.h
Signed-off-by: Gehad elrobey <gehadelrobey@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
qt-ui/globe.h | 4 +++-
qt-ui/maintab.cpp | 2 ++
qt-ui/subsurfacewebservices.cpp | 3 +++
3 files changed, 8 insertions(+), 1 deletion(-)
(limited to 'qt-ui')
diff --git a/qt-ui/globe.h b/qt-ui/globe.h
index 31683dc35..903b9f89c 100644
--- a/qt-ui/globe.h
+++ b/qt-ui/globe.h
@@ -1,8 +1,9 @@
#ifndef GLOBE_H
#define GLOBE_H
-#ifndef NO_MARBLE
#include <stdint.h>
+
+#ifndef NO_MARBLE
#include <marble/MarbleWidget.h>
#include <marble/GeoDataCoordinates.h>
@@ -64,6 +65,7 @@ public:
void reload();
void repopulateLabels();
void centerOnDiveSite(uint32_t uuid);
+ void centerOnCurrentDive();
bool eventFilter(QObject *, QEvent *);
public
slots:
diff --git a/qt-ui/maintab.cpp b/qt-ui/maintab.cpp
index 55b01a29f..8b141a16f 100644
--- a/qt-ui/maintab.cpp
+++ b/qt-ui/maintab.cpp
@@ -999,8 +999,10 @@ void MainTab::rejectChanges()
DivePictureModel::instance()->updateDivePictures();
// the user could have edited the location and then canceled the edit
// let's get the correct location back in view
+#ifndef NO_MARBLE
MainWindow::instance()->globe()->centerOnDiveSite(displayed_dive.dive_site_uuid);
MainWindow::instance()->globe()->reload();
+#endif
// show the profile and dive info
MainWindow::instance()->graphics()->replot();
MainWindow::instance()->setEnabledToolbar(true);
diff --git a/qt-ui/subsurfacewebservices.cpp b/qt-ui/subsurfacewebservices.cpp
index 0159977a7..1ea1a8f2f 100644
--- a/qt-ui/subsurfacewebservices.cpp
+++ b/qt-ui/subsurfacewebservices.cpp
@@ -346,8 +346,11 @@ void SubsurfaceWebServices::buttonClicked(QAbstractButton *button)
/* now merge the data in the gps_location table into the dive_table */
if (merge_locations_into_dives()) {
mark_divelist_changed(true);
+#ifndef NO_MARBLE
+
MainWindow::instance()->globe()->repopulateLabels();
MainWindow::instance()->globe()->centerOnDiveSite(current_dive->dive_site_uuid);
+#endif
MainWindow::instance()->information()->updateDiveInfo();
}
--
cgit v1.2.3-70-g09d2