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>

2 files changed, 12 insertions, 12 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();
 }
 
diff --git a/core/subsurface-qt/SettingsObjectWrapper.h b/core/subsurface-qt/SettingsObjectWrapper.h
index 7edb74eb5..9e823fdba 100644
--- a/core/subsurface-qt/SettingsObjectWrapper.h
+++ b/core/subsurface-qt/SettingsObjectWrapper.h
@@ -391,7 +391,7 @@ class DivePlannerSettings : public QObject {
 	Q_PROPERTY(int min_switch_duration  READ minSwitchDuration    WRITE setMinSwitchDuration    NOTIFY minSwitchDurationChanged)
 	Q_PROPERTY(int bottomsac            READ bottomSac            WRITE setBottomSac            NOTIFY bottomSacChanged)
 	Q_PROPERTY(int decosac              READ decoSac              WRITE setSecoSac              NOTIFY decoSacChanged)
-	Q_PROPERTY(short conservatism_level READ conservatismLevel    WRITE setConservatismLevel    NOTIFY conservatismLevelChanged)
+	Q_PROPERTY(short vpmb_conservatism  READ vpmbConservatism     WRITE setVpmbConservatism     NOTIFY vpmbConservatismChanged)
 	Q_PROPERTY(deco_mode decoMode       READ decoMode             WRITE setDecoMode             NOTIFY decoModeChanged)
 
 public:
@@ -417,7 +417,7 @@ public:
 	int minSwitchDuration() const;
 	int bottomSac() const;
 	int decoSac() const;
-	short conservatismLevel() const;
+	short vpmbConservatism() const;
 	deco_mode decoMode() const;
 
 public slots:
@@ -442,7 +442,7 @@ public slots:
 	void setMinSwitchDuration(int value);
 	void setBottomSac(int value);
 	void setSecoSac(int value);
-	void setConservatismLevel(int value);
+	void setVpmbConservatism(int value);
 	void setDecoMode(deco_mode value);
 
 signals:
@@ -467,7 +467,7 @@ signals:
 	void minSwitchDurationChanged(int value);
 	void bottomSacChanged(int value);
 	void decoSacChanged(int value);
-	void conservatismLevelChanged(int value);
+	void vpmbConservatismChanged(int value);
 	void decoModeChanged(deco_mode value);
 
 private: