From 4e6dd75d11f497f9de97fad578a05b43baf6ab36 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Mon, 7 Oct 2013 09:37:57 -0700 Subject: [PATCH] Remove feature checking We needed this in Gtk version as we were using a system font to show the stars and that was missing on some ancient Windows versions. With the Qt version we actually draw the stars so this has become obsolete. Suggested-by: Robert C. Helling Signed-off-by: Dirk Hohndel --- dive.h | 6 ------ linux.c | 5 ----- macos.c | 5 ----- windows.c | 15 --------------- 4 files changed, 31 deletions(-) diff --git a/dive.h b/dive.h index 78d91f066..a6dd0e5b6 100644 --- a/dive.h +++ b/dive.h @@ -700,13 +700,7 @@ const char *monthname(int mon); #define FIVE_STARS UTF8_BLACKSTAR UTF8_BLACKSTAR UTF8_BLACKSTAR UTF8_BLACKSTAR UTF8_BLACKSTAR extern const char *star_strings[]; -/* enum holding list of OS features */ -typedef enum { - UTF8_FONT_WITH_STARS -} os_feature_t; - extern const char *existing_filename; -extern bool subsurface_os_feature_available(os_feature_t); extern void subsurface_command_line_init(int *, char ***); extern void subsurface_command_line_exit(int *, char ***); diff --git a/linux.c b/linux.c index 159e02d6a..2cee87689 100644 --- a/linux.c +++ b/linux.c @@ -33,11 +33,6 @@ void subsurface_command_line_exit(int *argc, char ***argv) /* this is a no-op */ } -bool subsurface_os_feature_available(os_feature_t f) -{ - return TRUE; -} - int enumerate_devices (device_callback_t callback, void *userdata) { int index = -1; diff --git a/macos.c b/macos.c index ac5faf0e8..d1b3bbedd 100644 --- a/macos.c +++ b/macos.c @@ -48,11 +48,6 @@ void subsurface_command_line_exit(int *argc, char ***argv) /* this is a no-op */ } -bool subsurface_os_feature_available(os_feature_t f) -{ - return TRUE; -} - int enumerate_devices (device_callback_t callback, void *userdata) { int index = -1; diff --git a/windows.c b/windows.c index cd1acf368..0c117746d 100644 --- a/windows.c +++ b/windows.c @@ -89,21 +89,6 @@ void subsurface_command_line_exit(int *argc, char ***argv) free(*argv); } -/* check if we are running a newer OS version */ -bool subsurface_os_feature_available(os_feature_t f) -{ - switch (f) { - case UTF8_FONT_WITH_STARS: - if ((GetVersion() & 0xff) < 6) - return FALSE; /* version less than Vista */ - else - return TRUE; - break; - default: - return TRUE; - } -} - int enumerate_devices (device_callback_t callback, void *userdata) { // Open the registry key.