From b95cdd2215240da1b76befd99b47cdaf11def512 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 10 Jan 2015 04:53:37 +0100 Subject: [PATCH] Rename menu_common.c to menu.c --- Makefile.common | 2 +- apple/OSX/platform.m | 2 +- apple/iOS/menu.m | 2 +- driver.c | 2 +- gfx/gx/gx_gfx.c | 2 +- griffin/griffin.c | 2 +- menu/disp/glui.c | 2 +- menu/disp/ios.c | 2 +- menu/disp/lakka.c | 2 +- menu/disp/rgui.c | 2 +- menu/disp/rmenu.c | 2 +- menu/disp/rmenu_xui.cpp | 2 +- menu/disp/xmb.c | 2 +- menu/{menu_common.c => menu.c} | 2 +- menu/{menu_common.h => menu.h} | 4 ++-- menu/menu_common_list.c | 2 +- menu/menu_entries.h | 2 +- menu/menu_entries_cbs.c | 2 +- menu/menu_input_line_cb.c | 2 +- menu/menu_navigation.h | 2 +- retroarch.c | 2 +- runloop.c | 2 +- 22 files changed, 23 insertions(+), 23 deletions(-) rename menu/{menu_common.c => menu.c} (99%) rename menu/{menu_common.h => menu.h} (99%) diff --git a/Makefile.common b/Makefile.common index 60c990f554..66ef85993d 100644 --- a/Makefile.common +++ b/Makefile.common @@ -288,7 +288,7 @@ endif ifeq ($(HAVE_MENU_COMMON), 1) OBJ += menu/backend/menu_common_backend.o \ menu/menu_input_line_cb.o \ - menu/menu_common.o \ + menu/menu.o \ menu/menu_common_list.o \ menu/menu_navigation.o \ menu/menu_action.o \ diff --git a/apple/OSX/platform.m b/apple/OSX/platform.m index 9b0ee0c78c..3e92909530 100644 --- a/apple/OSX/platform.m +++ b/apple/OSX/platform.m @@ -21,7 +21,7 @@ #import "../common/RetroArch_Apple.h" #include "../../input/apple_input.h" #include "../../frontend/frontend.h" -#include "../../menu/menu_common.h" +#include "../../menu/menu.h" #include "../../retroarch.h" static void* const associated_core_key = (void*)&associated_core_key; diff --git a/apple/iOS/menu.m b/apple/iOS/menu.m index d0b8cb69d7..c0f90d7485 100644 --- a/apple/iOS/menu.m +++ b/apple/iOS/menu.m @@ -22,7 +22,7 @@ #include #include "menu.h" -#include "../../menu/menu_common.h" +#include "../../menu/menu.h" #include "../../menu/menu_entries.h" #include "../../menu/disp/shared.h" diff --git a/driver.c b/driver.c index ca7ad65916..471af8d427 100644 --- a/driver.c +++ b/driver.c @@ -34,7 +34,7 @@ #endif #ifdef HAVE_MENU -#include "menu/menu_common.h" +#include "menu/menu.h" #endif #ifdef HAVE_CONFIG_H diff --git a/gfx/gx/gx_gfx.c b/gfx/gx/gx_gfx.c index df6e7df595..1e24c15001 100644 --- a/gfx/gx/gx_gfx.c +++ b/gfx/gx/gx_gfx.c @@ -18,7 +18,7 @@ #include "../../driver.h" #include "../../general.h" #include "../fonts/bitmap.h" -#include "../../menu/menu_common.h" +#include "../../menu/menu.h" #include "../gfx_common.h" #ifdef HW_RVL diff --git a/griffin/griffin.c b/griffin/griffin.c index 530d650b36..d0bc9a99f8 100644 --- a/griffin/griffin.c +++ b/griffin/griffin.c @@ -662,7 +662,7 @@ MENU ============================================================ */ #ifdef HAVE_MENU #include "../menu/menu_input_line_cb.c" -#include "../menu/menu_common.c" +#include "../menu/menu.c" #include "../menu/menu_common_list.c" #include "../menu/menu_action.c" #include "../menu/menu_list.c" diff --git a/menu/disp/glui.c b/menu/disp/glui.c index 68d64db905..363a67c134 100644 --- a/menu/disp/glui.c +++ b/menu/disp/glui.c @@ -20,7 +20,7 @@ #include #include -#include "../menu_common.h" +#include "../menu.h" #include "../../general.h" #include #include "../../gfx/gl_common.h" diff --git a/menu/disp/ios.c b/menu/disp/ios.c index 1ec689cd04..2a66ee113c 100644 --- a/menu/disp/ios.c +++ b/menu/disp/ios.c @@ -16,7 +16,7 @@ #include #include #include "menu_display.h" -#include "../menu_common.h" +#include "../menu.h" #include "../../general.h" #include "ios.h" diff --git a/menu/disp/lakka.c b/menu/disp/lakka.c index cfd17e56bb..683876a964 100644 --- a/menu/disp/lakka.c +++ b/menu/disp/lakka.c @@ -22,7 +22,7 @@ #include #include -#include "../menu_common.h" +#include "../menu.h" #include "../../general.h" #include #include diff --git a/menu/disp/rgui.c b/menu/disp/rgui.c index d78ad57813..a8edf81a99 100644 --- a/menu/disp/rgui.c +++ b/menu/disp/rgui.c @@ -21,7 +21,7 @@ #include #include -#include "../menu_common.h" +#include "../menu.h" #include "../../general.h" #include "../../retroarch.h" #include diff --git a/menu/disp/rmenu.c b/menu/disp/rmenu.c index e64a5df0ba..44811d33a2 100644 --- a/menu/disp/rmenu.c +++ b/menu/disp/rmenu.c @@ -22,7 +22,7 @@ #include #include "menu_display.h" -#include "../menu_common.h" +#include "../menu.h" #include "../../general.h" #include "../../gfx/gfx_common.h" #include "../../config.def.h" diff --git a/menu/disp/rmenu_xui.cpp b/menu/disp/rmenu_xui.cpp index 49924f51a3..4b5a757af8 100644 --- a/menu/disp/rmenu_xui.cpp +++ b/menu/disp/rmenu_xui.cpp @@ -21,8 +21,8 @@ #include #include "menu_display.h" +#include "../menu.h" #include "../menu_list.h" -#include "../menu_common.h" #include "../../gfx/gfx_common.h" #include "../../gfx/gfx_context.h" diff --git a/menu/disp/xmb.c b/menu/disp/xmb.c index 6951c2793a..d7a0d89ccd 100644 --- a/menu/disp/xmb.c +++ b/menu/disp/xmb.c @@ -20,7 +20,7 @@ #include #include -#include "../menu_common.h" +#include "../menu.h" #include "../../general.h" #include #include "../../gfx/gl_common.h" diff --git a/menu/menu_common.c b/menu/menu.c similarity index 99% rename from menu/menu_common.c rename to menu/menu.c index 256baa9e6f..72006fd5df 100644 --- a/menu/menu_common.c +++ b/menu/menu.c @@ -14,7 +14,7 @@ * If not, see . */ -#include "menu_common.h" +#include "menu.h" #include "menu_entries.h" #include "menu_shader.h" #include "../dynamic.h" diff --git a/menu/menu_common.h b/menu/menu.h similarity index 99% rename from menu/menu_common.h rename to menu/menu.h index e763df7142..0d6f8ba5c8 100644 --- a/menu/menu_common.h +++ b/menu/menu.h @@ -14,8 +14,8 @@ * If not, see . */ -#ifndef MENU_COMMON_H__ -#define MENU_COMMON_H__ +#ifndef __RETROARCH_MENU_H__ +#define __RETROARCH_MENU_H__ #include #include diff --git a/menu/menu_common_list.c b/menu/menu_common_list.c index 0306fac618..9dce326d48 100644 --- a/menu/menu_common_list.c +++ b/menu/menu_common_list.c @@ -14,7 +14,7 @@ * If not, see . */ -#include "menu_common.h" +#include "menu.h" #include "menu_common_list.h" #include "menu_list.h" #include "menu_entries_cbs.h" diff --git a/menu/menu_entries.h b/menu/menu_entries.h index 9dd879daf7..19affaf945 100644 --- a/menu/menu_entries.h +++ b/menu/menu_entries.h @@ -18,7 +18,7 @@ #define MENU_ENTRIES_H__ #include -#include "menu_common.h" +#include "menu.h" #include #include "../settings_data.h" diff --git a/menu/menu_entries_cbs.c b/menu/menu_entries_cbs.c index f111692456..189a43ebb5 100644 --- a/menu/menu_entries_cbs.c +++ b/menu/menu_entries_cbs.c @@ -14,9 +14,9 @@ */ #include +#include "menu.h" #include "menu_entries_cbs.h" #include "menu_action.h" -#include "menu_common.h" #include "menu_list.h" #include "menu_input_line_cb.h" #include "menu_entries.h" diff --git a/menu/menu_input_line_cb.c b/menu/menu_input_line_cb.c index 836981494b..3c24351071 100644 --- a/menu/menu_input_line_cb.c +++ b/menu/menu_input_line_cb.c @@ -24,7 +24,7 @@ #include #include #include -#include "menu_common.h" +#include "menu.h" #include "menu_action.h" #include "menu_shader.h" #include "../input/keyboard_line.h" diff --git a/menu/menu_navigation.h b/menu/menu_navigation.h index d5f947c4cf..ce39214742 100644 --- a/menu/menu_navigation.h +++ b/menu/menu_navigation.h @@ -17,7 +17,7 @@ #ifndef _MENU_NAVIGATION_H #define _MENU_NAVIGATION_H -#include "menu_common.h" +#include "menu.h" #ifdef __cplusplus extern "C" { diff --git a/retroarch.c b/retroarch.c index 4ae25d538a..fca3883917 100644 --- a/retroarch.c +++ b/retroarch.c @@ -41,7 +41,7 @@ #include "intl/intl.h" #ifdef HAVE_MENU -#include "menu/menu_common.h" +#include "menu/menu.h" #include "menu/menu_shader.h" #include "menu/menu_input_line_cb.h" #endif diff --git a/runloop.c b/runloop.c index 3cc7f3fb6b..a343f6b7ed 100644 --- a/runloop.c +++ b/runloop.c @@ -25,7 +25,7 @@ #include "runloop.h" #ifdef HAVE_MENU -#include "menu/menu_common.h" +#include "menu/menu.h" #endif #ifdef HAVE_NETPLAY