From 70e0e80de5470216df939f994ffda0222560def0 Mon Sep 17 00:00:00 2001 From: Jan Mulder Date: Thu, 4 Jan 2018 22:22:34 +0100 Subject: GPS: use applyGpsLocation::applyLocations from core Fixes a big duplication of code. The code to apply GPS locations from the location service was already in core, and used from mobile, but there was an almost literal copy in the desktop code. See also commits 6f42ab46da1b59 and ee9531f76ec31a, where only one side of the duplicated code was fixed. Signed-off-by: Jan Mulder --- desktop-widgets/mainwindow.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'desktop-widgets/mainwindow.cpp') diff --git a/desktop-widgets/mainwindow.cpp b/desktop-widgets/mainwindow.cpp index bbccdc064..ad8b39dd7 100644 --- a/desktop-widgets/mainwindow.cpp +++ b/desktop-widgets/mainwindow.cpp @@ -111,7 +111,8 @@ MainWindow::MainWindow() : QMainWindow(), actionPreviousDive(0), helpView(0), state(VIEWALL), - survey(0) + survey(0), + locationProvider(new GpsLocation(nullptr, this)) { Q_ASSERT_X(m_Instance == NULL, "MainWindow", "MainWindow recreated!"); m_Instance = this; @@ -826,7 +827,6 @@ void MainWindow::on_actionDownloadDC_triggered() void MainWindow::on_actionDownloadWeb_triggered() { SubsurfaceWebServices dlg(this); - dlg.exec(); } -- cgit v1.2.3-70-g09d2