ui: rename init_keyboard_layout->kbd_layout_new()

Use a more convential name.

Suggested-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
This commit is contained in:
Marc-André Lureau
2026-04-12 18:09:09 +04:00
parent fbea9d550a
commit d276ad86eb
5 changed files with 11 additions and 11 deletions

View File

@@ -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);
}
}

View File

@@ -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;

View File

@@ -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;

View File

@@ -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);

View File

@@ -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) {