From 6c076ed3bfab310a265a639bf9e96b6abbc0902d Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 28 Oct 2014 18:19:40 +0100 Subject: [PATCH] Refactor out SD_FLAG_IS_CATEGORY --- frontend/menu/menu_entries.c | 2 +- settings_data.c | 13 ------------- settings_list.h | 3 +-- 3 files changed, 2 insertions(+), 16 deletions(-) diff --git a/frontend/menu/menu_entries.c b/frontend/menu/menu_entries.c index df5413b799..b635b03f56 100644 --- a/frontend/menu/menu_entries.c +++ b/frontend/menu/menu_entries.c @@ -117,7 +117,7 @@ int setting_set_flags(rarch_setting_t *setting) return MENU_SETTING_DRIVER; if (setting->type == ST_PATH) return MENU_FILE_PATH; - if (setting->flags & SD_FLAG_IS_CATEGORY) + if (setting->type == ST_GROUP) return MENU_SETTING_CATEGORY; return 0; } diff --git a/settings_data.c b/settings_data.c index f85e9570f7..b11c23aa36 100644 --- a/settings_data.c +++ b/settings_data.c @@ -3163,7 +3163,6 @@ static bool setting_data_append_list_driver_options( rarch_setting_group_info_t subgroup_info; START_GROUP(group_info, "Driver Options"); - settings_data_list_current_add_flags(list, list_info, SD_FLAG_IS_CATEGORY); START_SUB_GROUP(list, list_info, "State", group_info.name, subgroup_info); @@ -3292,7 +3291,6 @@ static bool setting_data_append_list_general_options( rarch_setting_group_info_t subgroup_info; START_GROUP(group_info, "General Options"); - settings_data_list_current_add_flags(list, list_info, SD_FLAG_IS_CATEGORY); START_SUB_GROUP(list, list_info, "State", group_info.name, subgroup_info); CONFIG_BOOL( @@ -3600,7 +3598,6 @@ static bool setting_data_append_list_video_options( rarch_setting_group_info_t subgroup_info; START_GROUP(group_info, "Video Options"); - settings_data_list_current_add_flags(list, list_info, SD_FLAG_IS_CATEGORY); START_SUB_GROUP(list, list_info, "State", group_info.name, subgroup_info); CONFIG_BOOL( @@ -4198,7 +4195,6 @@ static bool setting_data_append_list_font_options( rarch_setting_group_info_t subgroup_info; START_GROUP(group_info, "Font Options"); - settings_data_list_current_add_flags(list, list_info, SD_FLAG_IS_CATEGORY); START_SUB_GROUP(list, list_info, "Messages", group_info.name, subgroup_info); CONFIG_PATH( @@ -4274,7 +4270,6 @@ static bool setting_data_append_list_audio_options( rarch_setting_group_info_t subgroup_info; START_GROUP(group_info, "Audio Options"); - settings_data_list_current_add_flags(list, list_info, SD_FLAG_IS_CATEGORY); START_SUB_GROUP(list, list_info, "State", group_info.name, subgroup_info); CONFIG_BOOL( @@ -4448,7 +4443,6 @@ static bool setting_data_append_list_input_options( unsigned i, player; START_GROUP(group_info, "Input Options"); - settings_data_list_current_add_flags(list, list_info, SD_FLAG_IS_CATEGORY); START_SUB_GROUP(list, list_info, "State", group_info.name, subgroup_info); CONFIG_BOOL( @@ -4748,7 +4742,6 @@ static bool setting_data_append_list_overlay_options( rarch_setting_group_info_t subgroup_info; START_GROUP(group_info, "Overlay Options"); - settings_data_list_current_add_flags(list, list_info, SD_FLAG_IS_CATEGORY); START_SUB_GROUP(list, list_info, "State", group_info.name, subgroup_info); CONFIG_PATH( @@ -4808,7 +4801,6 @@ static bool setting_data_append_list_menu_options( rarch_setting_group_info_t subgroup_info; START_GROUP(group_info, "Menu Options"); - settings_data_list_current_add_flags(list, list_info, SD_FLAG_IS_CATEGORY); START_SUB_GROUP(list, list_info, "State", group_info.name, subgroup_info); CONFIG_BOOL( @@ -4865,7 +4857,6 @@ static bool setting_data_append_list_netplay_options( rarch_setting_group_info_t subgroup_info; START_GROUP(group_info, "Netplay Options"); - settings_data_list_current_add_flags(list, list_info, SD_FLAG_IS_CATEGORY); START_SUB_GROUP(list, list_info, "State", group_info.name, subgroup_info); CONFIG_BOOL( @@ -4953,7 +4944,6 @@ static bool setting_data_append_list_playlist_options( rarch_setting_group_info_t subgroup_info; START_GROUP(group_info, "Playlist Options"); - settings_data_list_current_add_flags(list, list_info, SD_FLAG_IS_CATEGORY); START_SUB_GROUP(list, list_info, "History", group_info.name, subgroup_info); CONFIG_BOOL( @@ -4993,7 +4983,6 @@ static bool setting_data_append_list_user_options( rarch_setting_group_info_t subgroup_info; START_GROUP(group_info, "User Options"); - settings_data_list_current_add_flags(list, list_info, SD_FLAG_IS_CATEGORY); START_SUB_GROUP(list, list_info, "State", group_info.name, subgroup_info); CONFIG_STRING( @@ -5040,7 +5029,6 @@ static bool setting_data_append_list_path_options( rarch_setting_group_info_t subgroup_info; START_GROUP(group_info, "Path Options"); - settings_data_list_current_add_flags(list, list_info, SD_FLAG_IS_CATEGORY); START_SUB_GROUP(list, list_info, "State", group_info.name, subgroup_info); @@ -5365,7 +5353,6 @@ static bool setting_data_append_list_privacy_options( rarch_setting_group_info_t subgroup_info; START_GROUP(group_info, "Privacy Options"); - settings_data_list_current_add_flags(list, list_info, SD_FLAG_IS_CATEGORY); START_SUB_GROUP(list, list_info, "State", group_info.name, subgroup_info); CONFIG_BOOL( diff --git a/settings_list.h b/settings_list.h index 817a0fb054..5653a568e0 100644 --- a/settings_list.h +++ b/settings_list.h @@ -55,8 +55,7 @@ enum setting_flags SD_FLAG_IS_DRIVER = (1 << 6), SD_FLAG_EXIT = (1 << 7), SD_FLAG_CMD_APPLY_AUTO = (1 << 8), - SD_FLAG_IS_CATEGORY = (1 << 9), - SD_FLAG_IS_DEFERRED = (1 << 10), + SD_FLAG_IS_DEFERRED = (1 << 9), }; enum setting_list_flags