From 497dc7a38ab996f8c823a19b72b661d5a9948fe0 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 27 Jun 2020 19:33:49 +0200 Subject: [PATCH] (menu) move headers around - no more menu/widgets --- managers/cheat_manager.c | 1 - menu/cbs/menu_cbs_info.c | 3 +-- menu/cbs/menu_cbs_ok.c | 4 ++-- menu/{widgets => }/menu_dialog.h | 2 +- menu/menu_displaylist.c | 2 +- menu/{widgets => }/menu_input_bind_dialog.h | 2 +- menu/menu_setting.c | 3 +-- retroarch.c | 4 ++-- 8 files changed, 9 insertions(+), 12 deletions(-) rename menu/{widgets => }/menu_dialog.h (98%) rename menu/{widgets => }/menu_input_bind_dialog.h (98%) diff --git a/managers/cheat_manager.c b/managers/cheat_manager.c index 6906ac2c9f..2ec939f349 100644 --- a/managers/cheat_manager.c +++ b/managers/cheat_manager.c @@ -34,7 +34,6 @@ #ifdef HAVE_MENU #include "../menu/menu_driver.h" -#include "../menu/widgets/menu_input_bind_dialog.h" #endif #ifdef HAVE_CHEEVOS diff --git a/menu/cbs/menu_cbs_info.c b/menu/cbs/menu_cbs_info.c index 5f44c16af3..bdb275cde0 100644 --- a/menu/cbs/menu_cbs_info.c +++ b/menu/cbs/menu_cbs_info.c @@ -17,8 +17,7 @@ #include "../menu_driver.h" #include "../menu_cbs.h" - -#include "../widgets/menu_dialog.h" +#include "../menu_dialog.h" #include "../../configuration.h" diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c index cddc62486c..81d72789b8 100644 --- a/menu/cbs/menu_cbs_ok.c +++ b/menu/cbs/menu_cbs_ok.c @@ -47,8 +47,8 @@ #if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL) #include "../menu_shader.h" #endif -#include "../widgets/menu_dialog.h" -#include "../widgets/menu_input_bind_dialog.h" +#include "../menu_dialog.h" +#include "../menu_input_bind_dialog.h" #include "../menu_input.h" #include "../menu_networking.h" diff --git a/menu/widgets/menu_dialog.h b/menu/menu_dialog.h similarity index 98% rename from menu/widgets/menu_dialog.h rename to menu/menu_dialog.h index 702fb65caa..b5633d00f4 100644 --- a/menu/widgets/menu_dialog.h +++ b/menu/menu_dialog.h @@ -25,7 +25,7 @@ #include -#include "../../msg_hash.h" +#include "../msg_hash.h" enum menu_dialog_type { diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index 621d7cab3b..8da2871e25 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -74,7 +74,7 @@ #include "menu_shader.h" #endif #include "menu_networking.h" -#include "widgets/menu_dialog.h" +#include "menu_dialog.h" #include "../configuration.h" #include "../file_path_special.h" diff --git a/menu/widgets/menu_input_bind_dialog.h b/menu/menu_input_bind_dialog.h similarity index 98% rename from menu/widgets/menu_input_bind_dialog.h rename to menu/menu_input_bind_dialog.h index 5c26a6b379..2d4c65b066 100644 --- a/menu/widgets/menu_input_bind_dialog.h +++ b/menu/menu_input_bind_dialog.h @@ -24,7 +24,7 @@ #include -#include "../menu_input.h" +#include "menu_input.h" RETRO_BEGIN_DECLS diff --git a/menu/menu_setting.c b/menu/menu_setting.c index ea2a6b74fa..217b73a6d7 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -62,7 +62,7 @@ #include "../frontend/frontend_driver.h" -#include "widgets/menu_input_bind_dialog.h" +#include "menu_input_bind_dialog.h" #include "menu_setting.h" #include "menu_cbs.h" @@ -72,7 +72,6 @@ #if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL) #include "menu_shader.h" #endif -#include "widgets/menu_input_bind_dialog.h" #include "../core.h" #include "../configuration.h" diff --git a/retroarch.c b/retroarch.c index cad3e1da6c..83cde01dcd 100644 --- a/retroarch.c +++ b/retroarch.c @@ -146,8 +146,8 @@ #include "menu/menu_cbs.h" #include "menu/menu_driver.h" #include "menu/menu_input.h" -#include "menu/widgets/menu_dialog.h" -#include "menu/widgets/menu_input_bind_dialog.h" +#include "menu/menu_dialog.h" +#include "menu/menu_input_bind_dialog.h" #endif #if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL)