Return-Path: 
 <callback-commits-return-6017-apmail-incubator-callback-commits-archive=incubator.apache.org@incubator.apache.org>
X-Original-To: apmail-incubator-callback-commits-archive@minotaur.apache.org
Delivered-To: apmail-incubator-callback-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 54A24DD52
	for <apmail-incubator-callback-commits-archive@minotaur.apache.org>;
 Thu,  4 Oct 2012 19:55:59 +0000 (UTC)
Received: (qmail 79213 invoked by uid 500); 4 Oct 2012 19:55:59 -0000
Delivered-To: apmail-incubator-callback-commits-archive@incubator.apache.org
Received: (qmail 79132 invoked by uid 500); 4 Oct 2012 19:55:59 -0000
Mailing-List: contact callback-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:callback-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:callback-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:callback-commits@incubator.apache.org>
List-Id: <callback-commits.incubator.apache.org>
Reply-To: callback-dev@incubator.apache.org
Delivered-To: mailing list callback-commits@incubator.apache.org
Received: (qmail 78822 invoked by uid 99); 4 Oct 2012 19:55:58 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 Oct 2012 19:55:58 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 5EF113A32A; Thu,  4 Oct 2012 19:55:58 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: agrieve@apache.org
To: callback-commits@incubator.apache.org
X-Mailer: ASF-Git Admin Mailer
Subject: [9/11] ios commit: Update uncrustify rules for ternary operators.
Message-Id: <20121004195558.5EF113A32A@tyr.zones.apache.org>
Date: Thu,  4 Oct 2012 19:55:58 +0000 (UTC)

Update uncrustify rules for ternary operators.


Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/commit/5c41ef61
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/tree/5c41ef61
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/diff/5c41ef61

Branch: refs/heads/master
Commit: 5c41ef616d397d02d214e976ccb56dbc37505af6
Parents: c8ac3c2
Author: Andrew Grieve <agrieve@chromium.org>
Authored: Thu Oct 4 14:56:29 2012 -0400
Committer: Andrew Grieve <agrieve@chromium.org>
Committed: Thu Oct 4 14:57:50 2012 -0400

----------------------------------------------------------------------
 bin/uncrustify.cfg |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/5c41ef61/bin/uncrustify.cfg
----------------------------------------------------------------------
diff --git a/bin/uncrustify.cfg b/bin/uncrustify.cfg
index 31487e7..d52ce33 100644
--- a/bin/uncrustify.cfg
+++ b/bin/uncrustify.cfg
@@ -312,7 +312,7 @@ sp_inside_angle                          = remove   # ignore/add/remove/force
 sp_after_angle                           = remove   # ignore/add/remove/force
 
 # Add or remove space between '<>' and '(' as found in 'new List<byte>();'
-sp_angle_paren                           = force    # ignore/add/remove/force
+sp_angle_paren                           = remove   # ignore/add/remove/force
 
 # Add or remove space between '<>' and a word as in 'List<byte> m;'
 sp_angle_word                            = force    # ignore/add/remove/force
@@ -603,10 +603,10 @@ sp_before_oc_block_caret                 = ignore   # ignore/add/remove/force
 sp_after_oc_block_caret                  = ignore   # ignore/add/remove/force
 
 # Add or remove space around the ':' in 'b ? t : f'
-sp_cond_colon                            = ignore   # ignore/add/remove/force
+sp_cond_colon                            = add # ignore/add/remove/force
 
 # Add or remove space around the '?' in 'b ? t : f'
-sp_cond_question                         = ignore   # ignore/add/remove/force
+sp_cond_question                         = add # ignore/add/remove/force
 
 # Fix the spacing between 'case' and the label. Only 'ignore' and 'force' make sense here.
 sp_case_label                            = ignore   # ignore/add/remove/force