diff options
| author |  Anton Lundin <glance@acc.umu.se> | 2014-05-14 00:32:44 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2014-05-20 11:36:57 +0900 |
| commit | 91c20357f510fe7ea1c5740eb476fd718e41259c (patch) | |
| tree | 6925cb8f74aa876727a14f3b0e7c445f29ac5150 /qt-ui | |
| parent | 1c64a986eeea08b89ec3dcf6464cf5e319063932 (diff) | |
| download | subsurface-91c20357f510fe7ea1c5740eb476fd718e41259c.tar.gz | |
Fix building with NO_MARBLE prepareForGetDiveCoordinates
Commit 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@acc.umu.se>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-ui')
| -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 37b77649f..d24a44791 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 1729d5ff3..0f68f7350 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 |