diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2018-12-08 19:47:28 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2018-12-14 00:25:07 +0800 |
| commit | 0a3d757aaba265756ed524d0f566c17761cecd18 (patch) | |
| tree | 76ba9da5e33e6cd9d5a8f29b5ceb61e679297a88 /core/divelist.h | |
| parent | 2706fa7b8e53438ba101fbe638eff150c8d2d154 (diff) | |
| download | subsurface-0a3d757aaba265756ed524d0f566c17761cecd18.tar.gz | |
Cleanup: remove combine_trips() function
In f427226b3b605523bc8285dbdaaa7f6993af6e6a a combine_trips_create()
function was introduced that combined trips without deleting the old
trips. This was necessary for making combine-trips function undo-able.
The old combine_trips() function is not used anymore. Therefore remove
it. Rename the combine_trips_create() function to combine_trips() as
no differentiation is needed anymore.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'core/divelist.h')
| -rw-r--r-- | core/divelist.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/core/divelist.h b/core/divelist.h index 11fa75f50..0f8a6138c 100644 --- a/core/divelist.h +++ b/core/divelist.h @@ -44,8 +44,7 @@ extern void deselect_dive(struct dive *dive); extern void select_dives_in_trip(struct dive_trip *trip); extern void deselect_dives_in_trip(struct dive_trip *trip); extern void filter_dive(struct dive *d, bool shown); -extern void combine_trips(struct dive_trip *trip_a, struct dive_trip *trip_b); -extern dive_trip_t *combine_trips_create(struct dive_trip *trip_a, struct dive_trip *trip_b); +extern dive_trip_t *combine_trips(struct dive_trip *trip_a, struct dive_trip *trip_b); extern struct dive *first_selected_dive(); extern struct dive *last_selected_dive(); extern bool is_trip_before_after(const struct dive *dive, bool before); |