summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Berthold Stoeger <bstoeger@mail.tuwien.ac.at>2020-05-01 13:51:29 +0200
committerGravatar Dirk Hohndel <dirk@hohndel.org>2020-05-01 09:42:31 -0700
commit50b195142b07e58a1c0e3bfe5c725bf5e3dd4020 (patch)
tree3db4689f08406eb4ab2f4960413fe4581586a0c8
parent46cdf24e1111a0f1e3c393c8b5fe0707df38765b (diff)
downloadsubsurface-50b195142b07e58a1c0e3bfe5c725bf5e3dd4020.tar.gz
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>
-rw-r--r--desktop-widgets/locationinformation.cpp1
-rw-r--r--desktop-widgets/locationinformation.h4
-rw-r--r--desktop-widgets/subsurfacewebservices.cpp1
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"