[PATCH] Fix building with NO_MARBLE prepareForGetDiveCoordinates

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


fb82da58a2 ("Globe: assume that we are looking at the current_dive")
changed the prototype for GlobeGPS::prepareForGetDiveCoordinates. This
patches the dummy in NO_MARBLE.

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 37b7764..d24a447 100644
--- a/qt-ui/globe.cpp
+++ b/qt-ui/globe.cpp
@@ -345,6 +345,6 @@ GlobeGPS::GlobeGPS(QWidget* parent) { setText("MARBLE DISABLED AT BUILD TIME");
 void GlobeGPS::repopulateLabels() {}
 void GlobeGPS::centerOnCurrentDive() {}
 bool GlobeGPS::eventFilter(QObject *obj, QEvent *ev) {}
-void GlobeGPS::prepareForGetDiveCoordinates(struct dive *dive) {}
+void GlobeGPS::prepareForGetDiveCoordinates() {}
 void GlobeGPS::reload() {}
 #endif
diff --git a/qt-ui/globe.h b/qt-ui/globe.h
index 1729d5f..0f68f73 100644
--- a/qt-ui/globe.h
+++ b/qt-ui/globe.h
@@ -57,7 +57,7 @@ public:
 	void centerOnCurrentDive();
 	bool eventFilter(QObject*, QEvent*);
 public slots:
-	void prepareForGetDiveCoordinates(struct dive *dive);
+	void prepareForGetDiveCoordinates();
 };
 
 #endif // NO_MARBLE
-- 
1.9.1



More information about the subsurface mailing list