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

code cleanup: introduce empty_cylinder constant

Browse source 
This deals with the issue of initializing structs in C++.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2020-01-06 19:00:20 -08:00
parent 4e419f7445
commit cef30619d0
12 changed files with 18 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
qt-models/cylindermodel.cpp
View file

@ -421,7 +421,7 @@ int CylindersModel::rowCount(const QModelIndex&) const
void CylindersModel::add()
{
int row = rows;
cylinder_t cyl = { 0 };
cylinder_t cyl = empty_cylinder;
fill_default_cylinder(&displayed_dive, &cyl);
cyl.start = cyl.type.workingpressure;
cyl.manually_added = true;

4
qt-models/diveplannermodel.cpp
View file

@ -166,12 +166,12 @@ void DivePlannerPointsModel::setupCylinders()
}
}
if (!empty_string(prefs.default_cylinder)) {
cylinder_t cyl = { 0 };
cylinder_t cyl = empty_cylinder;
fill_default_cylinder(&displayed_dive, &cyl);
cyl.start = cyl.type.workingpressure;
add_to_cylinder_table(&displayed_dive.cylinders, 0, cyl);
} else {
cylinder_t cyl = { 0 };
cylinder_t cyl = empty_cylinder;
// roughly an AL80
cyl.type.description = copy_qstring(tr("unknown"));
cyl.type.size.mliter = 11100;

4
qt-models/divetripmodel.cpp
View file

@ -515,7 +515,7 @@ void processRangesZip(Vector1 &items1, Vector2 &items2, Predicate cond, Action a
return 1;
},
[&](Vector1 &v1, int from, int to) { // Action
return action(v1, items2, from, to, actItem);
return action(v1, items2, from, to, actItem);
});
}
@ -653,7 +653,7 @@ QModelIndex DiveTripModelTree::parent(const QModelIndex &index) const
}
DiveTripModelTree::Item::Item(dive_trip *t, const QVector<dive *> &divesIn) : d_or_t{nullptr, t},
dives(divesIn.toStdVector()),
dives(std::vector<dive *>(divesIn.begin(), divesIn.end())),
shown(std::any_of(dives.begin(), dives.end(), [](dive *d){ return !d->hidden_by_filter; }))
{
}