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>
Marc-André Lureau committed
Apr 12, 2026 at 18:09 UTC
d276ad86eb8a31a98fb95e8ccac72dab7aa4e5cd
5 files changed
+11
-11
ui/curses.c
+2
-2
@@ -770,8 +770,8 @@ static void curses_keyboard_setup(void)
770
keyboard_layout = "en-us";
771
#endif
772
if(keyboard_layout) {
773
- kbd_layout = init_keyboard_layout(name2keysym, keyboard_layout,
774
- &error_fatal);
773
+ kbd_layout = kbd_layout_new(name2keysym, keyboard_layout,
774
+ &error_fatal);
775
}
776
}
777
ui/input-barrier.c
+2
-2
@@ -679,8 +679,8 @@ static void input_barrier_instance_init(Object *obj)
679
/* always use generic keymaps */
680
if (keyboard_layout && !kbd_layout) {
681
/* We use X11 key id, so use VNC name2keysym */
682
- kbd_layout = init_keyboard_layout(name2keysym, keyboard_layout,
683
- &error_fatal);
682
+ kbd_layout = kbd_layout_new(name2keysym, keyboard_layout,
683
+ &error_fatal);
684
}
685
686
ib->saddr.type = SOCKET_ADDRESS_TYPE_INET;
ui/keymaps.c
+2
-2
@@ -187,8 +187,8 @@ void kbd_layout_free(kbd_layout_t *k)
187
g_free(k);
188
}
189
190
-kbd_layout_t *init_keyboard_layout(const name2keysym_t *table,
191
- const char *language, Error **errp)
190
+kbd_layout_t *kbd_layout_new(const name2keysym_t *table,
191
+ const char *language, Error **errp)
192
{
193
kbd_layout_t *k;
194
ui/keymaps.h
+2
-2
@@ -52,8 +52,8 @@ typedef struct {
52
53
typedef struct kbd_layout_t kbd_layout_t;
54
55
-kbd_layout_t *init_keyboard_layout(const name2keysym_t *table,
56
- const char *language, Error **errp);
55
+kbd_layout_t *kbd_layout_new(const name2keysym_t *table,
56
+ const char *language, Error **errp);
57
void kbd_layout_free(kbd_layout_t *k);
58
int keysym2scancode(kbd_layout_t *k, int keysym,
59
QKbdState *kbd, bool down);
ui/vnc.c
+3
-3
@@ -3443,10 +3443,10 @@ void vnc_display_init(const char *id, Error **errp)
3443
3444
if (keyboard_layout) {
3445
trace_vnc_key_map_init(keyboard_layout);
3446
- vd->kbd_layout = init_keyboard_layout(name2keysym,
3447
- keyboard_layout, errp);
3446
+ vd->kbd_layout = kbd_layout_new(name2keysym,
3447
+ keyboard_layout, errp);
3448
} else {
3449
- vd->kbd_layout = init_keyboard_layout(name2keysym, "en-us", errp);
3449
+ vd->kbd_layout = kbd_layout_new(name2keysym, "en-us", errp);
3450
}
3451
3452
if (!vd->kbd_layout) {