From f9a2a79f5dc2eba07e75a17c6e83f7a907b80f11 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 19 Jul 2019 13:30:11 +0200 Subject: [PATCH] Rename const variables to macros --- config.def.h | 13 +++++++------ configuration.c | 10 +++++----- menu/menu_setting.c | 6 +++--- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/config.def.h b/config.def.h index 7eb3ff226d..c5b8566700 100644 --- a/config.def.h +++ b/config.def.h @@ -458,7 +458,7 @@ static bool rgui_extended_ascii = false; #define DEFAULT_BLOCK_CONFIG_READ false #endif -static bool automatically_add_content_to_playlist = false; +#define DEFAULT_AUTOMATICALLY_ADD_CONTENT_TO_PLAYLIST false static bool default_game_specific_options = true; static bool default_auto_overrides_enable = true; @@ -497,15 +497,16 @@ static unsigned input_backtouch_toggle = false; #define DEFAULT_ALL_USERS_CONTROL_MENU false #if defined(ANDROID) || defined(_WIN32) -static bool menu_swap_ok_cancel_buttons = true; +#define DEFAULT_MENU_SWAP_OK_CANCEL_BUTTONS true #else -static bool menu_swap_ok_cancel_buttons = false; +#define DEFAULT_MENU_SWAP_OK_CANCEL_BUTTONS false #endif -static bool quit_press_twice = true; +#define DEFAULT_QUIT_PRESS_TWICE true -static bool default_log_to_file = false; -static bool log_to_file_timestamp = false; +#define DEFAULT_LOG_TO_FILE false + +#define DEFAULT_LOG_TO_FILE_TIMESTAMP false /* Crop overscanned frames. */ #define DEFAULT_CROP_OVERSCAN true diff --git a/configuration.c b/configuration.c index 44bdf83bf3..1192720b7a 100644 --- a/configuration.c +++ b/configuration.c @@ -1325,7 +1325,7 @@ static struct config_bool_setting *populate_settings_bool(settings_t *settings, unsigned count = 0; SETTING_BOOL("crt_switch_resolution_use_custom_refresh_rate", &settings->bools.crt_switch_custom_refresh_enable, true, false, false); - SETTING_BOOL("automatically_add_content_to_playlist", &settings->bools.automatically_add_content_to_playlist, true, automatically_add_content_to_playlist, false); + SETTING_BOOL("automatically_add_content_to_playlist", &settings->bools.automatically_add_content_to_playlist, true, DEFAULT_AUTOMATICALLY_ADD_CONTENT_TO_PLAYLIST, false); SETTING_BOOL("ui_companion_start_on_boot", &settings->bools.ui_companion_start_on_boot, true, ui_companion_start_on_boot, false); SETTING_BOOL("ui_companion_enable", &settings->bools.ui_companion_enable, true, ui_companion_enable, false); SETTING_BOOL("ui_companion_toggle", &settings->bools.ui_companion_toggle, false, ui_companion_toggle, false); @@ -1333,7 +1333,7 @@ static struct config_bool_setting *populate_settings_bool(settings_t *settings, SETTING_BOOL("video_gpu_record", &settings->bools.video_gpu_record, true, DEFAULT_GPU_RECORD, false); SETTING_BOOL("input_remap_binds_enable", &settings->bools.input_remap_binds_enable, true, true, false); SETTING_BOOL("all_users_control_menu", &settings->bools.input_all_users_control_menu, true, DEFAULT_ALL_USERS_CONTROL_MENU, false); - SETTING_BOOL("menu_swap_ok_cancel_buttons", &settings->bools.input_menu_swap_ok_cancel_buttons, true, menu_swap_ok_cancel_buttons, false); + SETTING_BOOL("menu_swap_ok_cancel_buttons", &settings->bools.input_menu_swap_ok_cancel_buttons, true, DEFAULT_MENU_SWAP_OK_CANCEL_BUTTONS, false); #ifdef HAVE_NETWORKING SETTING_BOOL("netplay_public_announce", &settings->bools.netplay_public_announce, true, DEFAULT_NETPLAY_PUBLIC_ANNOUNCE, false); SETTING_BOOL("netplay_start_as_spectator", &settings->bools.netplay_start_as_spectator, false, netplay_start_as_spectator, false); @@ -1611,16 +1611,16 @@ static struct config_bool_setting *populate_settings_bool(settings_t *settings, SETTING_BOOL("playlist_sort_alphabetical", &settings->bools.playlist_sort_alphabetical, true, playlist_sort_alphabetical, false); SETTING_BOOL("playlist_fuzzy_archive_match", &settings->bools.playlist_fuzzy_archive_match, true, playlist_fuzzy_archive_match, false); - SETTING_BOOL("quit_press_twice", &settings->bools.quit_press_twice, true, quit_press_twice, false); + SETTING_BOOL("quit_press_twice", &settings->bools.quit_press_twice, true, DEFAULT_QUIT_PRESS_TWICE, false); SETTING_BOOL("vibrate_on_keypress", &settings->bools.vibrate_on_keypress, true, vibrate_on_keypress, false); SETTING_BOOL("enable_device_vibration", &settings->bools.enable_device_vibration, true, enable_device_vibration, false); #ifdef HAVE_OZONE SETTING_BOOL("ozone_collapse_sidebar", &settings->bools.ozone_collapse_sidebar, true, DEFAULT_OZONE_COLLAPSE_SIDEBAR, false); #endif - SETTING_BOOL("log_to_file", &settings->bools.log_to_file, true, default_log_to_file, false); + SETTING_BOOL("log_to_file", &settings->bools.log_to_file, true, DEFAULT_LOG_TO_FILE, false); SETTING_OVERRIDE(RARCH_OVERRIDE_SETTING_LOG_TO_FILE); - SETTING_BOOL("log_to_file_timestamp", &settings->bools.log_to_file_timestamp, true, log_to_file_timestamp, false); + SETTING_BOOL("log_to_file_timestamp", &settings->bools.log_to_file_timestamp, true, DEFAULT_LOG_TO_FILE_TIMESTAMP, false); SETTING_BOOL("ai_service_enable", &settings->bools.ai_service_enable, true, false, false); *size = count; diff --git a/menu/menu_setting.c b/menu/menu_setting.c index 9cb7cd4ec9..6a5f64191d 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -7567,7 +7567,7 @@ static bool setting_append_list( &settings->bools.log_to_file, MENU_ENUM_LABEL_LOG_TO_FILE, MENU_ENUM_LABEL_VALUE_LOG_TO_FILE, - default_log_to_file, + DEFAULT_LOG_TO_FILE, MENU_ENUM_LABEL_VALUE_OFF, MENU_ENUM_LABEL_VALUE_ON, &group_info, @@ -7582,7 +7582,7 @@ static bool setting_append_list( &settings->bools.log_to_file_timestamp, MENU_ENUM_LABEL_LOG_TO_FILE_TIMESTAMP, MENU_ENUM_LABEL_VALUE_LOG_TO_FILE_TIMESTAMP, - log_to_file_timestamp, + DEFAULT_LOG_TO_FILE_TIMESTAMP, MENU_ENUM_LABEL_VALUE_OFF, MENU_ENUM_LABEL_VALUE_ON, &group_info, @@ -9942,7 +9942,7 @@ static bool setting_append_list( &settings->bools.input_menu_swap_ok_cancel_buttons, MENU_ENUM_LABEL_MENU_INPUT_SWAP_OK_CANCEL, MENU_ENUM_LABEL_VALUE_MENU_INPUT_SWAP_OK_CANCEL, - menu_swap_ok_cancel_buttons, + DEFAULT_MENU_SWAP_OK_CANCEL_BUTTONS, MENU_ENUM_LABEL_VALUE_OFF, MENU_ENUM_LABEL_VALUE_ON, &group_info,