From e80a6f5e0540d9e10ee957240e6f5b3faaa54021 Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Mon, 9 Feb 2015 17:42:46 +0100 Subject: [PATCH] Change uncrustify configuration according to discussion with Pavel --- orte/uncrustify.cfg | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/orte/uncrustify.cfg b/orte/uncrustify.cfg index 497074f..1bc2ac5 100644 --- a/orte/uncrustify.cfg +++ b/orte/uncrustify.cfg @@ -810,7 +810,7 @@ nl_getset_leave_one_liners = false # false/true nl_func_leave_one_liners = false # false/true # Don't split one-line if/else statements - 'if(a) b++;' -nl_if_leave_one_liners = true # false/true +nl_if_leave_one_liners = false # false/true # Add or remove newlines at the start of the file nl_start_of_file = remove # ignore/add/remove/force @@ -854,7 +854,7 @@ nl_union_brace = remove # ignore/add/remove/force nl_if_brace = remove # ignore/add/remove/force # Add or remove newline between '}' and 'else' -nl_brace_else = ignore # ignore/add/remove/force +nl_brace_else = remove # ignore/add/remove/force # Add or remove newline between 'else if' and '{' # If set to ignore, nl_if_brace is used instead @@ -938,7 +938,7 @@ nl_class_brace = ignore # ignore/add/remove/force nl_class_init_args = ignore # ignore/add/remove/force # Add or remove newline between return type and function name in a function definition -nl_func_type_name = remove # ignore/add/remove/force +nl_func_type_name = add # ignore/add/remove/force # Add or remove newline between return type and function name inside a class {} # Uses nl_func_type_name or nl_func_proto_type_name if set to ignore. @@ -949,7 +949,7 @@ nl_func_type_name_class = ignore # ignore/add/remove/force nl_func_scope_name = ignore # ignore/add/remove/force # Add or remove newline between return type and function name in a prototype -nl_func_proto_type_name = remove # ignore/add/remove/force +nl_func_proto_type_name = add # ignore/add/remove/force # Add or remove newline between a function name and the opening '(' nl_func_paren = ignore # ignore/add/remove/force -- 2.39.2