From 4974e6848e1deb6affcecfe2fbd2ce7289ee6f06 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 10 Jan 2015 04:47:33 +0100 Subject: [PATCH] Rename menu_common_type_is --- menu/menu_common.c | 2 +- menu/menu_common.h | 2 +- menu/menu_entries.c | 2 +- menu/menu_entries_cbs.c | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/menu/menu_common.c b/menu/menu_common.c index fbe41c7b24..256baa9e6f 100644 --- a/menu/menu_common.c +++ b/menu/menu_common.c @@ -499,7 +499,7 @@ int menu_iterate(retro_input_t input, return 0; } -unsigned menu_common_type_is(const char *label, unsigned type) +unsigned menu_type_is(const char *label, unsigned type) { if ( !strcmp(label, "rgui_browser_directory") || diff --git a/menu/menu_common.h b/menu/menu_common.h index c7134a013d..e763df7142 100644 --- a/menu/menu_common.h +++ b/menu/menu_common.h @@ -213,7 +213,7 @@ void menu_update_system_info(menu_handle_t *menu, bool *load_no_content); **/ void menu_update_libretro_info(struct retro_system_info *info); -unsigned menu_common_type_is(const char *label, unsigned type); +unsigned menu_type_is(const char *label, unsigned type); void apply_deferred_settings(void); diff --git a/menu/menu_entries.c b/menu/menu_entries.c index dc699123f3..b588fefb5e 100644 --- a/menu/menu_entries.c +++ b/menu/menu_entries.c @@ -351,7 +351,7 @@ int menu_entries_parse_list(file_list_t *list, file_list_t *menu_list, #endif path_is_compressed = path_is_compressed_file(dir); - push_dir = menu_common_type_is(label, type) == MENU_FILE_DIRECTORY; + push_dir = menu_type_is(label, type) == MENU_FILE_DIRECTORY; if (path_is_compressed) str_list = compressed_file_list_new(dir,exts); diff --git a/menu/menu_entries_cbs.c b/menu/menu_entries_cbs.c index ea4150ef85..f111692456 100644 --- a/menu/menu_entries_cbs.c +++ b/menu/menu_entries_cbs.c @@ -2423,7 +2423,7 @@ static int deferred_push_default(void *data, void *userdata, if (!list || !menu_list) return -1; - if (menu_common_type_is(label, type) == MENU_FILE_DIRECTORY) + if (menu_type_is(label, type) == MENU_FILE_DIRECTORY) exts = ""; /* we ignore files anyway */ else if (g_extern.menu.info.valid_extensions) { @@ -2663,7 +2663,7 @@ static void menu_entries_cbs_init_bind_ok(menu_file_list_cbs_t *cbs, cbs->action_ok = action_ok_push_content_list; else if (!strcmp(label, "history_list")) cbs->action_ok = action_ok_push_history_list; - else if (menu_common_type_is(label, type) == MENU_FILE_DIRECTORY) + else if (menu_type_is(label, type) == MENU_FILE_DIRECTORY) cbs->action_ok = action_ok_push_path_list; else if (!strcmp(label, "shader_apply_changes")) cbs->action_ok = action_ok_shader_apply_changes;