From 2a4c8c53dabf564142d5329b9ff8a82468324fd6 Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Tue, 19 May 2015 09:11:18 +0100 Subject: [PATCH] ui/cocoa: Declare that QemuCocoaAppController implements NSApplicationDelegate Our class QemuCocoaAppController implements the NSApplicationDelegate interface, and we pass an object of this class to [NSApp setDelegate]. However, we weren't declaring in the class definition that we implemented this interface; in OSX 10.10 this provokes the following (slighly misleading) warning: ui/cocoa.m:1031:24: warning: sending 'QemuCocoaAppController *' to parameter of incompatible type 'id' [NSApp setDelegate:appController]; ^~~~~~~~~~~~~ /System/Library/Frameworks/Foundation.framework/Headers/NSFileManager.h:109:47: note: passing argument to parameter 'delegate' here @property (assign) id delegate NS_AVAILABLE(10_5, 2_0); ^ Annoyingly, this interface wasn't formally defined until OSX 10.6, so we have to surround the relevant part of the @interface line with an ifdef. Signed-off-by: Peter Maydell Message-id: 1431296361-16981-5-git-send-email-peter.maydell@linaro.org --- ui/cocoa.m | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ui/cocoa.m b/ui/cocoa.m index 563ea47253..e7b29e01f6 100644 --- a/ui/cocoa.m +++ b/ui/cocoa.m @@ -784,6 +784,9 @@ QemuCocoaView *cocoaView; ------------------------------------------------------ */ @interface QemuCocoaAppController : NSObject +#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6) + +#endif { } - (void)startEmulationWithArgc:(int)argc argv:(char**)argv; -- 2.30.2