From patchwork Tue May 19 08:23:51 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 48729 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f70.google.com (mail-la0-f70.google.com [209.85.215.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 9F82421411 for ; Tue, 19 May 2015 08:24:58 +0000 (UTC) Received: by laat2 with SMTP id t2sf2983442laa.2 for ; Tue, 19 May 2015 01:24:57 -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=3j74iWTdQTCBvw3l7Oz3r1apxHNm+JRKIPvrD3izpag=; b=k4VRDMLBsQS7kQM8xiCYKWjL9RjUa3aAAWaT14CUSaQWdRJnDxSROEySF63uQYN5dl ojXp7wLk3ji+M7XFc+T7Tu2S1YySLKkZKmouJ363sOdq6XMCogpQGztoiM9sYKUf2xzo /WmYdM4NzatilxrqON0AP2h2gssAuWZganroRT4iwE/JosErarL3207U2vYdoaVMN2lr JQ6csJIVQ2dleNt2A9nTUhgFCRNY2ujC2VToLwNACRBlUjDWS+2Ydwq3gGHQz3iuhZng AR9CFvfq0MNbcq1pZcS96vPd6PvHGHLaKmx8LXdRfC9rpgyROP+zw1AUmWDzCQOqdXtp SOjA== X-Gm-Message-State: ALoCoQnkBzvtZuo07NTeVY1Mtjty5wJr7RAq1TLAbpRSOD/tcMwJxy6gIAUg9vZunDtfktJRG3Jt X-Received: by 10.180.97.9 with SMTP id dw9mr13163345wib.2.1432023897261; Tue, 19 May 2015 01:24:57 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.207.65 with SMTP id lu1ls23130lac.104.gmail; Tue, 19 May 2015 01:24:57 -0700 (PDT) X-Received: by 10.152.206.103 with SMTP id ln7mr963659lac.40.1432023897035; Tue, 19 May 2015 01:24:57 -0700 (PDT) Received: from mail-la0-f52.google.com (mail-la0-f52.google.com. [209.85.215.52]) by mx.google.com with ESMTPS id pl9si5232204lbb.111.2015.05.19.01.24.56 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 19 May 2015 01:24:56 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.52 as permitted sender) client-ip=209.85.215.52; Received: by labbd9 with SMTP id bd9so11576313lab.2 for ; Tue, 19 May 2015 01:24:56 -0700 (PDT) X-Received: by 10.152.4.72 with SMTP id i8mr21108841lai.32.1432023896909; Tue, 19 May 2015 01:24:56 -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 hn6csp625270lbb; Tue, 19 May 2015 01:24:55 -0700 (PDT) X-Received: by 10.55.43.220 with SMTP id r89mr55815610qkr.27.1432023895318; Tue, 19 May 2015 01:24:55 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id 132si8723717qhd.25.2015.05.19.01.24.54 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 19 May 2015 01:24:55 -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]:44410 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yucpa-0007BZ-8R for patch@linaro.org; Tue, 19 May 2015 04:24:54 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33842) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yucol-0006H8-Py for qemu-devel@nongnu.org; Tue, 19 May 2015 04:24:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yucok-0006J3-ON for qemu-devel@nongnu.org; Tue, 19 May 2015 04:24:03 -0400 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:34176) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yucok-0006GF-Ht for qemu-devel@nongnu.org; Tue, 19 May 2015 04:24:02 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1Yucoe-0000bW-46; Tue, 19 May 2015 09:23:56 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Tue, 19 May 2015 09:23:51 +0100 Message-Id: <1432023835-2274-7-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 06/10] ui/cocoa: openPanelDidEnd returnCode should be NSInteger, not int 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.52 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 The type for openPanelDidEnd's returnCode argument should be NSInteger, not int. This only matters for the OSX 10.5 code path where we pass the method directly to an OSX function to call. Signed-off-by: Peter Maydell Message-id: 1431296361-16981-4-git-send-email-peter.maydell@linaro.org --- ui/cocoa.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/cocoa.m b/ui/cocoa.m index f6c5fb4..563ea47 100644 --- a/ui/cocoa.m +++ b/ui/cocoa.m @@ -787,7 +787,7 @@ QemuCocoaView *cocoaView; { } - (void)startEmulationWithArgc:(int)argc argv:(char**)argv; -- (void)openPanelDidEnd:(NSOpenPanel *)sheet returnCode:(int)returnCode contextInfo:(void *)contextInfo; +- (void)openPanelDidEnd:(NSOpenPanel *)sheet returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo; - (void)doToggleFullScreen:(id)sender; - (void)toggleFullScreen:(id)sender; - (void)showQEMUDoc:(id)sender; @@ -890,7 +890,7 @@ QemuCocoaView *cocoaView; exit(status); } -- (void)openPanelDidEnd:(NSOpenPanel *)sheet returnCode:(int)returnCode contextInfo:(void *)contextInfo +- (void)openPanelDidEnd:(NSOpenPanel *)sheet returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo { COCOA_DEBUG("QemuCocoaAppController: openPanelDidEnd\n");