From 233925bea659c0bf3610e872379e534d832aac6d Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 15 Sep 2016 15:57:25 +0200 Subject: [PATCH] Rename widgets/menu_popup to widgets/menu_dialog --- Makefile.common | 2 +- command.c | 2 +- griffin/griffin.c | 2 +- menu/cbs/menu_cbs_ok.c | 2 +- menu/drivers/menu_generic.c | 2 +- menu/menu_displaylist.c | 2 +- menu/menu_driver.c | 2 +- menu/widgets/{menu_popup.c => menu_dialog.c} | 12 ++++++------ menu/widgets/{menu_popup.h => menu_dialog.h} | 0 runloop.c | 2 +- 10 files changed, 14 insertions(+), 14 deletions(-) rename menu/widgets/{menu_popup.c => menu_dialog.c} (96%) rename menu/widgets/{menu_popup.h => menu_dialog.h} (100%) diff --git a/Makefile.common b/Makefile.common index 17091118c3..66e83b860c 100644 --- a/Makefile.common +++ b/Makefile.common @@ -509,7 +509,7 @@ ifeq ($(HAVE_MENU_COMMON), 1) menu/menu_navigation.o \ menu/menu_setting.o \ menu/menu_shader.o \ - menu/widgets/menu_popup.o \ + menu/widgets/menu_dialog.o \ menu/widgets/menu_entry.o \ menu/widgets/menu_list.o \ menu/menu_cbs.o \ diff --git a/command.c b/command.c index 4e74e58e11..6dd97de573 100644 --- a/command.c +++ b/command.c @@ -48,7 +48,7 @@ #include "menu/menu_content.h" #include "menu/menu_display.h" #include "menu/menu_shader.h" -#include "menu/widgets/menu_popup.h" +#include "menu/widgets/menu_dialog.h" #endif #ifdef HAVE_NETPLAY diff --git a/griffin/griffin.c b/griffin/griffin.c index 74839e79c3..297ad69350 100644 --- a/griffin/griffin.c +++ b/griffin/griffin.c @@ -893,7 +893,7 @@ MENU #include "../menu/menu_cbs.c" #include "../menu/menu_content.c" #include "../menu/widgets/menu_entry.c" -#include "../menu/widgets/menu_popup.c" +#include "../menu/widgets/menu_dialog.c" #include "../menu/widgets/menu_list.c" #include "../menu/cbs/menu_cbs_ok.c" #include "../menu/cbs/menu_cbs_cancel.c" diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c index a6acfe2f46..313936ed9c 100644 --- a/menu/cbs/menu_cbs_ok.c +++ b/menu/cbs/menu_cbs_ok.c @@ -31,7 +31,7 @@ #include "../menu_setting.h" #include "../menu_shader.h" #include "../menu_navigation.h" -#include "../widgets/menu_popup.h" +#include "../widgets/menu_dialog.h" #include "../menu_content.h" #include "../../core.h" diff --git a/menu/drivers/menu_generic.c b/menu/drivers/menu_generic.c index 1dbd5a1fdc..ac5b2cfce3 100644 --- a/menu/drivers/menu_generic.c +++ b/menu/drivers/menu_generic.c @@ -25,7 +25,7 @@ #include "../menu_displaylist.h" #include "../menu_navigation.h" #include "../menu_entries.h" -#include "../widgets/menu_popup.h" +#include "../widgets/menu_dialog.h" #include "../../configuration.h" #include "../../performance_counters.h" diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index 9f53dad062..5b8aa638f2 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -44,7 +44,7 @@ #include "menu_content.h" #include "menu_driver.h" #include "menu_navigation.h" -#include "widgets/menu_popup.h" +#include "widgets/menu_dialog.h" #include "widgets/menu_list.h" #include "menu_cbs.h" diff --git a/menu/menu_driver.c b/menu/menu_driver.c index 23bb3507c7..a7b9d66f0f 100644 --- a/menu/menu_driver.c +++ b/menu/menu_driver.c @@ -29,7 +29,7 @@ #include "menu_cbs.h" #include "menu_display.h" #include "menu_navigation.h" -#include "widgets/menu_popup.h" +#include "widgets/menu_dialog.h" #include "widgets/menu_list.h" #include "menu_shader.h" diff --git a/menu/widgets/menu_popup.c b/menu/widgets/menu_dialog.c similarity index 96% rename from menu/widgets/menu_popup.c rename to menu/widgets/menu_dialog.c index 9c0f376fc3..3f8db6f4a9 100644 --- a/menu/widgets/menu_popup.c +++ b/menu/widgets/menu_dialog.c @@ -24,7 +24,7 @@ #include "../../cheevos.h" #endif -#include "menu_popup.h" +#include "menu_dialog.h" #include "../menu_display.h" #include "../menu_driver.h" @@ -35,11 +35,11 @@ #include "../../input/input_autodetect.h" #include "../../input/input_config.h" -static bool menu_popup_pending_push = false; -static bool menu_popup_active = false; -static unsigned menu_popup_current_id = 0; -static enum menu_popup_type menu_popup_current_type = MENU_POPUP_NONE; -static enum msg_hash_enums menu_popup_current_msg = MSG_UNKNOWN; +static bool menu_popup_pending_push = false; +static bool menu_popup_active = false; +static unsigned menu_popup_current_id = 0; +static enum menu_popup_type menu_popup_current_type = MENU_POPUP_NONE; +static enum msg_hash_enums menu_popup_current_msg = MSG_UNKNOWN; int menu_popup_iterate(char *s, size_t len, const char *label) { diff --git a/menu/widgets/menu_popup.h b/menu/widgets/menu_dialog.h similarity index 100% rename from menu/widgets/menu_popup.h rename to menu/widgets/menu_dialog.h diff --git a/runloop.c b/runloop.c index fb8a86897a..c5ef55c1ca 100644 --- a/runloop.c +++ b/runloop.c @@ -44,7 +44,7 @@ #ifdef HAVE_MENU #include "menu/menu_display.h" #include "menu/menu_driver.h" -#include "menu/widgets/menu_popup.h" +#include "menu/widgets/menu_dialog.h" #endif #ifdef HAVE_NETPLAY