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

core: add constructor/destructor pairs to dive and divecomputer

Browse source 
This allows us to use non-C member variables. Convert a number
of pointers to unique_ptr<>s.

Code in uemis-downloader.cpp had to be refactored, because
it mixed owning and non-owning pointers. Mad.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2024-05-16 20:11:21 +02:00 • committed by bstoeger
parent bfb54aa581
commit cc39f709ce
35 changed files with 289 additions and 308 deletions
Download patch file Download diff file Expand all files Collapse all files

19
core/parse.cpp
View file

@ -25,7 +25,6 @@ parser_state::parser_state()
parser_state::~parser_state()
{
free_dive(cur_dive);
free_trip(cur_trip);
}
@ -264,7 +263,7 @@ void dive_start(struct parser_state *state)
{
if (state->cur_dive)
return;
state->cur_dive = alloc_dive();
state->cur_dive = std::make_unique<dive>();
reset_dc_info(&state->cur_dive->dc, state);
memset(&state->cur_tm, 0, sizeof(state->cur_tm));
state->o2pressure_sensor = 1;
@ -274,14 +273,12 @@ void dive_end(struct parser_state *state)
{
if (!state->cur_dive)
return;
if (!is_dive(state)) {
free_dive(state->cur_dive);
} else {
record_dive_to_table(state->cur_dive, state->log->dives.get());
if (is_dive(state)) {
if (state->cur_trip)
add_dive_to_trip(state->cur_dive, state->cur_trip);
add_dive_to_trip(state->cur_dive.get(), state->cur_trip);
record_dive_to_table(state->cur_dive.release(), state->log->dives.get());
}
state->cur_dive = NULL;
state->cur_dive.reset();
state->cur_dc = NULL;
state->cur_location.lat.udeg = 0;
state->cur_location.lon.udeg = 0;
@ -369,8 +366,8 @@ void sample_start(struct parser_state *state)
sample->pressure[0].mbar = 0;
sample->pressure[1].mbar = 0;
} else {
sample->sensor[0] = sanitize_sensor_id(state->cur_dive, !state->o2pressure_sensor);
sample->sensor[1] = sanitize_sensor_id(state->cur_dive, state->o2pressure_sensor);
sample->sensor[0] = sanitize_sensor_id(state->cur_dive.get(), !state->o2pressure_sensor);
sample->sensor[1] = sanitize_sensor_id(state->cur_dive.get(), state->o2pressure_sensor);
}
state->cur_sample = sample;
state->next_o2_sensor = 0;
@ -396,7 +393,7 @@ void divecomputer_start(struct parser_state *state)
/* Did we already fill that in? */
if (dc->samples || dc->model || dc->when) {
struct divecomputer *newdc = (divecomputer *)calloc(1, sizeof(*newdc));
struct divecomputer *newdc = new divecomputer;
if (newdc) {
dc->next = newdc;
dc = newdc;