From: Martin Taibr Date: Sun, 8 Oct 2017 13:56:30 +0000 (+0200) Subject: allman, happy? X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ea8208ab45aca5a1056bce44b8e4ce51ce269efb;p=xonotic%2Fxonotic-data.pk3dir.git allman, happy? --- diff --git a/qcsrc/uncrustify.cfg b/qcsrc/uncrustify.cfg index 31154008a..c8db9f13a 100644 --- a/qcsrc/uncrustify.cfg +++ b/qcsrc/uncrustify.cfg @@ -1108,7 +1108,7 @@ nl_var_def_blk_in = 0 # number nl_fcall_brace = add # ignore/add/remove/force # Add or remove newline between 'enum' and '{' -nl_enum_brace = remove # ignore/add/remove/force +nl_enum_brace = add # ignore/add/remove/force # Add or remove newline between 'struct and '{' nl_struct_brace = add # ignore/add/remove/force @@ -1119,17 +1119,17 @@ nl_union_brace = ignore # ignore/add/remove/force # Add or remove newline between 'if' and '{' # NOTE: is 136 worse than ignore -nl_if_brace = remove # ignore/add/remove/force +nl_if_brace = add # ignore/add/remove/force # Add or remove newline between '}' and 'else' -nl_brace_else = remove # ignore/add/remove/force +nl_brace_else = add # ignore/add/remove/force # Add or remove newline between 'else if' and '{' # If set to ignore, nl_if_brace is used instead -nl_elseif_brace = remove # ignore/add/remove/force +nl_elseif_brace = add # ignore/add/remove/force # Add or remove newline between 'else' and '{' -nl_else_brace = remove # ignore/add/remove/force +nl_else_brace = add # ignore/add/remove/force # Add or remove newline between 'else' and 'if' nl_else_if = remove # ignore/add/remove/force @@ -1152,7 +1152,7 @@ nl_getset_brace = ignore # ignore/add/remove/force # Add or remove newline between 'for' and '{' # NOTE: is 109 worse than ignore -nl_for_brace = remove # ignore/add/remove/force +nl_for_brace = add # ignore/add/remove/force # Add or remove newline between 'catch' and '{' # WARNING: Code doesn't seem to use this feature - delete from the config? @@ -1164,7 +1164,7 @@ nl_brace_catch = ignore # ignore/add/remove/force # Add or remove newline between 'while' and '{' # NOTE: is 22 worse than ignore -nl_while_brace = remove # ignore/add/remove/force +nl_while_brace = add # ignore/add/remove/force # Add or remove newline between 'scope (x)' and '{' (D) # WARNING: Code doesn't seem to use this feature - delete from the config? @@ -1188,14 +1188,14 @@ nl_brace_brace = remove # ignore/add/remove/force # Add or remove newline between 'do' and '{' # NOTE: is 3 worse than ignore -nl_do_brace = remove # ignore/add/remove/force +nl_do_brace = add # ignore/add/remove/force # Add or remove newline between '}' and 'while' of 'do' statement -nl_brace_while = remove # ignore/add/remove/force #force +nl_brace_while = add # ignore/add/remove/force #force # Add or remove newline between 'switch' and '{' # NOTE: is 24 worse than ignore -nl_switch_brace = remove # ignore/add/remove/force +nl_switch_brace = add # ignore/add/remove/force # Add a newline between ')' and '{' if the ')' is on a different line than the if/for/etc. # Overrides nl_for_brace, nl_if_brace, nl_switch_brace, nl_while_switch, and nl_catch_brace.