From patchwork Sun May 10 22:19:18 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 48191 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f199.google.com (mail-wi0-f199.google.com [209.85.212.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id C8A462121F for ; Sun, 10 May 2015 22:19:32 +0000 (UTC) Received: by wiz9 with SMTP id 9sf5238533wiz.3 for ; Sun, 10 May 2015 15:19:32 -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:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=7IGp6TjHPpW1lpKrB8Nc78SCUZ5kaNGxPCkWh1YkdKQ=; b=f4mjpnlMjo0/ZHHsJsIF3Pd6HtJDuXFcKMmffoLXye+vhP5xSBql+QBLrgwYF6LxgU AkuOyejrTBuo/CNTVa1tiCsfgmwLipxt7WT2se1cjQcWaQ8SbJPjTVhBggPVco1ccXtf xeTxdILRw0PuhtkGUj75y5aUaJJVhsJNl8HnHl9vYS54dpe9twbQtF7bMBn4qYwfiYLp YXTbtt5R+PC2UlEXKHe1hXVzOQbfGpgWXFAGcfTJX2brghdFv2Ubl1OB8OqaWhxU+vzD gXwsvc9FwZIeAsilFbVbgNWto9Ez1v6KokEW3V0TCfAdNwc6UzyS9Id6GRRqA2580XzB WzbQ== X-Gm-Message-State: ALoCoQltfdcw3zvOA9yCaQCwF24ehGzrwku7lFoVN/6gVqVLFS8aFfHMQ/siz6dSGWV3HIUyqmiq X-Received: by 10.112.203.168 with SMTP id kr8mr5633423lbc.10.1431296372116; Sun, 10 May 2015 15:19:32 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.203.194 with SMTP id ks2ls576288lac.10.gmail; Sun, 10 May 2015 15:19:32 -0700 (PDT) X-Received: by 10.112.17.8 with SMTP id k8mr5837252lbd.28.1431296371979; Sun, 10 May 2015 15:19:31 -0700 (PDT) Received: from mail-la0-f49.google.com (mail-la0-f49.google.com. [209.85.215.49]) by mx.google.com with ESMTPS id dn7si7268394lbb.71.2015.05.10.15.19.31 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 10 May 2015 15:19:31 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.49 as permitted sender) client-ip=209.85.215.49; Received: by layy10 with SMTP id y10so81999102lay.0 for ; Sun, 10 May 2015 15:19:31 -0700 (PDT) X-Received: by 10.112.29.36 with SMTP id g4mr6082750lbh.56.1431296371569; Sun, 10 May 2015 15:19:31 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.112.108.230 with SMTP id hn6csp1195944lbb; Sun, 10 May 2015 15:19:30 -0700 (PDT) X-Received: by 10.66.193.228 with SMTP id hr4mr14514379pac.48.1431296368897; Sun, 10 May 2015 15:19:28 -0700 (PDT) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk. [2001:8b0:1d0::1]) by mx.google.com with ESMTPS id zd13si15457749pab.169.2015.05.10.15.19.27 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sun, 10 May 2015 15:19:28 -0700 (PDT) Received-SPF: none (google.com: pm215@archaic.org.uk does not designate permitted sender hosts) client-ip=2001:8b0:1d0::1; Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1YrZZC-0004QY-3d; Sun, 10 May 2015 23:19:22 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, Programmingkid , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Alexander Graf Subject: [PATCH 3/6] ui/cocoa: openPanelDidEnd returnCode should be NSInteger, not int Date: Sun, 10 May 2015 23:19:18 +0100 Message-Id: <1431296361-16981-4-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1431296361-16981-1-git-send-email-peter.maydell@linaro.org> References: <1431296361-16981-1-git-send-email-peter.maydell@linaro.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.49 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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 --- 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");