summaryrefslogtreecommitdiffstats
path: root/desktop-widgets/mainwindow.cpp
diff options
context:
space:
mode:
authorGravatar Jan Mulder <jlmulder@xs4all.nl>2018-01-04 22:22:34 +0100
committerGravatar Jan Mulder <jlmulder@xs4all.nl>2018-01-06 09:21:16 +0100
commit70e0e80de5470216df939f994ffda0222560def0 (patch)
treeef7729d24dcc20a3a141462c2570f06c99ba3648 /desktop-widgets/mainwindow.cpp
parente762d2a23e9bea751ea0f1df1e283f4e5399543b (diff)
downloadsubsurface-70e0e80de5470216df939f994ffda0222560def0.tar.gz
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 <jlmulder@xs4all.nl>
Diffstat (limited to 'desktop-widgets/mainwindow.cpp')
-rw-r--r--desktop-widgets/mainwindow.cpp4
1 files changed, 2 insertions, 2 deletions
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();
}