diff options
39 files changed, 0 insertions, 40 deletions
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" diff --git a/desktop-widgets/diveplanner.h b/desktop-widgets/diveplanner.h index b7527f3c1..441e90bdd 100644 --- a/desktop-widgets/diveplanner.h +++ b/desktop-widgets/diveplanner.h @@ -8,7 +8,6 @@ #include <QDateTime> #include <QSignalMapper> -#include "core/dive.h" class QListView; class QModelIndex; diff --git a/desktop-widgets/locationinformation.cpp b/desktop-widgets/locationinformation.cpp index b7eb80ab6..7cdbeb687 100644 --- a/desktop-widgets/locationinformation.cpp +++ b/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" diff --git a/desktop-widgets/mapwidget.cpp b/desktop-widgets/mapwidget.cpp index f5f20dae7..2060fdb7c 100644 --- a/desktop-widgets/mapwidget.cpp +++ b/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" diff --git a/desktop-widgets/modeldelegates.cpp b/desktop-widgets/modeldelegates.cpp index 4385c2c48..24dc767c4 100644 --- a/desktop-widgets/modeldelegates.cpp +++ b/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" diff --git a/desktop-widgets/preferences/preferences_defaults.cpp b/desktop-widgets/preferences/preferences_defaults.cpp index 42dcae13d..4500ecac2 100644 --- a/desktop-widgets/preferences/preferences_defaults.cpp +++ b/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" diff --git a/desktop-widgets/preferences/preferences_network.cpp b/desktop-widgets/preferences/preferences_network.cpp index 3552fa9db..be3c8b1fa 100644 --- a/desktop-widgets/preferences/preferences_network.cpp +++ b/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" diff --git a/desktop-widgets/subsurfacewebservices.cpp b/desktop-widgets/subsurfacewebservices.cpp index cccc9300b..361958329 100644 --- a/desktop-widgets/subsurfacewebservices.cpp +++ b/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> diff --git a/desktop-widgets/tab-widgets/TabDiveInformation.cpp b/desktop-widgets/tab-widgets/TabDiveInformation.cpp index 097e8f0e4..18391e7ca 100644 --- a/desktop-widgets/tab-widgets/TabDiveInformation.cpp +++ b/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()) { diff --git a/desktop-widgets/undocommands.h b/desktop-widgets/undocommands.h index e01bb20b8..f0626377c 100644 --- a/desktop-widgets/undocommands.h +++ b/desktop-widgets/undocommands.h @@ -4,7 +4,6 @@ #include <QUndoCommand> #include <QMap> -#include "core/dive.h" class UndoDeleteDive : public QUndoCommand { public: diff --git a/export-html.cpp b/export-html.cpp index 86e2cb9c5..652cb2c93 100644 --- a/export-html.cpp +++ b/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" diff --git a/map-widget/qmlmapwidgethelper.cpp b/map-widget/qmlmapwidgethelper.cpp index fa0616202..c673037ad 100644 --- a/map-widget/qmlmapwidgethelper.cpp +++ b/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" diff --git a/mobile-widgets/qmlprofile.cpp b/mobile-widgets/qmlprofile.cpp index 166a08af1..9ed3e36a5 100644 --- a/mobile-widgets/qmlprofile.cpp +++ b/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> diff --git a/profile-widget/diveprofileitem.cpp b/profile-widget/diveprofileitem.cpp index 529024c11..90f78f9e1 100644 --- a/profile-widget/diveprofileitem.cpp +++ b/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" diff --git a/profile-widget/divetooltipitem.cpp b/profile-widget/divetooltipitem.cpp index 7360adcea..f286ef9a6 100644 --- a/profile-widget/divetooltipitem.cpp +++ b/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" diff --git a/qt-models/cylindermodel.cpp b/qt-models/cylindermodel.cpp index 652f57dbf..3a7fb62e3 100644 --- a/qt-models/cylindermodel.cpp +++ b/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" diff --git a/qt-models/diveimportedmodel.h b/qt-models/diveimportedmodel.h index 2cca49f3d..eeea0b82c 100644 --- a/qt-models/diveimportedmodel.h +++ b/qt-models/diveimportedmodel.h @@ -2,7 +2,6 @@ #define DIVEIMPORTEDMODEL_H #include <QAbstractTableModel> -#include "core/dive.h" class DiveImportedModel : public QAbstractTableModel { diff --git a/qt-models/divelistmodel.h b/qt-models/divelistmodel.h index 3dc3d74e4..87654f1ac 100644 --- a/qt-models/divelistmodel.h +++ b/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" diff --git a/qt-models/diveplannermodel.cpp b/qt-models/diveplannermodel.cpp index cfa405a9f..deb3afe82 100644 --- a/qt-models/diveplannermodel.cpp +++ b/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" diff --git a/qt-models/diveplotdatamodel.cpp b/qt-models/diveplotdatamodel.cpp index 944510167..203ac3bd2 100644 --- a/qt-models/diveplotdatamodel.cpp +++ b/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" diff --git a/qt-models/divetripmodel.cpp b/qt-models/divetripmodel.cpp index a59d0ba84..1e1f1530f 100644 --- a/qt-models/divetripmodel.cpp +++ b/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> diff --git a/qt-models/weightmodel.cpp b/qt-models/weightmodel.cpp index a829bab58..20eb644f3 100644 --- a/qt-models/weightmodel.cpp +++ b/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" diff --git a/qt-models/yearlystatisticsmodel.cpp b/qt-models/yearlystatisticsmodel.cpp index fbc65ccab..c1d75bc9a 100644 --- a/qt-models/yearlystatisticsmodel.cpp +++ b/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" diff --git a/subsurface-desktop-helper.cpp b/subsurface-desktop-helper.cpp index e902a5946..6e33f5692 100644 --- a/subsurface-desktop-helper.cpp +++ b/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" diff --git a/subsurface-desktop-main.cpp b/subsurface-desktop-main.cpp index a0b55eb5c..af835f5f2 100644 --- a/subsurface-desktop-main.cpp +++ b/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" diff --git a/subsurface-mobile-helper.cpp b/subsurface-mobile-helper.cpp index ac971104d..38b6be9f4 100644 --- a/subsurface-mobile-helper.cpp +++ b/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" diff --git a/subsurface-mobile-main.cpp b/subsurface-mobile-main.cpp index f0199819f..bb5e36151 100644 --- a/subsurface-mobile-main.cpp +++ b/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" diff --git a/tests/testgpscoords.cpp b/tests/testgpscoords.cpp index 73313bf78..26a659d7d 100644 --- a/tests/testgpscoords.cpp +++ b/tests/testgpscoords.cpp @@ -1,5 +1,4 @@ // SPDX-License-Identifier: GPL-2.0 -#include "core/dive.h" #include "testgpscoords.h" //unit under test |