From 868a2cc0905b719cb5f3eaf15f0550d6ce82dbeb Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Thu, 10 Jan 2013 17:26:10 -0800 Subject: 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 Signed-off-by: Dirk Hohndel --- divelist.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'divelist.c') diff --git a/divelist.c b/divelist.c index 024d9bfb3..831e2e19d 100644 --- a/divelist.c +++ b/divelist.c @@ -405,7 +405,7 @@ static void depth_data_func(GtkTreeViewColumn *col, if (idx < 0) { *buffer = '\0'; } else { - switch (prefs.output_units.length) { + switch (prefs.units.length) { case METERS: /* To tenths of meters */ depth = (depth + 49) / 100; @@ -464,7 +464,7 @@ static void temperature_data_func(GtkTreeViewColumn *col, *buffer = 0; if (idx >= 0 && value) { double deg; - switch (prefs.output_units.temperature) { + switch (prefs.units.temperature) { case CELSIUS: deg = mkelvin_to_C(value); break; @@ -661,7 +661,7 @@ static void sac_data_func(GtkTreeViewColumn *col, } sac = value / 1000.0; - switch (prefs.output_units.volume) { + switch (prefs.units.volume) { case LITER: fmt = "%4.1f"; break; -- cgit v1.2.3-70-g09d2