From 622321f3fc2a29ef1378d7818e7c16bef761f6e0 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 27 Feb 2015 05:04:50 +0100 Subject: [PATCH] Get rid of some header dependencies --- menu/menu_entries_cbs.c | 15 ----------- menu/menu_entries_cbs_cancel.c | 26 ------------------- menu/menu_entries_cbs_contentlist_switch.c | 29 ---------------------- menu/menu_entries_cbs_deferred_push.c | 12 --------- menu/menu_entries_cbs_iterate.c | 19 -------------- menu/menu_entries_cbs_ok.c | 11 -------- menu/menu_entries_cbs_refresh.c | 29 ---------------------- menu/menu_entries_cbs_representation.c | 24 ------------------ menu/menu_entries_cbs_select.c | 29 ---------------------- menu/menu_entries_cbs_start.c | 21 ---------------- menu/menu_entries_cbs_toggle.c | 22 ---------------- menu/menu_entries_cbs_up_or_down.c | 28 --------------------- 12 files changed, 265 deletions(-) diff --git a/menu/menu_entries_cbs.c b/menu/menu_entries_cbs.c index db34e81c94..27e9a635f0 100644 --- a/menu/menu_entries_cbs.c +++ b/menu/menu_entries_cbs.c @@ -19,32 +19,17 @@ #include "menu_setting.h" #include "menu_input.h" #include "menu_entries.h" -#include "menu_shader.h" #include "menu_navigation.h" -#include "../file_ext.h" #include "../file_extract.h" #include "../file_ops.h" #include "../config.def.h" -#include "../cheats.h" #include "../retroarch.h" -#include "../performance.h" #ifdef HAVE_NETWORKING #include "../net_http.h" #endif -#ifdef HAVE_LIBRETRODB -#include "../database_info.h" -#endif - -#include "menu_database.h" - -#include "../input/input_autodetect.h" -#include "../input/input_remapping.h" - -#include "../gfx/video_viewport.h" - void menu_entries_common_load_content(bool persist) { menu_handle_t *menu = menu_driver_resolve(); diff --git a/menu/menu_entries_cbs_cancel.c b/menu/menu_entries_cbs_cancel.c index 753bf033ba..facdeb0c5f 100644 --- a/menu/menu_entries_cbs_cancel.c +++ b/menu/menu_entries_cbs_cancel.c @@ -17,33 +17,7 @@ #include "menu.h" #include "menu_entries_cbs.h" #include "menu_setting.h" -#include "menu_input.h" #include "menu_entries.h" -#include "menu_shader.h" -#include "menu_navigation.h" - -#include "../file_ext.h" -#include "../file_extract.h" -#include "../file_ops.h" -#include "../config.def.h" -#include "../cheats.h" -#include "../retroarch.h" -#include "../performance.h" - -#ifdef HAVE_NETWORKING -#include "../net_http.h" -#endif - -#ifdef HAVE_LIBRETRODB -#include "../database_info.h" -#endif - -#include "menu_database.h" - -#include "../input/input_autodetect.h" -#include "../input/input_remapping.h" - -#include "../gfx/video_viewport.h" static int action_cancel_lookup_setting(const char *path, const char *label, unsigned type, size_t idx) diff --git a/menu/menu_entries_cbs_contentlist_switch.c b/menu/menu_entries_cbs_contentlist_switch.c index a475881d8b..dad95d4880 100644 --- a/menu/menu_entries_cbs_contentlist_switch.c +++ b/menu/menu_entries_cbs_contentlist_switch.c @@ -13,37 +13,8 @@ * If not, see . */ -#include #include "menu.h" #include "menu_entries_cbs.h" -#include "menu_setting.h" -#include "menu_input.h" -#include "menu_entries.h" -#include "menu_shader.h" -#include "menu_navigation.h" - -#include "../file_ext.h" -#include "../file_extract.h" -#include "../file_ops.h" -#include "../config.def.h" -#include "../cheats.h" -#include "../retroarch.h" -#include "../performance.h" - -#ifdef HAVE_NETWORKING -#include "../net_http.h" -#endif - -#ifdef HAVE_LIBRETRODB -#include "../database_info.h" -#endif - -#include "menu_database.h" - -#include "../input/input_autodetect.h" -#include "../input/input_remapping.h" - -#include "../gfx/video_viewport.h" void menu_entries_cbs_init_bind_content_list_switch(menu_file_list_cbs_t *cbs, const char *path, const char *label, unsigned type, size_t idx, diff --git a/menu/menu_entries_cbs_deferred_push.c b/menu/menu_entries_cbs_deferred_push.c index a9b0dd1cba..9bfbd8f530 100644 --- a/menu/menu_entries_cbs_deferred_push.c +++ b/menu/menu_entries_cbs_deferred_push.c @@ -17,16 +17,9 @@ #include "menu.h" #include "menu_entries_cbs.h" #include "menu_setting.h" -#include "menu_input.h" #include "menu_entries.h" -#include "menu_shader.h" -#include "menu_navigation.h" #include "../file_ext.h" -#include "../file_extract.h" -#include "../file_ops.h" -#include "../config.def.h" -#include "../cheats.h" #include "../retroarch.h" #include "../performance.h" @@ -40,11 +33,6 @@ #include "menu_database.h" -#include "../input/input_autodetect.h" -#include "../input/input_remapping.h" - -#include "../gfx/video_viewport.h" - #ifdef HAVE_LIBRETRODB static int create_string_list_rdb_entry_string(const char *desc, const char *label, const char *actual_string, const char *path, file_list_t *list) diff --git a/menu/menu_entries_cbs_iterate.c b/menu/menu_entries_cbs_iterate.c index 29e5afa9fe..dfb38bc479 100644 --- a/menu/menu_entries_cbs_iterate.c +++ b/menu/menu_entries_cbs_iterate.c @@ -22,28 +22,9 @@ #include "menu_shader.h" #include "menu_navigation.h" -#include "../file_ext.h" -#include "../file_extract.h" -#include "../file_ops.h" -#include "../config.def.h" -#include "../cheats.h" #include "../retroarch.h" -#include "../performance.h" - -#ifdef HAVE_NETWORKING -#include "../net_http.h" -#endif - -#ifdef HAVE_LIBRETRODB -#include "../database_info.h" -#endif - -#include "menu_database.h" #include "../input/input_autodetect.h" -#include "../input/input_remapping.h" - -#include "../gfx/video_viewport.h" static int archive_open(void) { diff --git a/menu/menu_entries_cbs_ok.c b/menu/menu_entries_cbs_ok.c index 48df841828..8d2b8742d4 100644 --- a/menu/menu_entries_cbs_ok.c +++ b/menu/menu_entries_cbs_ok.c @@ -17,27 +17,16 @@ #include "menu.h" #include "menu_entries_cbs.h" #include "menu_setting.h" -#include "menu_input.h" #include "menu_entries.h" #include "menu_shader.h" #include "menu_navigation.h" -#include "../config.def.h" -#include "../cheats.h" #include "../retroarch.h" -#include "../performance.h" #ifdef HAVE_NETWORKING #include "../net_http.h" #endif -#ifdef HAVE_LIBRETRODB -#include "../database_info.h" -#endif - -#include "menu_database.h" - -#include "../input/input_autodetect.h" #include "../input/input_remapping.h" /* FIXME - Global variables, refactor */ diff --git a/menu/menu_entries_cbs_refresh.c b/menu/menu_entries_cbs_refresh.c index 6575d96f94..974891a840 100644 --- a/menu/menu_entries_cbs_refresh.c +++ b/menu/menu_entries_cbs_refresh.c @@ -13,37 +13,8 @@ * If not, see . */ -#include #include "menu.h" -#include "menu_entries_cbs.h" -#include "menu_setting.h" -#include "menu_input.h" #include "menu_entries.h" -#include "menu_shader.h" -#include "menu_navigation.h" - -#include "../file_ext.h" -#include "../file_extract.h" -#include "../file_ops.h" -#include "../config.def.h" -#include "../cheats.h" -#include "../retroarch.h" -#include "../performance.h" - -#ifdef HAVE_NETWORKING -#include "../net_http.h" -#endif - -#ifdef HAVE_LIBRETRODB -#include "../database_info.h" -#endif - -#include "menu_database.h" - -#include "../input/input_autodetect.h" -#include "../input/input_remapping.h" - -#include "../gfx/video_viewport.h" static int action_refresh_default(file_list_t *list, file_list_t *menu_list) { diff --git a/menu/menu_entries_cbs_representation.c b/menu/menu_entries_cbs_representation.c index 1340fee8d9..0d05e3ce08 100644 --- a/menu/menu_entries_cbs_representation.c +++ b/menu/menu_entries_cbs_representation.c @@ -16,35 +16,11 @@ #include #include "menu.h" #include "menu_entries_cbs.h" -#include "menu_setting.h" -#include "menu_input.h" #include "menu_entries.h" #include "menu_shader.h" -#include "menu_navigation.h" -#include "../file_ext.h" -#include "../file_extract.h" -#include "../file_ops.h" -#include "../config.def.h" -#include "../cheats.h" -#include "../retroarch.h" #include "../performance.h" -#ifdef HAVE_NETWORKING -#include "../net_http.h" -#endif - -#ifdef HAVE_LIBRETRODB -#include "../database_info.h" -#endif - -#include "menu_database.h" - -#include "../input/input_autodetect.h" -#include "../input/input_remapping.h" - -#include "../gfx/video_viewport.h" - static void menu_action_setting_disp_set_label_cheat_num_passes( file_list_t* list, unsigned *w, unsigned type, unsigned i, diff --git a/menu/menu_entries_cbs_select.c b/menu/menu_entries_cbs_select.c index 64ddf2bffb..8dd8a4d8c1 100644 --- a/menu/menu_entries_cbs_select.c +++ b/menu/menu_entries_cbs_select.c @@ -13,37 +13,8 @@ * If not, see . */ -#include #include "menu.h" -#include "menu_entries_cbs.h" -#include "menu_setting.h" -#include "menu_input.h" #include "menu_entries.h" -#include "menu_shader.h" -#include "menu_navigation.h" - -#include "../file_ext.h" -#include "../file_extract.h" -#include "../file_ops.h" -#include "../config.def.h" -#include "../cheats.h" -#include "../retroarch.h" -#include "../performance.h" - -#ifdef HAVE_NETWORKING -#include "../net_http.h" -#endif - -#ifdef HAVE_LIBRETRODB -#include "../database_info.h" -#endif - -#include "menu_database.h" - -#include "../input/input_autodetect.h" -#include "../input/input_remapping.h" - -#include "../gfx/video_viewport.h" static int action_select_default(unsigned type, const char *label, unsigned action) diff --git a/menu/menu_entries_cbs_start.c b/menu/menu_entries_cbs_start.c index fbdec9902f..7b30f4d529 100644 --- a/menu/menu_entries_cbs_start.c +++ b/menu/menu_entries_cbs_start.c @@ -13,38 +13,17 @@ * If not, see . */ -#include #include "menu.h" #include "menu_entries_cbs.h" #include "menu_setting.h" -#include "menu_input.h" #include "menu_entries.h" #include "menu_shader.h" -#include "menu_navigation.h" -#include "../file_ext.h" -#include "../file_extract.h" -#include "../file_ops.h" -#include "../config.def.h" -#include "../cheats.h" #include "../retroarch.h" #include "../performance.h" -#ifdef HAVE_NETWORKING -#include "../net_http.h" -#endif - -#ifdef HAVE_LIBRETRODB -#include "../database_info.h" -#endif - -#include "menu_database.h" - -#include "../input/input_autodetect.h" #include "../input/input_remapping.h" -#include "../gfx/video_viewport.h" - static int action_start_remap_file_load(unsigned type, const char *label, unsigned action) { diff --git a/menu/menu_entries_cbs_toggle.c b/menu/menu_entries_cbs_toggle.c index f9e3b6e328..e838822939 100644 --- a/menu/menu_entries_cbs_toggle.c +++ b/menu/menu_entries_cbs_toggle.c @@ -17,33 +17,11 @@ #include "menu.h" #include "menu_entries_cbs.h" #include "menu_setting.h" -#include "menu_input.h" #include "menu_entries.h" #include "menu_shader.h" #include "menu_navigation.h" -#include "../file_ext.h" -#include "../file_extract.h" -#include "../file_ops.h" -#include "../config.def.h" -#include "../cheats.h" #include "../retroarch.h" -#include "../performance.h" - -#ifdef HAVE_NETWORKING -#include "../net_http.h" -#endif - -#ifdef HAVE_LIBRETRODB -#include "../database_info.h" -#endif - -#include "menu_database.h" - -#include "../input/input_autodetect.h" -#include "../input/input_remapping.h" - -#include "../gfx/video_viewport.h" static int shader_action_parameter_toggle(unsigned type, const char *label, unsigned action) diff --git a/menu/menu_entries_cbs_up_or_down.c b/menu/menu_entries_cbs_up_or_down.c index b3fa847d73..01fc92f077 100644 --- a/menu/menu_entries_cbs_up_or_down.c +++ b/menu/menu_entries_cbs_up_or_down.c @@ -13,38 +13,10 @@ * If not, see . */ -#include #include "menu.h" -#include "menu_entries_cbs.h" -#include "menu_setting.h" -#include "menu_input.h" #include "menu_entries.h" -#include "menu_shader.h" #include "menu_navigation.h" -#include "../file_ext.h" -#include "../file_extract.h" -#include "../file_ops.h" -#include "../config.def.h" -#include "../cheats.h" -#include "../retroarch.h" -#include "../performance.h" - -#ifdef HAVE_NETWORKING -#include "../net_http.h" -#endif - -#ifdef HAVE_LIBRETRODB -#include "../database_info.h" -#endif - -#include "menu_database.h" - -#include "../input/input_autodetect.h" -#include "../input/input_remapping.h" - -#include "../gfx/video_viewport.h" - static int action_bind_up_or_down_generic(unsigned type, const char *label, unsigned action) {