diff options
| author |  Lubomir I. Ivanov <neolit123@gmail.com> | 2017-09-02 14:37:25 +0300 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2017-09-04 07:46:35 -0700 |
| commit | 4bb180b1178d293de4c55099a23d70d385e517d9 (patch) | |
| tree | edaaf92a914f94e093443e3bfef38b135d932b3d /desktop-widgets/locationinformation.cpp | |
| parent | a7d8e0d18748fdf72f5d43cceec945c6add74294 (diff) | |
| download | subsurface-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/locationinformation.cpp')
| -rw-r--r-- | desktop-widgets/locationinformation.cpp | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/desktop-widgets/locationinformation.cpp b/desktop-widgets/locationinformation.cpp index 80676b36f..e32222bf4 100644 --- a/desktop-widgets/locationinformation.cpp +++ b/desktop-widgets/locationinformation.cpp @@ -4,7 +4,6 @@ #include "desktop-widgets/mainwindow.h" #include "desktop-widgets/divelistview.h" #include "core/qthelper.h" -#include "desktop-widgets/globe.h" #include "desktop-widgets/mapwidget.h" #include "qt-models/filtermodels.h" #include "qt-models/divelocationmodel.h" @@ -45,16 +44,6 @@ LocationInformationWidget::LocationInformationWidget(QWidget *parent) : QGroupBo ui.diveSiteListView->setModelColumn(LocationInformationModel::NAME); ui.diveSiteListView->installEventFilter(this); // Map Management Code. -#ifndef NO_MARBLE - connect(this, &LocationInformationWidget::requestCoordinates, - GlobeGPS::instance(), &GlobeGPS::prepareForGetDiveCoordinates); - connect(this, &LocationInformationWidget::endRequestCoordinates, - GlobeGPS::instance(), &GlobeGPS::endGetDiveCoordinates); - connect(GlobeGPS::instance(), &GlobeGPS::coordinatesChanged, - this, &LocationInformationWidget::updateGpsCoordinates); - connect(this, &LocationInformationWidget::endEditDiveSite, - GlobeGPS::instance(), &GlobeGPS::repopulateLabels); -#else connect(this, &LocationInformationWidget::requestCoordinates, MapWidget::instance(), &MapWidget::prepareForGetDiveCoordinates); connect(this, &LocationInformationWidget::endRequestCoordinates, @@ -63,7 +52,6 @@ LocationInformationWidget::LocationInformationWidget(QWidget *parent) : QGroupBo this, &LocationInformationWidget::updateGpsCoordinates); connect(this, &LocationInformationWidget::endEditDiveSite, MapWidget::instance(), &MapWidget::repopulateLabels); -#endif } bool LocationInformationWidget::eventFilter(QObject *, QEvent *ev) |