From: Marc-André Lureau <[email protected]> Use a more convential name.
Suggested-by: Philippe Mathieu-Daudé <[email protected]> Signed-off-by: Marc-André Lureau <[email protected]> --- ui/keymaps.h | 4 ++-- ui/curses.c | 4 ++-- ui/input-barrier.c | 4 ++-- ui/keymaps.c | 4 ++-- ui/vnc.c | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ui/keymaps.h b/ui/keymaps.h index e8917e56404..89bfbb2704d 100644 --- a/ui/keymaps.h +++ b/ui/keymaps.h @@ -52,8 +52,8 @@ typedef struct { typedef struct kbd_layout_t kbd_layout_t; -kbd_layout_t *init_keyboard_layout(const name2keysym_t *table, - const char *language, Error **errp); +kbd_layout_t *kbd_layout_new(const name2keysym_t *table, + const char *language, Error **errp); void kbd_layout_free(kbd_layout_t *k); int keysym2scancode(kbd_layout_t *k, int keysym, QKbdState *kbd, bool down); diff --git a/ui/curses.c b/ui/curses.c index 161f78c35c3..af4ccb4227d 100644 --- a/ui/curses.c +++ b/ui/curses.c @@ -770,8 +770,8 @@ static void curses_keyboard_setup(void) keyboard_layout = "en-us"; #endif if(keyboard_layout) { - kbd_layout = init_keyboard_layout(name2keysym, keyboard_layout, - &error_fatal); + kbd_layout = kbd_layout_new(name2keysym, keyboard_layout, + &error_fatal); } } diff --git a/ui/input-barrier.c b/ui/input-barrier.c index 0a2198ca500..74724be8f45 100644 --- a/ui/input-barrier.c +++ b/ui/input-barrier.c @@ -679,8 +679,8 @@ static void input_barrier_instance_init(Object *obj) /* always use generic keymaps */ if (keyboard_layout && !kbd_layout) { /* We use X11 key id, so use VNC name2keysym */ - kbd_layout = init_keyboard_layout(name2keysym, keyboard_layout, - &error_fatal); + kbd_layout = kbd_layout_new(name2keysym, keyboard_layout, + &error_fatal); } ib->saddr.type = SOCKET_ADDRESS_TYPE_INET; diff --git a/ui/keymaps.c b/ui/keymaps.c index d1b3f43dc8a..6822c097be7 100644 --- a/ui/keymaps.c +++ b/ui/keymaps.c @@ -187,8 +187,8 @@ void kbd_layout_free(kbd_layout_t *k) g_free(k); } -kbd_layout_t *init_keyboard_layout(const name2keysym_t *table, - const char *language, Error **errp) +kbd_layout_t *kbd_layout_new(const name2keysym_t *table, + const char *language, Error **errp) { kbd_layout_t *k; diff --git a/ui/vnc.c b/ui/vnc.c index 16dbb0cd6c2..c87d1f61a0a 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -3443,10 +3443,10 @@ void vnc_display_init(const char *id, Error **errp) if (keyboard_layout) { trace_vnc_key_map_init(keyboard_layout); - vd->kbd_layout = init_keyboard_layout(name2keysym, - keyboard_layout, errp); + vd->kbd_layout = kbd_layout_new(name2keysym, + keyboard_layout, errp); } else { - vd->kbd_layout = init_keyboard_layout(name2keysym, "en-us", errp); + vd->kbd_layout = kbd_layout_new(name2keysym, "en-us", errp); } if (!vd->kbd_layout) { -- 2.54.0
