From 1df5d44bdb3d5add3853092bd1a778bfc5918289 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 28 Nov 2015 16:13:16 +0100 Subject: [PATCH] Rename input/keyboard_line --- Makefile.common | 2 +- griffin/griffin.c | 2 +- input/drivers/rwebinput_input.c | 2 +- input/drivers/sdl_input.c | 2 +- input/drivers_keyboard/keyboard_event_apple.c | 3 ++- input/drivers_keyboard/keyboard_event_win32.cpp | 2 +- input/drivers_keyboard/keyboard_event_x11.c | 2 +- input/drivers_keyboard/keyboard_event_xkb.c | 2 +- input/{keyboard_line.c => input_keyboard.c} | 5 ++--- input/{keyboard_line.h => input_keyboard.h} | 4 ++-- input/input_overlay.c | 2 +- menu/menu_input.h | 2 +- runloop.c | 2 +- 13 files changed, 16 insertions(+), 16 deletions(-) rename input/{keyboard_line.c => input_keyboard.c} (98%) rename input/{keyboard_line.h => input_keyboard.h} (98%) diff --git a/Makefile.common b/Makefile.common index 1a535389cd..dbb7e7a810 100644 --- a/Makefile.common +++ b/Makefile.common @@ -108,7 +108,7 @@ OBJ += frontend/frontend.o \ ui/drivers/ui_null.o \ libretro_version_1.o \ retroarch.o \ - input/keyboard_line.o \ + input/input_keyboard.o \ system.o \ retroarch_info.o \ command_event.o \ diff --git a/griffin/griffin.c b/griffin/griffin.c index 845b03f22e..b18b87c116 100644 --- a/griffin/griffin.c +++ b/griffin/griffin.c @@ -314,7 +314,7 @@ INPUT #include "../input/input_config.c" #include "../input/input_keymaps.c" #include "../input/input_remapping.c" -#include "../input/keyboard_line.c" +#include "../input/input_keyboard.c" #ifdef HAVE_OVERLAY #include "../input/input_overlay.c" diff --git a/input/drivers/rwebinput_input.c b/input/drivers/rwebinput_input.c index 31c521613a..c678b10377 100644 --- a/input/drivers/rwebinput_input.c +++ b/input/drivers/rwebinput_input.c @@ -19,13 +19,13 @@ #include "../input_joypad.h" #include "../input_autodetect.h" +#include "../input_keyboard.h" #include "../input_config.h" #include "../input_keymaps.h" #include "../../driver.h" #include "../../general.h" -#include "../keyboard_line.h" typedef struct rwebinput_state { diff --git a/input/drivers/sdl_input.c b/input/drivers/sdl_input.c index 5d1a6c9700..8f79682aac 100644 --- a/input/drivers/sdl_input.c +++ b/input/drivers/sdl_input.c @@ -30,7 +30,7 @@ #include "../input_config.h" #include "../input_joypad.h" #include "../input_keymaps.h" -#include "../keyboard_line.h" +#include "../input_keyboard.h" typedef struct sdl_input { diff --git a/input/drivers_keyboard/keyboard_event_apple.c b/input/drivers_keyboard/keyboard_event_apple.c index e172c531dc..b8fd5c2f00 100644 --- a/input/drivers_keyboard/keyboard_event_apple.c +++ b/input/drivers_keyboard/keyboard_event_apple.c @@ -19,7 +19,8 @@ #include "../input_config.h" #include "../input_keymaps.h" -#include "../keyboard_line.h" +#include "../input_keyboard.h" + #include "../drivers/cocoa_input.h" #include "../../general.h" #include "../../driver.h" diff --git a/input/drivers_keyboard/keyboard_event_win32.cpp b/input/drivers_keyboard/keyboard_event_win32.cpp index 12f23e477f..8f627d9df1 100644 --- a/input/drivers_keyboard/keyboard_event_win32.cpp +++ b/input/drivers_keyboard/keyboard_event_win32.cpp @@ -15,7 +15,7 @@ */ #include "../../general.h" -#include "../keyboard_line.h" +#include "../input_keyboard.h" #include "../../gfx/common/win32_common.h" #include "../input_config.h" #include "../input_keymaps.h" diff --git a/input/drivers_keyboard/keyboard_event_x11.c b/input/drivers_keyboard/keyboard_event_x11.c index 4fae676557..ebfea1ecd9 100644 --- a/input/drivers_keyboard/keyboard_event_x11.c +++ b/input/drivers_keyboard/keyboard_event_x11.c @@ -26,7 +26,7 @@ #include #include -#include "../keyboard_line.h" +#include "../input_keyboard.h" #include "../input_keymaps.h" void x11_handle_key_event(XEvent *event, XIC ic, bool filter) diff --git a/input/drivers_keyboard/keyboard_event_xkb.c b/input/drivers_keyboard/keyboard_event_xkb.c index 6dc8d50838..7a7c322b55 100644 --- a/input/drivers_keyboard/keyboard_event_xkb.c +++ b/input/drivers_keyboard/keyboard_event_xkb.c @@ -22,7 +22,7 @@ #include "../input_joypad_driver.h" #include "../input_keymaps.h" -#include "../keyboard_line.h" +#include "../input_keyboard.h" #include "../../configuration.h" #define MOD_MAP_SIZE 5 diff --git a/input/keyboard_line.c b/input/input_keyboard.c similarity index 98% rename from input/keyboard_line.c rename to input/input_keyboard.c index dc0d9c1a25..5a3829e8e3 100644 --- a/input/keyboard_line.c +++ b/input/input_keyboard.c @@ -19,7 +19,7 @@ #include #include "../general.h" -#include "keyboard_line.h" +#include "input_keyboard.h" struct input_keyboard_line { @@ -155,8 +155,7 @@ bool input_keyboard_line_event( * * Returns: pointer to string. **/ -const char **input_keyboard_line_get_buffer( - const input_keyboard_line_t *state) +const char **input_keyboard_line_get_buffer(const input_keyboard_line_t *state) { return (const char**)&state->buffer; } diff --git a/input/keyboard_line.h b/input/input_keyboard.h similarity index 98% rename from input/keyboard_line.h rename to input/input_keyboard.h index 090c55e7a2..0d9b3006a7 100644 --- a/input/keyboard_line.h +++ b/input/input_keyboard.h @@ -14,8 +14,8 @@ * If not, see . */ -#ifndef KEYBOARD_LINE_H__ -#define KEYBOARD_LINE_H__ +#ifndef INPUT_KEYBOARD_H__ +#define INPUT_KEYBOARD_H__ #ifdef __cplusplus extern "C" { diff --git a/input/input_overlay.c b/input/input_overlay.c index 72bca1029a..af366431b4 100644 --- a/input/input_overlay.c +++ b/input/input_overlay.c @@ -29,7 +29,7 @@ #include #include "input_overlay.h" -#include "keyboard_line.h" +#include "input_keyboard.h" #include "../configuration.h" #include "../verbosity.h" diff --git a/menu/menu_input.h b/menu/menu_input.h index 00f2f1253d..1d95014edc 100644 --- a/menu/menu_input.h +++ b/menu/menu_input.h @@ -18,7 +18,7 @@ #define _MENU_INPUT_H #include "../input/input_driver.h" -#include "../input/keyboard_line.h" +#include "../input/input_keyboard.h" #ifdef __cplusplus extern "C" { diff --git a/runloop.c b/runloop.c index 7c56659d64..a00702216f 100644 --- a/runloop.c +++ b/runloop.c @@ -35,7 +35,7 @@ #include "msg_hash.h" -#include "input/keyboard_line.h" +#include "input/input_keyboard.h" #include "input/input_driver.h" #include "ui/ui_companion_driver.h"