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

Let cns and otu return ints rather than QStrings

Browse source 
This way they display correctly when accessed from grantlee template

Fixes #1085

Signed-off-by: Tim Wootton <tim@tee-jay.org.uk>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Tim Wootton 2016-07-18 23:08:27 +01:00 • committed by Dirk Hohndel
parent 2cffb77d19
commit d0e2ff578a
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -306,14 +306,14 @@ QString DiveObjectHelper::tripMeta() const
return ret; return ret;
} }
QString DiveObjectHelper::maxcns() const int DiveObjectHelper::maxcns() const
{ {
return QString(m_dive->maxcns); return m_dive->maxcns;
} }
QString DiveObjectHelper::otu() const int DiveObjectHelper::otu() const
{ {
return QString(m_dive->otu); return m_dive->otu;
} }
int DiveObjectHelper::rating() const int DiveObjectHelper::rating() const

8
core/subsurface-qt/DiveObjectHelper.h
View file

@ -36,8 +36,8 @@ class DiveObjectHelper : public QObject {
Q_PROPERTY(QStringList cylinders READ cylinders CONSTANT) Q_PROPERTY(QStringList cylinders READ cylinders CONSTANT)
Q_PROPERTY(QString trip READ trip CONSTANT) Q_PROPERTY(QString trip READ trip CONSTANT)
Q_PROPERTY(QString tripMeta READ tripMeta CONSTANT) Q_PROPERTY(QString tripMeta READ tripMeta CONSTANT)
Q_PROPERTY(QString maxcns READ maxcns CONSTANT) Q_PROPERTY(int maxcns READ maxcns CONSTANT)
Q_PROPERTY(QString otu READ otu CONSTANT) Q_PROPERTY(int otu READ otu CONSTANT)
Q_PROPERTY(QString sumWeight READ sumWeight CONSTANT) Q_PROPERTY(QString sumWeight READ sumWeight CONSTANT)
Q_PROPERTY(QString getCylinder READ getCylinder CONSTANT) Q_PROPERTY(QString getCylinder READ getCylinder CONSTANT)
Q_PROPERTY(QString startPressure READ startPressure CONSTANT) Q_PROPERTY(QString startPressure READ startPressure CONSTANT)
@ -79,8 +79,8 @@ public:
QString cylinder(int idx) const; QString cylinder(int idx) const;
QString trip() const; QString trip() const;
QString tripMeta() const; QString tripMeta() const;
QString maxcns() const; int maxcns() const;
QString otu() const; int otu() const;
QString sumWeight() const; QString sumWeight() const;
QString getCylinder() const; QString getCylinder() const;
QString startPressure() const; QString startPressure() const;