From 1c64a986eeea08b89ec3dcf6464cf5e319063932 Mon Sep 17 00:00:00 2001 From: Anton Lundin Date: Wed, 14 May 2014 00:32:43 +0200 Subject: 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 Signed-off-by: Dirk Hohndel --- qt-ui/globe.cpp | 2 +- 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); -- cgit v1.2.3-70-g09d2