diff options
Diffstat (limited to 'core/subsurface-qt')
| -rw-r--r-- | core/subsurface-qt/DiveObjectHelper.cpp | 15 | ||||
| -rw-r--r-- | core/subsurface-qt/DiveObjectHelper.h | 1 |
2 files changed, 7 insertions, 9 deletions
diff --git a/core/subsurface-qt/DiveObjectHelper.cpp b/core/subsurface-qt/DiveObjectHelper.cpp index ec4c8d65f..0af3e432e 100644 --- a/core/subsurface-qt/DiveObjectHelper.cpp +++ b/core/subsurface-qt/DiveObjectHelper.cpp @@ -58,13 +58,6 @@ static QString getPressures(struct dive *dive, int i, enum returnPressureSelecto DiveObjectHelper::DiveObjectHelper(struct dive *d) : m_dive(d) { - if (!m_dive) - qWarning("Creating DiveObjectHelper from NULL dive"); - for (int i = 0; i < MAX_CYLINDERS; i++) { - //Don't add blank cylinders, only those that have been defined. - if (m_dive->cylinder[i].type.description) - m_cyls.append(CylinderObjectHelper(&m_dive->cylinder[i])); - } } int DiveObjectHelper::number() const @@ -311,7 +304,13 @@ QString DiveObjectHelper::cylinder(int idx) const QVector<CylinderObjectHelper> DiveObjectHelper::cylinderObjects() const { - return m_cyls; + QVector<CylinderObjectHelper> res; + for (int i = 0; i < MAX_CYLINDERS; i++) { + //Don't add blank cylinders, only those that have been defined. + if (m_dive->cylinder[i].type.description) + res.append(CylinderObjectHelper(&m_dive->cylinder[i])); // no emplace for QVector. :( + } + return res; } QString DiveObjectHelper::tripId() const diff --git a/core/subsurface-qt/DiveObjectHelper.h b/core/subsurface-qt/DiveObjectHelper.h index a090811de..49eb1d8a6 100644 --- a/core/subsurface-qt/DiveObjectHelper.h +++ b/core/subsurface-qt/DiveObjectHelper.h @@ -99,7 +99,6 @@ public: private: struct dive *m_dive; - QVector<CylinderObjectHelper> m_cyls; }; Q_DECLARE_METATYPE(DiveObjectHelper *) |