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 struct dive string data into std::string

Browse source 
Much easier memory management!

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2024-05-29 20:40:18 +02:00 • committed by bstoeger
parent 2b3d2f1020
commit 3cb04d230b
34 changed files with 208 additions and 313 deletions
Download patch file Download diff file Expand all files Collapse all files

8
desktop-widgets/templatelayout.cpp
View file

@ -540,11 +540,11 @@ QVariant TemplateLayout::getValue(QString list, QString property, const State &s
} else if (property == "meandepth") {
return get_depth_string(d->dcs[0].meandepth.mm, true, true);
} else if (property == "divemaster") {
return d->diveguide;
return QString::fromStdString(d->diveguide);
} else if (property == "diveguide") {
return d->diveguide;
return QString::fromStdString(d->diveguide);
} else if (property == "buddy") {
return d->buddy;
return QString::fromStdString(d->buddy);
} else if (property == "airTemp") {
return get_temperature_string(d->airtemp, true);
} else if (property == "waterTemp") {
@ -564,7 +564,7 @@ QVariant TemplateLayout::getValue(QString list, QString property, const State &s
} else if (property == "singleWeight") {
return d->weightsystems.size() <= 1;
} else if (property == "suit") {
return d->suit;
return QString::fromStdString(d->suit);
} else if (property == "cylinderList") {
return formatFullCylinderList();
} else if (property == "cylinders") {