Changeset 11796 in vbox

Timestamp:

Aug 29, 2008 9:30:53 AM (16 years ago)

Author:

vboxsync

Message:

FE/Qt: prevent gcc warning in keyboard code

Location:

trunk/src/VBox/Frontends

Files:

• VirtualBox/src/linux/keyboard-new.c (modified) (1 diff)
• VirtualBox4/src/linux/keyboard-new.c (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/linux/keyboard-new.c

@@ -377 +377 @@
     
     for (; (main_keyboard_type_list[i].comment != NULL) && (0 == found); ++i)
-        if (   (   (XKeysymToKeycode(display, XK_Control_L) == main_keyboard_type_list[i].lctrl)
-                && (XKeysymToKeycode(display, XK_Caps_Lock) == main_keyboard_type_list[i].capslock)
-               )
-            || (   (XKeysymToKeycode(display, XK_Caps_Lock) == main_keyboard_type_list[i].lctrl)
-                && (XKeysymToKeycode(display, XK_Control_L) == main_keyboard_type_list[i].capslock)
+        if (   (   (   (XKeysymToKeycode(display, XK_Control_L) == main_keyboard_type_list[i].lctrl)
+                    && (XKeysymToKeycode(display, XK_Caps_Lock) == main_keyboard_type_list[i].capslock)
+                   )
+                || (   (XKeysymToKeycode(display, XK_Caps_Lock) == main_keyboard_type_list[i].lctrl)
+                    && (XKeysymToKeycode(display, XK_Control_L) == main_keyboard_type_list[i].capslock)
+                   )
                ) /* Some people like to switch Capslock and left Ctrl */
             && (XKeysymToKeycode(display, XK_Shift_L)   == main_keyboard_type_list[i].lshift)

trunk/src/VBox/Frontends/VirtualBox4/src/linux/keyboard-new.c

@@ -377 +377 @@
     
     for (; (main_keyboard_type_list[i].comment != NULL) && (0 == found); ++i)
-        if (   (   (XKeysymToKeycode(display, XK_Control_L) == main_keyboard_type_list[i].lctrl)
-                && (XKeysymToKeycode(display, XK_Caps_Lock) == main_keyboard_type_list[i].capslock)
-               )
-            || (   (XKeysymToKeycode(display, XK_Caps_Lock) == main_keyboard_type_list[i].lctrl)
-                && (XKeysymToKeycode(display, XK_Control_L) == main_keyboard_type_list[i].capslock)
+        if (   (   (   (XKeysymToKeycode(display, XK_Control_L) == main_keyboard_type_list[i].lctrl)
+                    && (XKeysymToKeycode(display, XK_Caps_Lock) == main_keyboard_type_list[i].capslock)
+                   )
+                || (   (XKeysymToKeycode(display, XK_Caps_Lock) == main_keyboard_type_list[i].lctrl)
+                    && (XKeysymToKeycode(display, XK_Control_L) == main_keyboard_type_list[i].capslock)
+                   )
                ) /* Some people like to switch Capslock and left Ctrl */
             && (XKeysymToKeycode(display, XK_Shift_L)   == main_keyboard_type_list[i].lshift)