Add header and cast properly.

[mapper] / src / settings.h

diff --git a/src/settings.h b/src/settings.h
index 014fcae9229e55488133f63f3f3e9ebf898bb67b..8058c03f8ac5c72becb2847ffe9225d3999760f5 100644 (file)
--- a/src/settings.h
+++ b/src/settings.h
@@ -1,16 +1,14 @@
 #include "config.h"
 
-#define _GNU_SOURCE
-
 #include <glib.h>
 
 #ifndef _MAPPER_SETTINGS_H
 #define _MAPPER_SETTINGS_H
 
 #include "settings-gconf.h"
+#include "mapper-types.h"
 
 /** CONFIGURATION INFORMATION. */
-gchar *_rcvr_mac;
 gchar *_route_dir_uri;
 gchar *_track_file_uri;
 gchar *_route_dl_url;
@@ -20,36 +18,22 @@ gboolean _track_store;
 
 gboolean _always_keep_on;
 gboolean _fullscreen;
+
 gboolean _enable_gps;
 gboolean _gps_info;
+gboolean _satdetails_on;
 
-gboolean _gps_filter;
-gdouble _filter_hdop;
-gdouble _filter_vdop;
-gdouble _filter_angle;
-gdouble _filter_osm;
-
-gint _show_tracks;
-gboolean _show_scale;
-gboolean _show_velvec;
-gboolean _show_poi;
 gboolean _auto_download;
 
-guint _lead_ratio;
-guint _center_ratio;
-guint _draw_width;
-
 gboolean _enable_voice;
 guint _announce_notice_ratio;
-gdouble _voice_speed;
-gint _voice_pitch;
+guint _voice_speed;
+guint _voice_pitch;
 
-gboolean _speed_limit_on;
+gboolean _speed_on;
 gboolean _speed_excess;
 guint _speed_limit;
 
-gboolean _satdetails_on;
-
 gchar *_http_proxy_host;
 gint _http_proxy_port;
 
@@ -57,13 +41,8 @@ GSList *_loc_list;
 GtkListStore *_loc_model;
 
 CustomAction _action[CUSTOM_KEY_ENUM_COUNT];
-CenterMode _center_mode;
-UnitType _units;
 guint _degformat;
 SpeedLocation _speed_location;
 InfoFontSize _info_font_size;
 
-GList *_repo_list;
-RepoData *_curr_repo;
-
 #endif