diff options
| author |  Tim Wootton <tim@tee-jay.org.uk> | 2016-07-18 23:08:27 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2016-07-23 10:50:15 +0900 |
| commit | d0e2ff578aa612c6dd9320d831e068ded1202675 (patch) | |
| tree | 494734a245a962867960b4ccad6d71f916e610fd /core | |
| parent | 2cffb77d19e6ed7f3f5b26db8b68490159486f93 (diff) | |
| download | subsurface-d0e2ff578aa612c6dd9320d831e068ded1202675.tar.gz | |
Let cns and otu return ints rather than QStrings
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>
Diffstat (limited to 'core')
| -rw-r--r-- | core/subsurface-qt/DiveObjectHelper.cpp | 8 | ||||
| -rw-r--r-- | core/subsurface-qt/DiveObjectHelper.h | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/core/subsurface-qt/DiveObjectHelper.cpp b/core/subsurface-qt/DiveObjectHelper.cpp index fc406d600..1c7621e10 100644 --- a/core/subsurface-qt/DiveObjectHelper.cpp +++ b/core/subsurface-qt/DiveObjectHelper.cpp @@ -306,14 +306,14 @@ QString DiveObjectHelper::tripMeta() const 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 diff --git a/core/subsurface-qt/DiveObjectHelper.h b/core/subsurface-qt/DiveObjectHelper.h index 6d95d7578..ab42a59b3 100644 --- a/core/subsurface-qt/DiveObjectHelper.h +++ b/core/subsurface-qt/DiveObjectHelper.h @@ -36,8 +36,8 @@ class DiveObjectHelper : public QObject { Q_PROPERTY(QStringList cylinders READ cylinders CONSTANT) Q_PROPERTY(QString trip READ trip CONSTANT) Q_PROPERTY(QString tripMeta READ tripMeta CONSTANT) - Q_PROPERTY(QString maxcns READ maxcns CONSTANT) - Q_PROPERTY(QString otu READ otu CONSTANT) + Q_PROPERTY(int maxcns READ maxcns CONSTANT) + Q_PROPERTY(int otu READ otu CONSTANT) Q_PROPERTY(QString sumWeight READ sumWeight CONSTANT) Q_PROPERTY(QString getCylinder READ getCylinder CONSTANT) Q_PROPERTY(QString startPressure READ startPressure CONSTANT) @@ -79,8 +79,8 @@ public: QString cylinder(int idx) const; QString trip() const; QString tripMeta() const; - QString maxcns() const; - QString otu() const; + int maxcns() const; + int otu() const; QString sumWeight() const; QString getCylinder() const; QString startPressure() const; |