summaryrefslogtreecommitdiffstats
path: root/desktop-widgets/subsurfacewebservices.cpp
diff options
context:
space:
mode:
authorGravatar Lubomir I. Ivanov <neolit123@gmail.com>2017-09-02 14:37:25 +0300
committerGravatar Dirk Hohndel <dirk@hohndel.org>2017-09-04 07:46:35 -0700
commit4bb180b1178d293de4c55099a23d70d385e517d9 (patch)
treeedaaf92a914f94e093443e3bfef38b135d932b3d /desktop-widgets/subsurfacewebservices.cpp
parenta7d8e0d18748fdf72f5d43cceec945c6add74294 (diff)
downloadsubsurface-4bb180b1178d293de4c55099a23d70d385e517d9.tar.gz
remove Marble from the source tree
In desktop-widgets, remove globe.cpp, globe.h and also remove the NO_MARBLE macro usage. At this point the MapWidget will always be created and there will always be a map in the application. Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Diffstat (limited to 'desktop-widgets/subsurfacewebservices.cpp')
-rw-r--r--desktop-widgets/subsurfacewebservices.cpp6
1 files changed, 0 insertions, 6 deletions
diff --git a/desktop-widgets/subsurfacewebservices.cpp b/desktop-widgets/subsurfacewebservices.cpp
index 6e8f4cecf..371a8475a 100644
--- a/desktop-widgets/subsurfacewebservices.cpp
+++ b/desktop-widgets/subsurfacewebservices.cpp
@@ -5,7 +5,6 @@
#include "desktop-widgets/mainwindow.h"
#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"
@@ -482,13 +481,8 @@ void SubsurfaceWebServices::buttonClicked(QAbstractButton *button)
// finally now that all the extra GPS fixes that weren't used have been deleted
// 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;