diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org> | 2013-01-10 17:26:10 -0800 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2013-01-10 20:30:32 -0800 |
| commit | 868a2cc0905b719cb5f3eaf15f0550d6ce82dbeb (patch) | |
| tree | f7cca241ff73a2ae6c38c975911b3beae5cc1406 /divelist.c | |
| parent | 4c13f1f6b4ad7deb2071fb4848ddf43be0af4db7 (diff) | |
| download | subsurface-868a2cc0905b719cb5f3eaf15f0550d6ce82dbeb.tar.gz | |
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>
Diffstat (limited to 'divelist.c')
| -rw-r--r-- | divelist.c | 6 |
1 files changed, 3 insertions, 3 deletions
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; |