mirror of
https://github.com/qemu/qemu.git
synced 2026-07-08 17:56:38 +00:00
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:
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
6
ui/vnc.c
6
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) {
|
||||
|
||||
Reference in New Issue
Block a user