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 /desktop-widgets | |
| 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 'desktop-widgets')
| -rw-r--r-- | desktop-widgets/command_divelist.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/desktop-widgets/command_divelist.cpp b/desktop-widgets/command_divelist.cpp index 29fd550f0..fcaeb0b19 100644 --- a/desktop-widgets/command_divelist.cpp +++ b/desktop-widgets/command_divelist.cpp @@ -743,7 +743,7 @@ MergeTrips::MergeTrips(dive_trip *trip1, dive_trip *trip2) { if (trip1 == trip2) return; - dive_trip *newTrip = combine_trips_create(trip1, trip2); + dive_trip *newTrip = combine_trips(trip1, trip2); divesToMove.tripsToAdd.emplace_back(newTrip); for (int i = 0; i < trip1->dives.nr; ++i) divesToMove.divesToMove.push_back( { trip1->dives.dives[i], newTrip } ); |