From ea83b5ed371bbfb1e5ffb0b501c8bf652cae35bb Mon Sep 17 00:00:00 2001
From: Dirk Hohndel <dirk@hohndel.org>
Date: Sun, 13 May 2018 16:51:26 -0700
Subject: Core: remove dive.h from files that don't need it

Of course, quite a few of them indirectly get it through other header
files.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
 core/cloudstorage.cpp                 | 1 -
 core/datatrak.c                       | 1 -
 core/device.h                         | 1 -
 core/dive.c                           | 1 -
 core/divecomputer.cpp                 | 1 -
 core/downloadfromdcthread.h           | 1 -
 core/git-access.c                     | 1 -
 core/gpslocation.cpp                  | 1 -
 core/helpers.h                        | 1 -
 core/subsurface-qt/DiveObjectHelper.h | 1 -
 core/uemis.c                          | 1 -
 core/worldmap-save.c                  | 1 -
 12 files changed, 12 deletions(-)

(limited to 'core')

diff --git a/core/cloudstorage.cpp b/core/cloudstorage.cpp
index bdd562e60..5e3f799db 100644
--- a/core/cloudstorage.cpp
+++ b/core/cloudstorage.cpp
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 #include "cloudstorage.h"
 #include "pref.h"
-#include "dive.h"
 #include "helpers.h"
 #include "core/subsurface-qt/SettingsObjectWrapper.h"
 #include <QApplication>
diff --git a/core/datatrak.c b/core/datatrak.c
index 84bcf2f60..1c728aa45 100644
--- a/core/datatrak.c
+++ b/core/datatrak.c
@@ -10,7 +10,6 @@
 #include <time.h>
 #include "gettext.h"
 #include "datatrak.h"
-#include "dive.h"
 #include "subsurface-string.h"
 #include "units.h"
 #include "device.h"
diff --git a/core/device.h b/core/device.h
index 14a80144c..262829987 100644
--- a/core/device.h
+++ b/core/device.h
@@ -3,7 +3,6 @@
 #define DEVICE_H
 
 #ifdef __cplusplus
-#include "dive.h"
 extern "C" {
 #endif
 
diff --git a/core/dive.c b/core/dive.c
index 685618b91..1ce8421fe 100644
--- a/core/dive.c
+++ b/core/dive.c
@@ -6,7 +6,6 @@
 #include <stdlib.h>
 #include <limits.h>
 #include "gettext.h"
-#include "dive.h"
 #include "subsurface-string.h"
 #include "libdivecomputer.h"
 #include "device.h"
diff --git a/core/divecomputer.cpp b/core/divecomputer.cpp
index 5c9f76f00..784add1d9 100644
--- a/core/divecomputer.cpp
+++ b/core/divecomputer.cpp
@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0
 #include "divecomputer.h"
-#include "dive.h"
 #include "subsurface-string.h"
 #include "subsurface-qt/SettingsObjectWrapper.h"
 
diff --git a/core/downloadfromdcthread.h b/core/downloadfromdcthread.h
index ac83790e8..f5ed438cf 100644
--- a/core/downloadfromdcthread.h
+++ b/core/downloadfromdcthread.h
@@ -6,7 +6,6 @@
 #include <QHash>
 #include <QLoggingCategory>
 
-#include "dive.h"
 #include "libdivecomputer.h"
 #include "connectionlistmodel.h"
 #if BT_SUPPORT
diff --git a/core/git-access.c b/core/git-access.c
index 5fa4beb42..199f39dfa 100644
--- a/core/git-access.c
+++ b/core/git-access.c
@@ -16,7 +16,6 @@
 #include <fcntl.h>
 #include <git2.h>
 
-#include "dive.h"
 #include "subsurface-string.h"
 #include "membuffer.h"
 #include "strndup.h"
diff --git a/core/gpslocation.cpp b/core/gpslocation.cpp
index 4e48fa024..2fcb9f1b0 100644
--- a/core/gpslocation.cpp
+++ b/core/gpslocation.cpp
@@ -2,7 +2,6 @@
 #include "core/gpslocation.h"
 #include "qt-models/gpslistmodel.h"
 #include "core/pref.h"
-#include "core/dive.h"
 #include "core/helpers.h"
 #include <time.h>
 #include <unistd.h>
diff --git a/core/helpers.h b/core/helpers.h
index 36db01093..e690245ca 100644
--- a/core/helpers.h
+++ b/core/helpers.h
@@ -9,7 +9,6 @@
 #define HELPERS_H
 
 #include <QString>
-#include "dive.h"
 #include "qthelper.h"
 
 QString get_depth_string(depth_t depth, bool showunit = false, bool showdecimal = true);
diff --git a/core/subsurface-qt/DiveObjectHelper.h b/core/subsurface-qt/DiveObjectHelper.h
index 4303650aa..51efc5595 100644
--- a/core/subsurface-qt/DiveObjectHelper.h
+++ b/core/subsurface-qt/DiveObjectHelper.h
@@ -2,7 +2,6 @@
 #ifndef DIVE_QOBJECT_H
 #define DIVE_QOBJECT_H
 
-#include "../dive.h"
 #include "CylinderObjectHelper.h"
 #include <QObject>
 #include <QString>
diff --git a/core/uemis.c b/core/uemis.c
index cd7a0c1f1..33005108b 100644
--- a/core/uemis.c
+++ b/core/uemis.c
@@ -12,7 +12,6 @@
 
 #include "gettext.h"
 
-#include "dive.h"
 #include "uemis.h"
 #include <libdivecomputer/parser.h>
 #include <libdivecomputer/version.h>
diff --git a/core/worldmap-save.c b/core/worldmap-save.c
index 3d14812ba..cbc232bc3 100644
--- a/core/worldmap-save.c
+++ b/core/worldmap-save.c
@@ -9,7 +9,6 @@
 #include <string.h>
 #include <stdio.h>
 
-#include "dive.h"
 #include "membuffer.h"
 #include "save-html.h"
 #include "worldmap-save.h"
-- 
cgit v1.2.3-70-g09d2