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 /core/divelist.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 'core/divelist.h')
| -rw-r--r-- | core/divelist.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/core/divelist.h b/core/divelist.h index e1ff706f7..1880856df 100644 --- a/core/divelist.h +++ b/core/divelist.h @@ -23,10 +23,12 @@ extern void process_loaded_dives(); #define IMPORT_IS_DOWNLOADED (1 << 1) #define IMPORT_MERGE_ALL_TRIPS (1 << 2) #define IMPORT_ADD_TO_NEW_TRIP (1 << 3) -extern void add_imported_dives(struct dive_table *import_table, struct trip_table *import_trip_table, int flags); -extern void process_imported_dives(struct dive_table *import_table, struct trip_table *import_trip_table, int flags, +extern void add_imported_dives(struct dive_table *import_table, struct trip_table *import_trip_table, struct dive_site_table *import_sites_table, + int flags); +extern void process_imported_dives(struct dive_table *import_table, struct trip_table *import_trip_table, struct dive_site_table *import_sites_table, + int flags, struct dive_table *dives_to_add, struct dive_table *dives_to_remove, - struct trip_table *trips_to_add); + struct trip_table *trips_to_add, struct dive_site_table *sites_to_add); extern char *get_dive_gas_string(const struct dive *dive); extern struct dive **grow_dive_table(struct dive_table *table); |