diff options
| author |  Gehad elrobey <gehadelrobey@gmail.com> | 2015-06-09 10:19:52 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2015-06-09 11:22:41 -0700 |
| commit | d88da535864dde8206359bcdbdda78e7b0847c9c (patch) | |
| tree | 2cc5d9aba079de4c9ea2cb952b817f37cd42a0c2 /qt-ui/subsurfacewebservices.cpp | |
| parent | d9801b67b4dc7b925b356d2574cafaa03e598a3b (diff) | |
| download | subsurface-d88da535864dde8206359bcdbdda78e7b0847c9c.tar.gz | |
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>
Diffstat (limited to 'qt-ui/subsurfacewebservices.cpp')
| -rw-r--r-- | qt-ui/subsurfacewebservices.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
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(); } |