From 8f657ff775ff2661350b6ed6c8f44165a0e22dbc Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Sun, 4 May 2014 11:35:34 -0700 Subject: Add conditional so globe.cpp builds with older versions of Marble In commit 7f3b487c77c7 ("Restore the previous globe zoom level after showing dive without GPS") I was a bit too aggressive in replacing a deprecated API function - people still need to be able to compile against Marble versions older than 4.10. Signed-off-by: Dirk Hohndel --- qt-ui/globe.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'qt-ui') diff --git a/qt-ui/globe.cpp b/qt-ui/globe.cpp index 8f519cf94..275d7ee85 100644 --- a/qt-ui/globe.cpp +++ b/qt-ui/globe.cpp @@ -26,6 +26,12 @@ #include #include +// as of Marble 4.10 (which has MARBLE_VERSION 0x001000) zoomView is +// deprecated and has been replaced by setZoom with the same function signature +#if MARBLE_VERSION < 0x001000 +#define setZoom zoomView +#endif + GlobeGPS::GlobeGPS(QWidget *parent) : MarbleWidget(parent), loadedDives(0), messageWidget(new KMessageWidget(this)), -- cgit v1.2.3-70-g09d2