From b89ecd5ab86a5d4c941b355b2fb04b851adf6820 Mon Sep 17 00:00:00 2001 From: "Lubomir I. Ivanov" Date: Sat, 15 Jul 2017 23:43:19 +0300 Subject: subsurfacewebservices: abstract between GlobeGPS and MapWidget Call same methods from the two classes based on NO_MARBLE. Signed-off-by: Lubomir I. Ivanov --- desktop-widgets/subsurfacewebservices.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'desktop-widgets/subsurfacewebservices.cpp') diff --git a/desktop-widgets/subsurfacewebservices.cpp b/desktop-widgets/subsurfacewebservices.cpp index f53b7eaad..6e8f4cecf 100644 --- a/desktop-widgets/subsurfacewebservices.cpp +++ b/desktop-widgets/subsurfacewebservices.cpp @@ -6,6 +6,7 @@ #include "desktop-widgets/usersurvey.h" #include "core/divelist.h" #include "desktop-widgets/globe.h" +#include "desktop-widgets/mapwidget.h" #include "desktop-widgets/tab-widgets/maintab.h" #include "core/display.h" #include "core/membuffer.h" @@ -478,14 +479,17 @@ void SubsurfaceWebServices::buttonClicked(QAbstractButton *button) i--; // otherwise we skip one site } } -#ifndef NO_MARBLE // finally now that all the extra GPS fixes that weren't used have been deleted - // we can update the globe + // we can update the map if (changed) { +#ifndef NO_MARBLE GlobeGPS::instance()->repopulateLabels(); GlobeGPS::instance()->centerOnDiveSite(get_dive_site_by_uuid(current_dive->dive_site_uuid)); - } +#else + MapWidget::instance()->repopulateLabels(); + MapWidget::instance()->centerOnDiveSite(get_dive_site_by_uuid(current_dive->dive_site_uuid)); #endif + } } break; case QDialogButtonBox::RejectRole: -- cgit v1.2.3-70-g09d2