diff options
| author |  Anton Lundin <glance@acc.umu.se> | 2014-05-14 00:32:43 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2014-05-20 11:36:18 +0900 |
| commit | 1c64a986eeea08b89ec3dcf6464cf5e319063932 (patch) | |
| tree | 136cbbac473ae910996c792425813ab0b7389e07 | |
| parent | 09e7c61feeeabac3dd983c11aca49b23155fff80 (diff) | |
| download | subsurface-1c64a986eeea08b89ec3dcf6464cf5e319063932.tar.gz | |
Fix building with NO_MARBLE, centerOnCurrentDive
Commit 2bc76beb65 ("Globe: we always center on the current dive") changed
GlobeGPS::centerOn to GlobeGPS::centerOnCurrentDive. This patches the
dummy in NO_MARBLE, too.
Signed-off-by: Anton Lundin <glance@acc.umu.se>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | qt-ui/globe.cpp | 2 | ||||
| -rw-r--r-- | qt-ui/globe.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/qt-ui/globe.cpp b/qt-ui/globe.cpp index 1101500d3..37b77649f 100644 --- a/qt-ui/globe.cpp +++ b/qt-ui/globe.cpp @@ -343,7 +343,7 @@ void GlobeGPS::resizeEvent(QResizeEvent *event) GlobeGPS::GlobeGPS(QWidget* parent) { setText("MARBLE DISABLED AT BUILD TIME"); } void GlobeGPS::repopulateLabels() {} -void GlobeGPS::centerOn(dive* dive) {} +void GlobeGPS::centerOnCurrentDive() {} bool GlobeGPS::eventFilter(QObject *obj, QEvent *ev) {} void GlobeGPS::prepareForGetDiveCoordinates(struct dive *dive) {} void GlobeGPS::reload() {} diff --git a/qt-ui/globe.h b/qt-ui/globe.h index add04ede4..1729d5ff3 100644 --- a/qt-ui/globe.h +++ b/qt-ui/globe.h @@ -54,7 +54,7 @@ public: GlobeGPS(QWidget *parent); void reload(); void repopulateLabels(); - void centerOn(struct dive* dive); + void centerOnCurrentDive(); bool eventFilter(QObject*, QEvent*); public slots: void prepareForGetDiveCoordinates(struct dive *dive); |