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>

diff --git a/ui/curses.c b/ui/curses.c
index 161f78c35c32fc03ad576d2bd8e91bdfe09b265d..af4ccb4227d2af186d8208162158cf3dc3cf9e92 100644 (file)
--- 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 0a2198ca500310d84c78ba937a1940a45a13ce81..74724be8f45a2549a577f3c3603f6119540ee67f 100644 (file)
--- 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 d1b3f43dc8a35dea06bd71e6c61328a901ae6362..6822c097be722696ebf94d92204f69e621c07441 100644 (file)
--- 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/keymaps.h b/ui/keymaps.h
index e8917e564042162dde0f9fd2dfd84f88f1ae54b2..89bfbb2704da7ab9a0d12a8a939f2d8c618f2363 100644 (file)
--- 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/vnc.c b/ui/vnc.c
index 16dbb0cd6c26e348194d0afc17426270a2c0763c..c87d1f61a0aad0673192829e842eade96396d039 100644 (file)
--- 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) {