From d0e2ff578aa612c6dd9320d831e068ded1202675 Mon Sep 17 00:00:00 2001 From: Tim Wootton Date: Mon, 18 Jul 2016 23:08:27 +0100 Subject: 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 Signed-off-by: Dirk Hohndel --- core/subsurface-qt/DiveObjectHelper.cpp | 8 ++++---- core/subsurface-qt/DiveObjectHelper.h | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'core') 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; -- cgit v1.2.3-70-g09d2