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: make helper functions global

Browse source 
We'll use them from the model in order to avoid creating this many
DiveObjectHelpers when showing a dive.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2019-10-19 22:10:51 -04:00
parent 5a10cd42f7
commit 09c7115e21
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
core/subsurface-qt/DiveObjectHelper.cpp
View file

@ -63,7 +63,7 @@ static QString getPressures(const struct dive *dive, int i, enum returnPressureS
return fmt; return fmt;
} }
static QString format_gps_decimal(const dive *d) QString format_gps_decimal(const dive *d)
{ {
bool savep = prefs.coordinates_traditional; bool savep = prefs.coordinates_traditional;
@ -73,7 +73,7 @@ static QString format_gps_decimal(const dive *d)
return val; return val;
} }
static QString formatNotes(const dive *d) QString formatNotes(const dive *d)
{ {
QString tmp = d->notes ? QString::fromUtf8(d->notes) : QString(); QString tmp = d->notes ? QString::fromUtf8(d->notes) : QString();
if (is_dc_planner(&d->dc)) { if (is_dc_planner(&d->dc)) {
@ -118,7 +118,7 @@ static QString formatGas(const dive *d)
return gases; return gases;
} }
static QString formatSac(const dive *d) QString formatSac(const dive *d)
{ {
if (!d->sac) if (!d->sac)
return QString(); return QString();
@ -152,7 +152,7 @@ static QStringList formatWeights(const dive *d)
return weights; return weights;
} }
static QStringList formatCylinders(const dive *d) QStringList formatCylinders(const dive *d)
{ {
QStringList cylinders; QStringList cylinders;
for (int i = 0; i < MAX_CYLINDERS; i++) { for (int i = 0; i < MAX_CYLINDERS; i++) {
@ -175,7 +175,7 @@ static QVector<CylinderObjectHelper> makeCylinderObjects(const dive *d)
return res; return res;
} }
static QStringList formatGetCylinder(const dive *d) QStringList formatGetCylinder(const dive *d)
{ {
QStringList getCylinder; QStringList getCylinder;
for (int i = 0; i < MAX_CYLINDERS; i++) { for (int i = 0; i < MAX_CYLINDERS; i++) {
@ -185,7 +185,7 @@ static QStringList formatGetCylinder(const dive *d)
return getCylinder; return getCylinder;
} }
static QStringList getStartPressure(const dive *d) QStringList getStartPressure(const dive *d)
{ {
QStringList startPressure; QStringList startPressure;
for (int i = 0; i < MAX_CYLINDERS; i++) { for (int i = 0; i < MAX_CYLINDERS; i++) {
@ -195,7 +195,7 @@ static QStringList getStartPressure(const dive *d)
return startPressure; return startPressure;
} }
static QStringList getEndPressure(const dive *d) QStringList getEndPressure(const dive *d)
{ {
QStringList endPressure; QStringList endPressure;
for (int i = 0; i < MAX_CYLINDERS; i++) { for (int i = 0; i < MAX_CYLINDERS; i++) {
@ -205,7 +205,7 @@ static QStringList getEndPressure(const dive *d)
return endPressure; return endPressure;
} }
static QStringList getFirstGas(const dive *d) QStringList getFirstGas(const dive *d)
{ {
QStringList gas; QStringList gas;
for (int i = 0; i < MAX_CYLINDERS; i++) { for (int i = 0; i < MAX_CYLINDERS; i++) {