[PATCH] Fix building with NO_MARBLE, centerOnCurrentDive

Anton Lundin glance at acc.umu.se
Tue May 13 15:32:43 PDT 2014


2bc76beb65 ("Globe: we always center on the current dive") changed
GlobeGPS::centerOn to GlobeGPS::centerOnCurrentDive. This patches the
dummy in NO_MARBLE to.

Signed-off-by: Anton Lundin <glance at acc.umu.se>
---
 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 1101500..37b7764 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 add04ed..1729d5f 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);
-- 
1.9.1



More information about the subsurface mailing list