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: move get_dive_dc() to struct dive

Browse source 
Feels natural in a C++ code base.

This removes a nullptr-check so some care has to be taken.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2024-06-30 20:38:12 +02:00 • committed by bstoeger
parent 731052c776
commit f1f082d86a
15 changed files with 59 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

12
commands/command_edit.cpp
View file

@ -434,13 +434,13 @@ EditMode::EditMode(int indexIn, int newValue, bool currentDiveOnly)
void EditMode::set(struct dive *d, int i) const
{
get_dive_dc(d, index)->divemode = (enum divemode_t)i;
update_setpoint_events(d, get_dive_dc(d, index));
d->get_dc(index)->divemode = (enum divemode_t)i;
update_setpoint_events(d, d->get_dc(index));
}
int EditMode::data(struct dive *d) const
{
return get_dive_dc(d, index)->divemode;
return d->get_dc(index)->divemode;
}
QString EditMode::fieldName() const
@ -862,7 +862,7 @@ EditProfile::EditProfile(const dive *source, int dcNr, EditProfileType type, int
dcmaxdepth({0}),
duration({0})
{
const struct divecomputer *sdc = get_dive_dc(source, dcNr);
const struct divecomputer *sdc = source->get_dc(dcNr);
if (!sdc)
d = nullptr; // Signal that we refuse to do anything.
if (!d)
@ -890,7 +890,7 @@ bool EditProfile::workToBeDone()
void EditProfile::undo()
{
struct divecomputer *sdc = get_dive_dc(d, dcNr);
struct divecomputer *sdc = d->get_dc(dcNr);
if (!sdc)
return;
std::swap(sdc->samples, dc.samples);
@ -1286,7 +1286,7 @@ void EditCylinder::undo()
}
EditSensors::EditSensors(int toCylinderIn, int fromCylinderIn, int dcNr)
: d(current_dive), dc(get_dive_dc(d, dcNr)), toCylinder(toCylinderIn), fromCylinder(fromCylinderIn)
: d(current_dive), dc(d->get_dc(dcNr)), toCylinder(toCylinderIn), fromCylinder(fromCylinderIn)
{
if (!d || !dc)
return;