diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2019-03-04 23:20:29 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2019-04-12 18:19:07 +0300 |
| commit | c22fd9f4fd6699333629b8acb1e9c135a9783082 (patch) | |
| tree | 7fad8249eb4fb3fa2797329716b1038d115a62d9 /desktop-widgets | |
| parent | f2cdca7bccfcdfa04639600689b2b13b38b56898 (diff) | |
| download | subsurface-c22fd9f4fd6699333629b8acb1e9c135a9783082.tar.gz | |
Dive sites: prepare for dive site ref-counting
Add a dive site table to each dive site to keep track of dives
that have been added to a dive site. Add two functions to add
dives to / remove dives from dive sites.
Since dive sites now contain a dive table, the order of includes
had to be changed: "divesite.h" now includes "dive.h" and not
vice-versa. This caused some include churn.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'desktop-widgets')
| -rw-r--r-- | desktop-widgets/command_base.h | 2 | ||||
| -rw-r--r-- | desktop-widgets/divelogexportdialog.cpp | 2 | ||||
| -rw-r--r-- | desktop-widgets/divelogimportdialog.cpp | 1 | ||||
| -rw-r--r-- | desktop-widgets/modeldelegates.cpp | 1 | ||||
| -rw-r--r-- | desktop-widgets/simplewidgets.cpp | 1 |
5 files changed, 5 insertions, 2 deletions
diff --git a/desktop-widgets/command_base.h b/desktop-widgets/command_base.h index fbcc61f73..26744dc87 100644 --- a/desktop-widgets/command_base.h +++ b/desktop-widgets/command_base.h @@ -4,7 +4,7 @@ #ifndef COMMAND_BASE_H #define COMMAND_BASE_H -#include "core/dive.h" +#include "core/divesite.h" #include <QUndoCommand> #include <QCoreApplication> // For Q_DECLARE_TR_FUNCTIONS diff --git a/desktop-widgets/divelogexportdialog.cpp b/desktop-widgets/divelogexportdialog.cpp index 216a296eb..87f2e5597 100644 --- a/desktop-widgets/divelogexportdialog.cpp +++ b/desktop-widgets/divelogexportdialog.cpp @@ -16,7 +16,7 @@ #include "desktop-widgets/mainwindow.h" #include "profile-widget/profilewidget2.h" #include "core/save-profiledata.h" -#include "core/dive.h" // Allows access to helper functions in TeX export. +#include "core/divesite.h" // Retrieves the current unit settings defined in the Subsurface preferences. #define GET_UNIT(name, field, f, t) \ diff --git a/desktop-widgets/divelogimportdialog.cpp b/desktop-widgets/divelogimportdialog.cpp index 0bbb0dcb5..a6242ec8d 100644 --- a/desktop-widgets/divelogimportdialog.cpp +++ b/desktop-widgets/divelogimportdialog.cpp @@ -11,6 +11,7 @@ #include <QUndoStack> #include <QPainter> #include "core/qthelper.h" +#include "core/divesite.h" #include "core/import-csv.h" static QString subsurface_mimedata = "subsurface/csvcolumns"; diff --git a/desktop-widgets/modeldelegates.cpp b/desktop-widgets/modeldelegates.cpp index fd6bb2e47..b4dfd1e51 100644 --- a/desktop-widgets/modeldelegates.cpp +++ b/desktop-widgets/modeldelegates.cpp @@ -14,6 +14,7 @@ #include "qt-models/divetripmodel.h" #include "qt-models/divelocationmodel.h" #include "core/qthelper.h" +#include "core/divesite.h" #include "desktop-widgets/simplewidgets.h" #include <QCompleter> diff --git a/desktop-widgets/simplewidgets.cpp b/desktop-widgets/simplewidgets.cpp index befea5e32..abaf5b372 100644 --- a/desktop-widgets/simplewidgets.cpp +++ b/desktop-widgets/simplewidgets.cpp @@ -13,6 +13,7 @@ #include <QClipboard> #include "core/file.h" +#include "core/divesite.h" #include "desktop-widgets/mainwindow.h" #include "core/qthelper.h" #include "libdivecomputer/parser.h" |