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

Cleanup: introduce empty_weightsystem constant

Browse source 
To make things more future-proof, introduce an empty_weightsystem
constant. Replace explicit aggragate initialization of empty
weightsystems by this constant.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2019-11-03 23:08:32 +01:00 • committed by Dirk Hohndel
parent 92b833a7d8
commit dc67876c79
4 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
commands/command_edit.cpp
View file

@ -978,9 +978,8 @@ void AddWeight::undo()
void AddWeight::redo()
{
weightsystem_t ws { {0}, "" };
for (dive *d: dives) {
add_cloned_weightsystem(&d->weightsystems, ws);
add_cloned_weightsystem(&d->weightsystems, empty_weightsystem);
emit diveListNotifier.weightAdded(d, d->weightsystems.nr - 1);
}
}
@ -996,7 +995,7 @@ static int find_weightsystem_index(const struct dive *d, weightsystem_t ws)
RemoveWeight::RemoveWeight(int index, bool currentDiveOnly) :
EditDivesBase(currentDiveOnly),
ws{ {0}, nullptr }
ws(empty_weightsystem)
{
// Get the old weightsystem, bail if index is invalid
if (!current || index < 0 || index >= current->weightsystems.nr) {