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,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>

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"

core/device.h

@@ -3,7 +3,6 @@
 #define DEVICE_H
 
 #ifdef __cplusplus
-#include "dive.h"
 extern "C" {
 #endif
 

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"

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"
 

core/downloadfromdcthread.h

@@ -6,7 +6,6 @@
 #include <QHash>
 #include <QLoggingCategory>
 
-#include "dive.h"
 #include "libdivecomputer.h"
 #include "connectionlistmodel.h"
 #if BT_SUPPORT

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"

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>

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);

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>

core/uemis.c

@@ -12,7 +12,6 @@
 
 #include "gettext.h"
 
-#include "dive.h"
 #include "uemis.h"
 #include <libdivecomputer/parser.h>
 #include <libdivecomputer/version.h>

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"

desktop-widgets/diveplanner.h

@@ -8,7 +8,6 @@
 #include <QDateTime>
 #include <QSignalMapper>
 
-#include "core/dive.h"
 
 class QListView;
 class QModelIndex;

desktop-widgets/locationinformation.cpp

@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0
 #include "desktop-widgets/locationinformation.h"
-#include "core/dive.h"
 #include "core/subsurface-string.h"
 #include "desktop-widgets/mainwindow.h"
 #include "desktop-widgets/divelistview.h"

desktop-widgets/mapwidget.cpp

@@ -5,7 +5,6 @@
 #include <QModelIndex>
 
 #include "mapwidget.h"
-#include "core/dive.h"
 #include "core/divesite.h"
 #include "map-widget/qmlmapwidgethelper.h"
 #include "qt-models/maplocationmodel.h"

desktop-widgets/modeldelegates.cpp

@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0
 #include "desktop-widgets/modeldelegates.h"
-#include "core/dive.h"
 #include "core/subsurface-string.h"
 #include "core/gettextfromc.h"
 #include "desktop-widgets/mainwindow.h"

desktop-widgets/preferences/preferences_defaults.cpp

@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 #include "preferences_defaults.h"
 #include "ui_preferences_defaults.h"
-#include "core/dive.h"
 #include "core/prefs-macros.h"
 #include "core/subsurface-qt/SettingsObjectWrapper.h"
 

desktop-widgets/preferences/preferences_network.cpp

@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 #include "preferences_network.h"
 #include "ui_preferences_network.h"
-#include "core/dive.h"
 #include "subsurfacewebservices.h"
 #include "core/prefs-macros.h"
 #include "core/cloudstorage.h"

desktop-widgets/subsurfacewebservices.cpp

@@ -12,7 +12,6 @@
 #include "core/subsurface-qt/SettingsObjectWrapper.h"
 #include <errno.h>
 #include "core/cloudstorage.h"
-#include "core/dive.h"
 #include "core/subsurface-string.h"
 
 #include <QDir>

desktop-widgets/tab-widgets/TabDiveInformation.cpp

@@ -6,7 +6,6 @@
 #include <core/helpers.h>
 #include <core/statistics.h>
 #include <core/display.h>
-#include <core/dive.h>
 
 TabDiveInformation::TabDiveInformation(QWidget *parent) : TabBase(parent), ui(new Ui::TabDiveInformation())
 {

desktop-widgets/undocommands.h

@@ -4,7 +4,6 @@
 
 #include <QUndoCommand>
 #include <QMap>
-#include "core/dive.h"
 
 class UndoDeleteDive : public QUndoCommand {
 public:

export-html.cpp

@@ -8,7 +8,6 @@
 
 #include "core/qt-gui.h"
 #include "core/qthelper.h"
-#include "core/dive.h"
 #include "core/save-html.h"
 #include <stdio.h>
 #include "git2.h"

map-widget/qmlmapwidgethelper.cpp

@@ -5,7 +5,6 @@
 #include <QVector>
 
 #include "qmlmapwidgethelper.h"
-#include "core/dive.h"
 #include "core/divesite.h"
 #include "core/helpers.h"
 #include "qt-models/maplocationmodel.h"

mobile-widgets/qmlprofile.cpp

@@ -2,7 +2,6 @@
 #include "qmlprofile.h"
 #include "qmlmanager.h"
 #include "profile-widget/profilewidget2.h"
-#include "core/dive.h"
 #include "core/subsurface-string.h"
 #include "core/metrics.h"
 #include <QTransform>

profile-widget/diveprofileitem.cpp

@@ -4,14 +4,12 @@
 #include "profile-widget/divecartesianaxis.h"
 #include "profile-widget/divetextitem.h"
 #include "profile-widget/animationfunctions.h"
-#include "core/dive.h"
 #include "core/profile.h"
 #ifndef SUBSURFACE_MOBILE
 #include "desktop-widgets/preferences/preferencesdialog.h"
 #endif
 #include "qt-models/diveplannermodel.h"
 #include "core/helpers.h"
-#include "core/dive.h"
 #include "core/subsurface-qt/SettingsObjectWrapper.h"
 #include "libdivecomputer/parser.h"
 #include "profile-widget/profilewidget2.h"

profile-widget/divetooltipitem.cpp

@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 #include "profile-widget/divetooltipitem.h"
 #include "profile-widget/divecartesianaxis.h"
-#include "core/dive.h"
 #include "core/profile.h"
 #include "core/membuffer.h"
 #include "core/metrics.h"

qt-models/cylindermodel.cpp

@@ -3,7 +3,6 @@
 #include "tankinfomodel.h"
 #include "models.h"
 #include "core/helpers.h"
-#include "core/dive.h"
 #include "core/color.h"
 #include "qt-models/diveplannermodel.h"
 #include "core/gettextfromc.h"

qt-models/diveimportedmodel.h

@@ -2,7 +2,6 @@
 #define DIVEIMPORTEDMODEL_H
 
 #include <QAbstractTableModel>
-#include "core/dive.h"
 
 class DiveImportedModel : public QAbstractTableModel
 {

qt-models/divelistmodel.h

@@ -5,7 +5,6 @@
 #include <QAbstractListModel>
 #include <QSortFilterProxyModel>
 
-#include "core/dive.h"
 #include "core/helpers.h"
 #include "core/subsurface-qt/DiveObjectHelper.h"
 

qt-models/diveplannermodel.cpp

@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0
 #include "diveplannermodel.h"
-#include "core/dive.h"
 #include "core/subsurface-string.h"
 #include "core/helpers.h"
 #include "qt-models/cylindermodel.h"

qt-models/diveplotdatamodel.cpp

@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 #include "qt-models/diveplotdatamodel.h"
 #include "qt-models/diveplannermodel.h"
-#include "core/dive.h"
 #include "core/profile.h"
 #include "core/divelist.h"
 #include "core/color.h"

qt-models/divetripmodel.cpp

@@ -4,7 +4,6 @@
 #include "core/metrics.h"
 #include "core/divelist.h"
 #include "core/helpers.h"
-#include "core/dive.h"
 #include "core/subsurface-string.h"
 #include <QIcon>
 #include <QDebug>

qt-models/weightmodel.cpp

@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0
 #include "qt-models/weightmodel.h"
-#include "core/dive.h"
 #include "core/subsurface-string.h"
 #include "core/gettextfromc.h"
 #include "core/metrics.h"

qt-models/yearlystatisticsmodel.cpp

@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0
 #include "qt-models/yearlystatisticsmodel.h"
-#include "core/dive.h"
 #include "core/helpers.h"
 #include "core/metrics.h"
 #include "core/statistics.h"

subsurface-desktop-helper.cpp

@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 /* qt-gui.cpp */
 /* Qt UI implementation */
-#include "core/dive.h"
 #include "core/display.h"
 #include "desktop-widgets/mainwindow.h"
 #include "core/helpers.h"

subsurface-desktop-main.cpp

@@ -6,7 +6,6 @@
 #include <stdlib.h>
 #include <time.h>
 
-#include "core/dive.h"
 #include "core/qt-gui.h"
 #include "core/subsurfacestartup.h"
 #include "desktop-widgets/mainwindow.h"

subsurface-mobile-helper.cpp

@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 /* qt-gui.cpp */
 /* Qt UI implementation */
-#include "core/dive.h"
 #include "core/display.h"
 #include "core/helpers.h"
 

subsurface-mobile-main.cpp

@@ -6,7 +6,6 @@
 #include <stdlib.h>
 #include <time.h>
 
-#include "core/dive.h"
 #include "core/qt-gui.h"
 #include "core/subsurfacestartup.h"
 #include "core/color.h"

tests/testgpscoords.cpp

@@ -1,5 +1,4 @@
 // SPDX-License-Identifier: GPL-2.0
-#include "core/dive.h"
 #include "testgpscoords.h"
 
 //unit under test