Split up preference data structure definition into 'pref.h'

.. and rename the badly named 'output_units/input_units' variables.

We used to have this confusing thing where we had two different units
(input vs output) that *look* like they are mirror images, but in fact
"output_units" was the user units, and "input_units" are the XML parsing
units.

So this renames them to be clearer.  "output_units" is now just "units"
(it's the units a user would ever see), and "input_units" is now
"xml_parsing_units" and set by the XML file parsers to reflect the units
of the parsed file.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

1 files changed, 8 insertions, 8 deletions

diff --git a/equipment.c b/equipment.c
index 232764676..7883e3e98 100644
--- a/equipment.c
+++ b/equipment.c
@@ -75,7 +75,7 @@ static int convert_pressure(int mbar, double *p)
 	int decimals = 1;
 	double pressure;
 
-	if (prefs.output_units.pressure == PSI) {
+	if (prefs.units.pressure == PSI) {
 		pressure = mbar_to_PSI(mbar);
 		decimals = 0;
 	} else {
@@ -92,12 +92,12 @@ static void convert_volume_pressure(int ml, int mbar, double *v, double *p)
 
 	volume = ml / 1000.0;
 	if (mbar) {
-		if (prefs.output_units.volume == CUFT) {
+		if (prefs.units.volume == CUFT) {
 			volume = ml_to_cuft(ml);
 			volume *= bar_to_atm(mbar / 1000.0);
 		}
 
-		if (prefs.output_units.pressure == PSI)
+		if (prefs.units.pressure == PSI)
 			pressure = mbar_to_PSI(mbar);
 		else
 			pressure = mbar / 1000.0;
@@ -111,7 +111,7 @@ static int convert_weight(int grams, double *m)
 	int decimals = 1; /* not sure - do people do less than whole lbs/kg ? */
 	double weight;
 
-	if (prefs.output_units.weight == LBS)
+	if (prefs.units.weight == LBS)
 		weight = grams_to_lbs(grams);
 	else
 		weight = grams / 1000.0;
@@ -631,14 +631,14 @@ static void fill_cylinder_info(struct cylinder_widget *cylinder, cylinder_t *cyl
 {
 	int mbar, ml;
 
-	if (prefs.output_units.pressure == PSI) {
+	if (prefs.units.pressure == PSI) {
 		pressure = psi_to_bar(pressure);
 		start = psi_to_bar(start);
 		end = psi_to_bar(end);
 	}
 
 	mbar = pressure * 1000 + 0.5;
-	if (mbar && prefs.output_units.volume == CUFT) {
+	if (mbar && prefs.units.volume == CUFT) {
 		volume = cuft_to_l(volume);
 		volume /= bar_to_atm(pressure);
 	}
@@ -714,7 +714,7 @@ static void record_weightsystem_changes(weightsystem_t *ws, struct ws_widget *we
 	desc = gtk_combo_box_get_active_text(box);
 	value = gtk_spin_button_get_value(weightsystem_widget->weight);
 
-	if (prefs.output_units.weight == LBS)
+	if (prefs.units.weight == LBS)
 		grams = lbs_to_grams(value);
 	else
 		grams = value * 1000;
@@ -1041,7 +1041,7 @@ static void ws_widget(GtkWidget *vbox, struct ws_widget *ws_widget, GtkListStore
 	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0);
 	gtk_box_pack_start(GTK_BOX(hbox), frame, FALSE, TRUE, 0);
 
-	if ( prefs.output_units.weight == KG)
+	if ( prefs.units.weight == KG)
 		widget = create_spinbutton(hbox, _("kg"), 0, 50, 0.5);
 	else
 		widget = create_spinbutton(hbox, _("lbs"), 0, 110, 1);