From 7fee199cf9704587d4ed9eb23044970f2206debc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Thu, 9 Jun 2011 20:53:32 +0200 Subject: cocoa: Avoid warning related to multiple handleEvent: definitions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Avoid compiler confusion as to which method signature to use for the handleEvent: selector on OSX >= 10.6 by making the variable type-safe as opposed to generic 'id' type. Requires moving the variable definition to after the class definition. ----8<---- ui/cocoa.m: In function ‘cocoa_refresh’: ui/cocoa.m:997: warning: multiple methods named ‘-handleEvent:’ found /System/Library/Frameworks/AppKit.framework/Headers/NSTextInputContext.h:84: warning: using ‘-(BOOL)handleEvent:(NSEvent *)theEvent’ ui/cocoa.m:272: warning: also found ‘-(void)handleEvent:(NSEvent *)event’ ----8<--- Reported-by: Alexandre Raymond Signed-off-by: Andreas Färber Tested-by: Alexandre Raymond --- ui/cocoa.m | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'ui/cocoa.m') diff --git a/ui/cocoa.m b/ui/cocoa.m index 1c54759775..515e684dd2 100644 --- a/ui/cocoa.m +++ b/ui/cocoa.m @@ -63,7 +63,6 @@ typedef struct { } QEMUScreen; NSWindow *normalWindow; -id cocoaView; static DisplayChangeListener *dcl; int gArgc; @@ -278,6 +277,8 @@ static int cocoa_keycode_to_qemu(int keycode) - (QEMUScreen) gscreen; @end +QemuCocoaView *cocoaView; + @implementation QemuCocoaView - (id)initWithFrame:(NSRect)frameRect { -- cgit v1.2.3