| Message ID | 1307646199-39197-1-git-send-email-andreas.faerber@web.de |
|---|---|
| State | New |
| Headers | show |
Tested-by: Alexandre Raymond <cerbere@gmail.com> That's definitely a better patch ;-) Thanks, Alexandre On Thu, Jun 9, 2011 at 3:03 PM, Andreas Färber <andreas.faerber@web.de> wrote: > 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 <cerbere@gmail.com> > Signed-off-by: Andreas Färber <andreas.faerber@web.de> > --- > ui/cocoa.m | 3 ++- > 1 files changed, 2 insertions(+), 1 deletions(-) > > diff --git a/ui/cocoa.m b/ui/cocoa.m > index 1c54759..515e684 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 > { > -- > 1.7.5.3 > > >
Am 10.06.2011 um 04:47 schrieb Alexandre Raymond: > Tested-by: Alexandre Raymond <cerbere@gmail.com> > > That's definitely a better patch ;-) Thanks, applied to the cocoa branch. Andreas > Thanks, > Alexandre > > > > On Thu, Jun 9, 2011 at 3:03 PM, Andreas Färber > <andreas.faerber@web.de> wrote: >> 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 <cerbere@gmail.com> >> Signed-off-by: Andreas Färber <andreas.faerber@web.de> >> --- >> ui/cocoa.m | 3 ++- >> 1 files changed, 2 insertions(+), 1 deletions(-) >> >> diff --git a/ui/cocoa.m b/ui/cocoa.m >> index 1c54759..515e684 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 >> { >> -- >> 1.7.5.3 >> >> >> >
diff --git a/ui/cocoa.m b/ui/cocoa.m index 1c54759..515e684 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 {
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 <cerbere@gmail.com> Signed-off-by: Andreas Färber <andreas.faerber@web.de> --- ui/cocoa.m | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)