diff mbox

ui/cocoa.m: Fix compatibility issue with Mac OS 10.9 and under

Message ID F6C36C1A-4661-48F4-BEA6-3994889927D0@gmail.com
State New
Headers show

Commit Message

Programmingkid June 28, 2017, 7:37 p.m. UTC
The [NSEvent modifierFlags] method returns an NSEventModifierFlags type value in Mac OS 10.10. It use to be of type NSUInteger. Replacing NSEventModifierFlags with NSUInteger allows for the cooca.m file to be compiled on older versions of Mac OS. This patch was been tested on Mac OS 10.6 and Mac OS 10.12 without problem.

Signed-off-by: John Arbuckle <programmingkidx@gmail.com>
---
 ui/cocoa.m | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Peter Maydell June 29, 2017, 3:21 p.m. UTC | #1
On 28 June 2017 at 20:37, Programmingkid <programmingkidx@gmail.com> wrote:
> The [NSEvent modifierFlags] method returns an NSEventModifierFlags type value in Mac OS 10.10. It use to be of type NSUInteger. Replacing NSEventModifierFlags with NSUInteger allows for the cooca.m file to be compiled on older versions of Mac OS. This patch was been tested on Mac OS 10.6 and Mac OS 10.12 without problem.
>
> Signed-off-by: John Arbuckle <programmingkidx@gmail.com>
> ---
>  ui/cocoa.m | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/ui/cocoa.m b/ui/cocoa.m
> index 9e81285..93e56d0 100644
> --- a/ui/cocoa.m
> +++ b/ui/cocoa.m
> @@ -571,7 +571,7 @@ QemuCocoaView *cocoaView;
>                  // bitmask.
>
>                  if (qemu_console_is_graphic(NULL)) {
> -                    NSEventModifierFlags modifiers = [event modifierFlags];
> +                    NSUInteger modifiers = [event modifierFlags];
>
>                      if (!!(modifiers & NSEventModifierFlagCapsLock) != !!modifiers_state[Q_KEY_CODE_CAPS_LOCK]) {
>                          [self toggleStatefulModifier:Q_KEY_CODE_CAPS_LOCK];
> --

Applied to master, thanks.

-- PMM
diff mbox

Patch

diff --git a/ui/cocoa.m b/ui/cocoa.m
index 9e81285..93e56d0 100644
--- a/ui/cocoa.m
+++ b/ui/cocoa.m
@@ -571,7 +571,7 @@  QemuCocoaView *cocoaView;
                 // bitmask.
 
                 if (qemu_console_is_graphic(NULL)) {
-                    NSEventModifierFlags modifiers = [event modifierFlags];
+                    NSUInteger modifiers = [event modifierFlags];
 
                     if (!!(modifiers & NSEventModifierFlagCapsLock) != !!modifiers_state[Q_KEY_CODE_CAPS_LOCK]) {
                         [self toggleStatefulModifier:Q_KEY_CODE_CAPS_LOCK];