Unecessary code

[andy/viking.git] / src / globals.h

diff --git a/src/globals.h b/src/globals.h
index f1fdba1c0fb4bd15388a1912de6e0ca8f09ed6dd..fdd3f4570aa46c6df3af8997d45f303009ad664a 100644 (file)
--- a/src/globals.h
+++ b/src/globals.h
@@ -22,24 +22,18 @@
 #ifndef __VIKING_GLOBALS_H
 #define __VIKING_GLOBALS_H
 
+#include <glib.h>
+
 #define PROJECT "Viking"
 #define VIKING_VERSION PACKAGE_VERSION
 #define VIKING_VERSION_NAME "This Name For Rent"
 #define VIKING_URL "http://viking.sf.net/"
 
-#ifdef WINDOWS
-#define access(a,b) _access(a,b)
-#define VIKING_FILE_SEP '\\'
-#else
-#include <unistd.h>
-#define VIKING_FILE_SEP '/'
-#define UNIX_WEB_BROWSER "galeon"
-#endif
-
 #define ALTI_TO_MPP 1.4017295
 #define MPP_TO_ALTI 0.7134044
 
 #define VIK_DEFAULT_ALTITUDE 0.0
+#define VIK_DEFAULT_DOP 0.0
 
 #define VIK_GTK_WINDOW_FROM_WIDGET(x) GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(x)))
 #define VIK_GTK_WINDOW_FROM_LAYER(x) VIK_GTK_WINDOW_FROM_WIDGET(VIK_LAYER(x)->vt)
@@ -51,6 +45,26 @@
 #define MERCLAT(x) (RAD2DEG * log(tan((0.25 * M_PI) + (0.5 * DEG2RAD * (x)))))
 #define DEMERCLAT(x) (RAD2DEG * atan(sinh(DEG2RAD * (x))))
 
-typedef struct _VikLayersPanel VikLayersPanel;
-typedef struct _VikLayer VikLayer;
+/* Some command line options */
+extern gboolean vik_use_small_wp_icons;
+extern gboolean vik_debug;
+extern gboolean vik_verbose;
+extern gboolean vik_version;
+
+/* Glbal preferences */
+void a_vik_preferences_init ();
+
+/* Coord display preferences */
+typedef enum {
+  VIK_DEGREE_FORMAT_DDD,
+  VIK_DEGREE_FORMAT_DMM,
+  VIK_DEGREE_FORMAT_DMS,
+} vik_degree_format_t;
+
+vik_degree_format_t a_vik_get_degree_format ( );
+
+/* Group for global preferences */
+#define VIKING_PREFERENCES_GROUP_KEY "viking.globals"
+#define VIKING_PREFERENCES_NAMESPACE "viking.globals."
+
 #endif