diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2019-06-26 17:21:03 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2019-07-18 06:01:07 -0700 |
| commit | a5e7f4253ac98ad18354973fda7049e9daaea8eb (patch) | |
| tree | 16b95a18d0a1af296e4645d6b7a204b5b325ff01 /core/subsurface-qt/DiveObjectHelper.cpp | |
| parent | efdb3503eadd7e47cb64b1c252e50488d2e9d0fe (diff) | |
| download | subsurface-a5e7f4253ac98ad18354973fda7049e9daaea8eb.tar.gz | |
Core: dynamically resize weight table
Replace the fixed-size weightsystem table by a dynamically
relocated table. Reuse the table-macros used in other parts
of the code.
The table stores weightsystem entries, not pointers to
weightsystems. Thus, ownership of the description string is
taken when adding a weightsystem. An extra function adds
a cloned weightsystem at the end of the table.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'core/subsurface-qt/DiveObjectHelper.cpp')
| -rw-r--r-- | core/subsurface-qt/DiveObjectHelper.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/core/subsurface-qt/DiveObjectHelper.cpp b/core/subsurface-qt/DiveObjectHelper.cpp index 35ec2df2a..3f740c3e4 100644 --- a/core/subsurface-qt/DiveObjectHelper.cpp +++ b/core/subsurface-qt/DiveObjectHelper.cpp @@ -14,7 +14,7 @@ enum returnPressureSelector {START_PRESSURE, END_PRESSURE}; static QString getFormattedWeight(struct dive *dive, unsigned int idx) { - weightsystem_t *weight = &dive->weightsystem[idx]; + weightsystem_t *weight = &dive->weightsystems.weightsystems[idx]; if (!weight->description) return QString(); QString fmt = QString(weight->description); @@ -231,7 +231,7 @@ QString DiveObjectHelper::sac() const QString DiveObjectHelper::weightList() const { QString weights; - for (int i = 0; i < MAX_WEIGHTSYSTEMS; i++) { + for (int i = 0; i < m_dive->weightsystems.nr; i++) { QString w = getFormattedWeight(m_dive, i); if (w.isEmpty()) continue; @@ -243,7 +243,7 @@ QString DiveObjectHelper::weightList() const QStringList DiveObjectHelper::weights() const { QStringList weights; - for (int i = 0; i < MAX_WEIGHTSYSTEMS; i++) { + for (int i = 0; i < m_dive->weightsystems.nr; i++) { QString w = getFormattedWeight(m_dive, i); if (w.isEmpty()) continue; @@ -254,12 +254,12 @@ QStringList DiveObjectHelper::weights() const bool DiveObjectHelper::singleWeight() const { - return weightsystem_none(&m_dive->weightsystem[1]); + return m_dive->weightsystems.nr == 1; } QString DiveObjectHelper::weight(int idx) const { - if ( (idx < 0) || idx > MAX_WEIGHTSYSTEMS ) + if ((idx < 0) || idx >= m_dive->weightsystems.nr) return QString(); return getFormattedWeight(m_dive, idx); } |