From 50b195142b07e58a1c0e3bfe5c725bf5e3dd4020 Mon Sep 17 00:00:00 2001
From: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Date: Fri, 1 May 2020 13:51:29 +0200
Subject: [PATCH] cleanup: remove includes from
 desktop-widgets/locationinformation.h

Notably, there was a circular include

locationinformation.h <-> importgps.h

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
---
 desktop-widgets/locationinformation.cpp   | 1 +
 desktop-widgets/locationinformation.h     | 4 ++--
 desktop-widgets/subsurfacewebservices.cpp | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/desktop-widgets/locationinformation.cpp b/desktop-widgets/locationinformation.cpp
index 06b89e9d1..b8a642557 100644
--- a/desktop-widgets/locationinformation.cpp
+++ b/desktop-widgets/locationinformation.cpp
@@ -8,6 +8,7 @@
 #include "desktop-widgets/mapwidget.h"
 #include "core/color.h"
 #include "core/divefilter.h"
+#include "core/divesite.h"
 #include "core/divesitehelpers.h"
 #include "desktop-widgets/modeldelegates.h"
 #include "core/subsurface-qt/divelistnotifier.h"
diff --git a/desktop-widgets/locationinformation.h b/desktop-widgets/locationinformation.h
index bed267dc2..54d1a2b23 100644
--- a/desktop-widgets/locationinformation.h
+++ b/desktop-widgets/locationinformation.h
@@ -3,15 +3,15 @@
 #define LOCATIONINFORMATION_H
 
 #include "core/units.h"
-#include "core/divesite.h"
 #include "ui_locationinformation.h"
 #include "modeldelegates.h"
 #include "qt-models/divelocationmodel.h"
-#include "desktop-widgets/importgps.h"
 #include <stdint.h>
 #include <QAbstractListModel>
 #include <QSortFilterProxyModel>
 
+class dive_site;
+
 class LocationInformationWidget : public QGroupBox {
 	Q_OBJECT
 public:
diff --git a/desktop-widgets/subsurfacewebservices.cpp b/desktop-widgets/subsurfacewebservices.cpp
index d016a9dc6..fa5ee7164 100644
--- a/desktop-widgets/subsurfacewebservices.cpp
+++ b/desktop-widgets/subsurfacewebservices.cpp
@@ -5,6 +5,7 @@
 #include "core/settings/qPrefCloudStorage.h"
 #include "desktop-widgets/mainwindow.h"
 #include "commands/command.h"
+#include "core/divesite.h"
 #include "core/trip.h"
 #include "core/errorhelper.h"
 #include "core/file.h"