ui: fix alphabetical ordering of keymaps

The qcode-to-linux keymaps was accidentally added in the wrong place
by

  commit de80d78594b4c3767a12d8d42debcf12cbf85a5b
  Author: Owen Smith <owen.smith@citrix.com>
  Date:   Fri Nov 3 11:56:28 2017 +0000

    ui: generate qcode to linux mappings

breaking the alphabetical ordering of keymaps

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-id: 20180117164118.8510-4-berrange@redhat.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

diff --git a/Makefile b/Makefile
index f9278f14c96f317ff2a80d1cd816accbac070931..7073b3d842e47bb28bbd2c28d1726b1e19885de1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -237,10 +237,10 @@ KEYCODEMAP_FILES = \
                 ui/input-keymap-qcode-to-atset1.c \
                 ui/input-keymap-qcode-to-atset2.c \
                 ui/input-keymap-qcode-to-atset3.c \
+                ui/input-keymap-qcode-to-linux.c \
                 ui/input-keymap-qcode-to-qnum.c \
                 ui/input-keymap-qcode-to-sun.c \
                 ui/input-keymap-qnum-to-qcode.c \
-                ui/input-keymap-qcode-to-linux.c \
                 ui/input-keymap-usb-to-qcode.c \
                 ui/input-keymap-win32-to-qcode.c \
                 ui/input-keymap-x11-to-qcode.c \

diff --git a/include/ui/input.h b/include/ui/input.h
index 7d6c92224e03958f9b2f72dab48903a0126fc8f2..ceb22b8eef70bae947338e6135e57b39b203bdaf 100644 (file)
--- a/include/ui/input.h
+++ b/include/ui/input.h
@@ -83,6 +83,9 @@ extern const guint16 qemu_input_map_qcode_to_atset2[];
 extern const guint qemu_input_map_qcode_to_atset3_len;
 extern const guint16 qemu_input_map_qcode_to_atset3[];
 
+extern const guint qemu_input_map_qcode_to_linux_len;
+extern const guint16 qemu_input_map_qcode_to_linux[];
+
 extern const guint qemu_input_map_qcode_to_qnum_len;
 extern const guint16 qemu_input_map_qcode_to_qnum[];
 
@@ -92,9 +95,6 @@ extern const guint16 qemu_input_map_qcode_to_sun[];
 extern const guint qemu_input_map_qnum_to_qcode_len;
 extern const guint16 qemu_input_map_qnum_to_qcode[];
 
-extern const guint qemu_input_map_qcode_to_linux_len;
-extern const guint16 qemu_input_map_qcode_to_linux[];
-
 extern const guint qemu_input_map_usb_to_qcode_len;
 extern const guint16 qemu_input_map_usb_to_qcode[];
 

diff --git a/ui/input-keymap.c b/ui/input-keymap.c
index 7a9475abd92bdb18eb374508d675dc0595e32bfc..3d4e66bab5764b7b4563bd6e7c19cedcee7ff7c5 100644 (file)
--- a/ui/input-keymap.c
+++ b/ui/input-keymap.c
@@ -10,10 +10,10 @@
 #include "ui/input-keymap-qcode-to-atset1.c"
 #include "ui/input-keymap-qcode-to-atset2.c"
 #include "ui/input-keymap-qcode-to-atset3.c"
+#include "ui/input-keymap-qcode-to-linux.c"
 #include "ui/input-keymap-qcode-to-qnum.c"
 #include "ui/input-keymap-qcode-to-sun.c"
 #include "ui/input-keymap-qnum-to-qcode.c"
-#include "ui/input-keymap-qcode-to-linux.c"
 #include "ui/input-keymap-usb-to-qcode.c"
 #include "ui/input-keymap-win32-to-qcode.c"
 #include "ui/input-keymap-x11-to-qcode.c"