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>

6 files changed, 20 insertions, 20 deletions

diff --git a/core/deco.c b/core/deco.c
index 6c3d6dd23..628550d6c 100644
--- a/core/deco.c
+++ b/core/deco.c
@@ -174,15 +174,15 @@ double initial_he_gradient[16];
 
 double get_crit_radius_He()
 {
-	if (prefs.conservatism_level <= 4)
-		return vpmb_config.crit_radius_He * conservatism_lvls[prefs.conservatism_level] * subsurface_conservatism_factor;
+	if (prefs.vpmb_conservatism <= 4)
+		return vpmb_config.crit_radius_He * conservatism_lvls[prefs.vpmb_conservatism] * subsurface_conservatism_factor;
 	return vpmb_config.crit_radius_He;
 }
 
 double get_crit_radius_N2()
 {
-	if (prefs.conservatism_level <= 4)
-		return vpmb_config.crit_radius_N2 * conservatism_lvls[prefs.conservatism_level] * subsurface_conservatism_factor;
+	if (prefs.vpmb_conservatism <= 4)
+		return vpmb_config.crit_radius_N2 * conservatism_lvls[prefs.vpmb_conservatism] * subsurface_conservatism_factor;
 	return vpmb_config.crit_radius_N2;
 }
 
diff --git a/core/planner.c b/core/planner.c
index bbc1599e7..e127cf11e 100644
--- a/core/planner.c
+++ b/core/planner.c
@@ -565,10 +565,10 @@ static void add_plan_to_notes(struct diveplan *diveplan, struct dive *dive, bool
 		snprintf(temp, sz_temp, translate("gettextFromC", "based on Bühlmann ZHL-16C with GFlow = %d and GFhigh = %d"),
 			diveplan->gflow, diveplan->gfhigh);
 	} else if (prefs.deco_mode == VPMB){
-		if (prefs.conservatism_level == 0)
+		if (prefs.vpmb_conservatism == 0)
 			snprintf(temp, sz_temp, "%s", translate("gettextFromC", "based on VPM-B at nominal conservatism"));
 		else
-			snprintf(temp, sz_temp, translate("gettextFromC", "based on VPM-B at +%d conservatism"), prefs.conservatism_level);
+			snprintf(temp, sz_temp, translate("gettextFromC", "based on VPM-B at +%d conservatism"), prefs.vpmb_conservatism);
 	} else if (prefs.deco_mode == RECREATIONAL){
 		snprintf(temp, sz_temp, translate("gettextFromC", "recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d"),
 			diveplan->gflow, diveplan->gfhigh);
diff --git a/core/pref.h b/core/pref.h
index 3d8076335..c12a04078 100644
--- a/core/pref.h
+++ b/core/pref.h
@@ -143,7 +143,7 @@ struct preferences {
 	bool cloud_background_sync;
 	geocoding_prefs_t geocoding;
 	enum deco_mode deco_mode;
-	short conservatism_level;
+	short vpmb_conservatism;
 	int time_threshold;
 	int distance_threshold;
 	bool git_local_only;
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:
diff --git a/core/subsurfacestartup.c b/core/subsurfacestartup.c
index 1041e7d10..7534a4988 100644
--- a/core/subsurfacestartup.c
+++ b/core/subsurfacestartup.c
@@ -84,7 +84,7 @@ struct preferences default_prefs = {
 		.category = { 0 }
 	},
 	.deco_mode = BUEHLMANN,
-	.conservatism_level = 3,
+	.vpmb_conservatism = 3,
 	.distance_threshold = 1000,
 	.time_threshold = 600,
 	.cloud_timeout = 5