mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-01-19 06:15:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Cleanup: rename clone_dive() to move_dive()

Browse source 
This function clones a dive and clear out the old dive. This
corresponds to move semantics. Name the function accordingly.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2019-05-19 18:28:56 +02:00 • committed by Dirk Hohndel
parent 879f52180c
commit ac590235c9
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/dive.c
View file

@ -637,7 +637,7 @@ static void copy_dive_onedc(const struct dive *s, const struct divecomputer *sdc
* this is specifically so we can create a dive in the displayed_dive and then
* add it to the divelist.
* Note the difference to copy_dive() / clean_dive() */
struct dive *clone_dive(struct dive *s)
struct dive *move_dive(struct dive *s)
{
struct dive *dive = alloc_dive();
*dive = *s; // so all the pointers in dive point to the things s pointed to

2
core/dive.h
View file

@ -517,7 +517,7 @@ extern void record_dive(struct dive *dive);
extern void clear_dive(struct dive *dive);
extern void copy_dive(const struct dive *s, struct dive *d);
extern void selective_copy_dive(const struct dive *s, struct dive *d, struct dive_components what, bool clear);
extern struct dive *clone_dive(struct dive *s);
extern struct dive *move_dive(struct dive *s);
extern void alloc_samples(struct divecomputer *dc, int num);
extern void free_samples(struct divecomputer *dc);

2
desktop-widgets/command_divelist.cpp
View file

@ -382,7 +382,7 @@ AddDive::AddDive(dive *d, bool autogroup, bool newNumber)
fixup_dive(d);
// Get an owning pointer to a moved dive.
OwningDivePtr divePtr(clone_dive(d));
OwningDivePtr divePtr(move_dive(d));
divePtr->selected = false; // If we clone a planned dive, it might have been selected.
// We have to clear the flag, as selections will be managed
// on dive-addition.