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

Fix building with NO_MARBLE issue

Browse source 
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 6b81fb49d0.

- 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>
This commit is contained in:
Gehad elrobey 2015-06-09 10:19:52 +02:00 • committed by Dirk Hohndel
parent d9801b67b4
commit d88da53586
3 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
qt-ui/globe.h
View file

@ -1,8 +1,9 @@
#ifndef GLOBE_H #ifndef GLOBE_H
#define GLOBE_H #define GLOBE_H
#ifndef NO_MARBLE
#include <stdint.h> #include <stdint.h>
#ifndef NO_MARBLE
#include <marble/MarbleWidget.h> #include <marble/MarbleWidget.h>
#include <marble/GeoDataCoordinates.h> #include <marble/GeoDataCoordinates.h>
@ -64,6 +65,7 @@ public:
void reload(); void reload();
void repopulateLabels(); void repopulateLabels();
void centerOnDiveSite(uint32_t uuid); void centerOnDiveSite(uint32_t uuid);
void centerOnCurrentDive();
bool eventFilter(QObject *, QEvent *); bool eventFilter(QObject *, QEvent *);
public public
slots: slots:

2
qt-ui/maintab.cpp
View file

@ -999,8 +999,10 @@ void MainTab::rejectChanges()
DivePictureModel::instance()->updateDivePictures(); DivePictureModel::instance()->updateDivePictures();
// the user could have edited the location and then canceled the edit // the user could have edited the location and then canceled the edit
// let's get the correct location back in view // let's get the correct location back in view
#ifndef NO_MARBLE
MainWindow::instance()->globe()->centerOnDiveSite(displayed_dive.dive_site_uuid); MainWindow::instance()->globe()->centerOnDiveSite(displayed_dive.dive_site_uuid);
MainWindow::instance()->globe()->reload(); MainWindow::instance()->globe()->reload();
#endif
// show the profile and dive info // show the profile and dive info
MainWindow::instance()->graphics()->replot(); MainWindow::instance()->graphics()->replot();
MainWindow::instance()->setEnabledToolbar(true); MainWindow::instance()->setEnabledToolbar(true);

3
qt-ui/subsurfacewebservices.cpp
View file

@ -346,8 +346,11 @@ void SubsurfaceWebServices::buttonClicked(QAbstractButton *button)
/* now merge the data in the gps_location table into the dive_table */ /* now merge the data in the gps_location table into the dive_table */
if (merge_locations_into_dives()) { if (merge_locations_into_dives()) {
mark_divelist_changed(true); mark_divelist_changed(true);
#ifndef NO_MARBLE
MainWindow::instance()->globe()->repopulateLabels(); MainWindow::instance()->globe()->repopulateLabels();
MainWindow::instance()->globe()->centerOnDiveSite(current_dive->dive_site_uuid); MainWindow::instance()->globe()->centerOnDiveSite(current_dive->dive_site_uuid);
#endif
MainWindow::instance()->information()->updateDiveInfo(); MainWindow::instance()->information()->updateDiveInfo();
} }