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: turn dive-trip location and notes into std::string

Browse source 
Simpler memory management.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2024-05-31 17:15:47 +02:00 • committed by bstoeger
parent 2fd226964c
commit 3ee41328f9
29 changed files with 157 additions and 179 deletions
Download patch file Download diff file Expand all files Collapse all files

17
core/parse.cpp
View file

@ -19,14 +19,8 @@
#include "device.h"
#include "gettext.h"
parser_state::parser_state()
{
}
parser_state::~parser_state()
{
free_trip(cur_trip);
}
parser_state::parser_state() = default;
parser_state::~parser_state() = default;
/*
* If we don't have an explicit dive computer,
@ -275,7 +269,7 @@ void dive_end(struct parser_state *state)
return;
if (is_dive(state)) {
if (state->cur_trip)
add_dive_to_trip(state->cur_dive.get(), state->cur_trip);
add_dive_to_trip(state->cur_dive.get(), state->cur_trip.get());
record_dive_to_table(state->cur_dive.release(), state->log->dives.get());
}
state->cur_dive.reset();
@ -289,7 +283,7 @@ void trip_start(struct parser_state *state)
if (state->cur_trip)
return;
dive_end(state);
state->cur_trip = alloc_trip();
state->cur_trip = std::make_unique<dive_trip>();
memset(&state->cur_tm, 0, sizeof(state->cur_tm));
}
@ -297,8 +291,7 @@ void trip_end(struct parser_state *state)
{
if (!state->cur_trip)
return;
insert_trip(state->cur_trip, state->log->trips.get());
state->cur_trip = NULL;
insert_trip(state->cur_trip.release(), state->log->trips.get());
}
void picture_start(struct parser_state *state)