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>

1 files changed, 0 insertions, 14 deletions

diff --git a/desktop-widgets/tab-widgets/maintab.cpp b/desktop-widgets/tab-widgets/maintab.cpp
index 95481df21..ba9a21824 100644
--- a/desktop-widgets/tab-widgets/maintab.cpp
+++ b/desktop-widgets/tab-widgets/maintab.cpp
@@ -7,7 +7,6 @@
  */
 #include "desktop-widgets/tab-widgets/maintab.h"
 #include "desktop-widgets/mainwindow.h"
-#include "desktop-widgets/globe.h"
 #include "desktop-widgets/mapwidget.h"
 #include "core/helpers.h"
 #include "core/statistics.h"
@@ -72,13 +71,8 @@ MainTab::MainTab(QWidget *parent) : QTabWidget(parent),
 	closeMessage();
 
 	connect(ui.editDiveSiteButton, SIGNAL(clicked()), MainWindow::instance(), SIGNAL(startDiveSiteEdit()));
-#ifndef NO_MARBLE
-	connect(ui.location, &DiveLocationLineEdit::entered, GlobeGPS::instance(), &GlobeGPS::centerOnIndex);
-	connect(ui.location, &DiveLocationLineEdit::currentChanged, GlobeGPS::instance(), &GlobeGPS::centerOnIndex);
-#else
 	connect(ui.location, &DiveLocationLineEdit::entered, MapWidget::instance(), &MapWidget::centerOnIndex);
 	connect(ui.location, &DiveLocationLineEdit::currentChanged, MapWidget::instance(), &MapWidget::centerOnIndex);
-#endif
 
 	QAction *action = new QAction(tr("Apply changes"), this);
 	connect(action, SIGNAL(triggered(bool)), this, SLOT(acceptChanges()));
@@ -911,11 +905,7 @@ void MainTab::acceptChanges()
 				qDebug() << "delete now unused dive site" << ((ds && ds->name) ? ds->name : "without name");
 			}
 			delete_dive_site(oldUuid);
-#ifndef NO_MARBLE
-			GlobeGPS::instance()->reload();
-#else
 			MapWidget::instance()->reload();
-#endif
 		}
 		// the code above can change the correct uuid for the displayed dive site - and the
 		// code below triggers an update of the display without re-initializing displayed_dive
@@ -1047,11 +1037,7 @@ void MainTab::rejectChanges()
 	}
 	// the user could have edited the location and then canceled the edit
 	// let's get the correct location back in view
-#ifndef NO_MARBLE
-	GlobeGPS::instance()->centerOnDiveSite(get_dive_site_by_uuid(displayed_dive.dive_site_uuid));
-#else
 	MapWidget::instance()->centerOnDiveSite(get_dive_site_by_uuid(displayed_dive.dive_site_uuid));
-#endif
 	// show the profile and dive info
 	MainWindow::instance()->graphics()->replot();
 	MainWindow::instance()->setEnabledToolbar(true);