diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2019-03-03 15:12:22 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2019-04-12 18:19:07 +0300 |
| commit | 82af1b2377cec03a989f86b8009d4ac226c6541e (patch) | |
| tree | a875f194f7174c8673b2f7bd5cc43aa8ca3c51c6 /desktop-widgets/command_base.h | |
| parent | 37146c5742503becf75468fb07aab56011cb9101 (diff) | |
| download | subsurface-82af1b2377cec03a989f86b8009d4ac226c6541e.tar.gz | |
Undo: make undo-system dive site-aware
As opposed to dive trips, dive sites were always directly added
to the global table, even on import. Instead, parse the divesites
into a distinct table and merge them on import.
Currently, this does not do any merging of dive sites, i.e. dive
sites are considered as either equal or different. Nevertheless,
merging of data should be rather easy to implement and simply
follow the code of the dive merging.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'desktop-widgets/command_base.h')
| -rw-r--r-- | desktop-widgets/command_base.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/desktop-widgets/command_base.h b/desktop-widgets/command_base.h index f965b8689..fbcc61f73 100644 --- a/desktop-widgets/command_base.h +++ b/desktop-widgets/command_base.h @@ -147,10 +147,14 @@ struct DiveDeleter { struct TripDeleter { void operator()(dive_trip *t) { free_trip(t); } }; +struct DiveSiteDeleter { + void operator()(dive_site *ds) { free_dive_site(ds); } +}; // Owning pointers to dive and dive_trip objects. typedef std::unique_ptr<dive, DiveDeleter> OwningDivePtr; typedef std::unique_ptr<dive_trip, TripDeleter> OwningTripPtr; +typedef std::unique_ptr<dive_site, DiveSiteDeleter> OwningDiveSitePtr; // This is the base class of all commands. // It defines the Qt-translation functions |