diff options
| author |  Rick Walsh <rickmwalsh@gmail.com> | 2016-09-24 18:02:07 +1000 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2016-09-24 08:29:56 -0700 |
| commit | 7b891904e77364719471098a7bdf4eacc589807c (patch) | |
| tree | 9493f9d13b69fb9d13865a5c1a130f1f8fca4f1f /core/subsurface-qt/SettingsObjectWrapper.cpp | |
| parent | 2b14a9c95d6179fb4cff352dc20036594c8a5aff (diff) | |
| download | subsurface-7b891904e77364719471098a7bdf4eacc589807c.tar.gz | |
Rename conservatism_level to vpmb_conservatism
Make the variable purpose less ambiguous
Signed-off-by: Rick Walsh <rickmwalsh@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'core/subsurface-qt/SettingsObjectWrapper.cpp')
| -rw-r--r-- | core/subsurface-qt/SettingsObjectWrapper.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/core/subsurface-qt/SettingsObjectWrapper.cpp b/core/subsurface-qt/SettingsObjectWrapper.cpp index 42be027d6..62e746a0f 100644 --- a/core/subsurface-qt/SettingsObjectWrapper.cpp +++ b/core/subsurface-qt/SettingsObjectWrapper.cpp @@ -1229,9 +1229,9 @@ int DivePlannerSettings::decoSac() const return prefs.decosac; } -short DivePlannerSettings::conservatismLevel() const +short DivePlannerSettings::vpmbConservatism() const { - return prefs.conservatism_level; + return prefs.vpmb_conservatism; } deco_mode DivePlannerSettings::decoMode() const @@ -1484,16 +1484,16 @@ void DivePlannerSettings::setSecoSac(int value) emit decoSacChanged(value); } -void DivePlannerSettings::setConservatismLevel(int value) +void DivePlannerSettings::setVpmbConservatism(int value) { - if (value == prefs.conservatism_level) + if (value == prefs.vpmb_conservatism) return; QSettings s; s.beginGroup(group); s.setValue("conservatism", value); - prefs.conservatism_level = value; - emit conservatismLevelChanged(value); + prefs.vpmb_conservatism = value; + emit vpmbConservatismChanged(value); } void DivePlannerSettings::setDecoMode(deco_mode value) @@ -2259,7 +2259,7 @@ void SettingsObjectWrapper::load() prefs.drop_stone_mode = s.value("drop_stone_mode", prefs.drop_stone_mode).toBool(); prefs.bottomsac = s.value("bottomsac", prefs.bottomsac).toInt(); prefs.decosac = s.value("decosac", prefs.decosac).toInt(); - prefs.conservatism_level = s.value("conservatism", prefs.conservatism_level).toInt(); + prefs.vpmb_conservatism = s.value("conservatism", prefs.vpmb_conservatism).toInt(); s.endGroup(); s.beginGroup("UpdateManager"); @@ -2296,7 +2296,7 @@ void SettingsObjectWrapper::sync() s.setValue("bottomsac", prefs.bottomsac); s.setValue("decosac", prefs.decosac); s.setValue("deco_mode", int(prefs.deco_mode)); - s.setValue("conservatism", prefs.conservatism_level); + s.setValue("conservatism", prefs.vpmb_conservatism); s.endGroup(); } |