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, 0 insertions, 49 deletions

diff --git a/display-gtk.h b/display-gtk.h
index 303eff564..60e0c40f8 100644
--- a/display-gtk.h
+++ b/display-gtk.h
@@ -15,49 +15,6 @@ typedef struct {
 	GtkWidget *bar;
 } progressbar_t;
 
-typedef struct {
-	gboolean cylinder;
-	gboolean temperature;
-	gboolean totalweight;
-	gboolean suit;
-	gboolean nitrox;
-	gboolean sac;
-	gboolean otu;
-	gboolean maxcns;
-} visible_cols_t;
-
-typedef struct {
-	gboolean po2;
-	gboolean pn2;
-	gboolean phe;
-	double po2_threshold;
-	double pn2_threshold;
-	double phe_threshold;
-} partial_pressure_graphs_t;
-
-struct preferences {
-	struct units output_units;
-	visible_cols_t visible_cols;
-	partial_pressure_graphs_t pp_graphs;
-	gboolean profile_red_ceiling;
-	gboolean profile_calc_ceiling;
-	gboolean calc_ceiling_3m_incr;
-	double gflow;
-	double gfhigh;
-};
-
-extern struct preferences prefs;
-
-#define PP_GRAPHS_ENABLED (prefs.pp_graphs.po2 || prefs.pp_graphs.pn2 || prefs.pp_graphs.phe)
-
-typedef enum {
-	PREF_BOOL,
-	PREF_STRING
-} pref_type_t;
-
-#define BOOL_TO_PTR(_cond) ((_cond) ? (void *)1 : NULL)
-#define PTR_TO_BOOL(_ptr) ((_ptr) != NULL)
-
 #if defined __APPLE__
 #define CTRLCHAR "<Meta>"
 #define SHIFTCHAR "<Shift>"
@@ -68,12 +25,6 @@ typedef enum {
 #define PREFERENCE_ACCEL NULL
 #endif
 
-extern void subsurface_open_conf(void);
-extern void subsurface_set_conf(char *name, pref_type_t type, const void *value);
-extern const void *subsurface_get_conf(char *name, pref_type_t type);
-extern void subsurface_flush_conf(void);
-extern void subsurface_close_conf(void);
-
 extern int subsurface_fill_device_list(GtkListStore *store);
 extern const char *subsurface_icon_name(void);
 extern void subsurface_ui_setup(GtkSettings *settings, GtkWidget *menubar,