summaryrefslogtreecommitdiffstats
path: root/mobile-widgets/qmlmanager.cpp
diff options
context:
space:
mode:
authorGravatar Berthold Stoeger <bstoeger@mail.tuwien.ac.at>2019-06-26 17:21:03 +0200
committerGravatar Dirk Hohndel <dirk@hohndel.org>2019-07-18 06:01:07 -0700
commita5e7f4253ac98ad18354973fda7049e9daaea8eb (patch)
tree16b95a18d0a1af296e4645d6b7a204b5b325ff01 /mobile-widgets/qmlmanager.cpp
parentefdb3503eadd7e47cb64b1c252e50488d2e9d0fe (diff)
downloadsubsurface-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 'mobile-widgets/qmlmanager.cpp')
-rw-r--r--mobile-widgets/qmlmanager.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/mobile-widgets/qmlmanager.cpp b/mobile-widgets/qmlmanager.cpp
index 95454b3c5..9e045d41f 100644
--- a/mobile-widgets/qmlmanager.cpp
+++ b/mobile-widgets/qmlmanager.cpp
@@ -1031,10 +1031,10 @@ void QMLManager::commitChanges(QString diveId, QString date, QString location, Q
}
// not sure what we'd do if there was more than one weight system
// defined - for now just ignore that case
- if (weightsystem_none(&d->weightsystem[1])) {
+ if (d->weightsystems.nr == 1) {
if (myDive->sumWeight() != weight) {
diveChanged = true;
- d->weightsystem[0].weight.grams = parseWeightToGrams(weight);
+ d->weightsystems.weightsystems[0].weight.grams = parseWeightToGrams(weight);
}
}
// start and end pressures for first cylinder only