From patchwork Tue May 19 08:23:52 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 48732 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f69.google.com (mail-wg0-f69.google.com [74.125.82.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 75AAA21411 for ; Tue, 19 May 2015 08:26:29 +0000 (UTC) Received: by wgwl7 with SMTP id l7sf3052334wgw.0 for ; Tue, 19 May 2015 01:26:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:date :message-id:in-reply-to:references:cc:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=XRiinCzjbMWOtsjNkGxxVy4IukjeU7+mNCZyvsOQTXU=; b=ZW7vfa6UnnoePCdVBOCRzabctc+guLm1gMPZg4LFiRzsXb1Wa1cb/ej0wNDYM/dPor fYtUfM2D9Ce2Thuq2B3EA+lC7xzptuHMo0waeTdQIetxGvOoeOQqSgDmPYKuAQ3Jf3zT BPPXnWMJ0YWj+PB20GbAsK0SvJJSYuo4gwUwHT8C5LSlTBP3oQz7iBdOx39+ebhbj2Az 6orJ4xqj1EP2s/C+mQU/5kX7umOjIg5XfHoYWsCx29LN4Qr23td506VR45bcKBlKE4pc vK7Ne7GaVdrr5PlZTLscZBnuVhZryBNtMp5MYXnL/C+TkKA2ieOmZmlRtpWyBxmuhrU6 rdPg== X-Gm-Message-State: ALoCoQne7vIdhT6XFbxVL2IarmQCCYSpinAd4BG4l/188DnTxaDXmjxBYnPO6qjvj8cE/gjek1GN X-Received: by 10.112.28.111 with SMTP id a15mr21024475lbh.21.1432023988788; Tue, 19 May 2015 01:26:28 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.21.98 with SMTP id u2ls23580lae.84.gmail; Tue, 19 May 2015 01:26:28 -0700 (PDT) X-Received: by 10.152.121.42 with SMTP id lh10mr20976292lab.0.1432023988478; Tue, 19 May 2015 01:26:28 -0700 (PDT) Received: from mail-la0-f47.google.com (mail-la0-f47.google.com. [209.85.215.47]) by mx.google.com with ESMTPS id xs10si8374750lbb.86.2015.05.19.01.26.28 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 19 May 2015 01:26:28 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.47 as permitted sender) client-ip=209.85.215.47; Received: by lagr1 with SMTP id r1so11705617lag.0 for ; Tue, 19 May 2015 01:26:28 -0700 (PDT) X-Received: by 10.152.4.137 with SMTP id k9mr20229456lak.29.1432023988064; Tue, 19 May 2015 01:26:28 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.108.230 with SMTP id hn6csp626189lbb; Tue, 19 May 2015 01:26:27 -0700 (PDT) X-Received: by 10.140.130.196 with SMTP id 187mr36095333qhc.12.1432023986645; Tue, 19 May 2015 01:26:26 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id kp6si6180447qcb.26.2015.05.19.01.26.25 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 19 May 2015 01:26:26 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:44426 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yucr3-0001dp-Kp for patch@linaro.org; Tue, 19 May 2015 04:26:25 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33789) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yucok-0006FA-Jh for qemu-devel@nongnu.org; Tue, 19 May 2015 04:24:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yucoh-0006Gn-9Q for qemu-devel@nongnu.org; Tue, 19 May 2015 04:24:02 -0400 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:34176) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yucoh-0006GF-1M for qemu-devel@nongnu.org; Tue, 19 May 2015 04:23:59 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1Yucoe-0000ba-5O; Tue, 19 May 2015 09:23:56 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Tue, 19 May 2015 09:23:52 +0100 Message-Id: <1432023835-2274-8-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1432023835-2274-1-git-send-email-peter.maydell@linaro.org> References: <1432023835-2274-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:8b0:1d0::1 Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [Qemu-devel] [PULL 07/10] ui/cocoa: Declare that QemuCocoaAppController implements NSApplicationDelegate X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.47 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 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 563ea47..e7b29e0 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;