X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Funcrustify.cfg;h=982e527f9e7b20a798bbf7a904487480d2bdec25;hp=fc8437627661681ce90b96fac5593563cbbcc6ba;hb=b2414004ded08176fe712ed4fe99c00ea5a8645a;hpb=84560566e3af478dc915fa245814227ce9d6a428;ds=inline diff --git a/qcsrc/uncrustify.cfg b/qcsrc/uncrustify.cfg index fc84376276..982e527f9e 100644 --- a/qcsrc/uncrustify.cfg +++ b/qcsrc/uncrustify.cfg @@ -140,10 +140,12 @@ indent_func_def_force_col1 = false # false/true indent_func_call_param = true # false/true # Same as indent_func_call_param, but for function defs -indent_func_def_param = true # false/true +# WARNING: Code doesn't seem to use this feature - delete from the config? +indent_func_def_param = false # false/true # Same as indent_func_call_param, but for function protos -indent_func_proto_param = true # false/true +# WARNING: Code doesn't seem to use this feature - delete from the config? +indent_func_proto_param = false # false/true # Same as indent_func_call_param, but for class declarations # WARNING: Code doesn't seem to use this feature - delete from the config? @@ -158,7 +160,7 @@ indent_func_ctor_var_param = false # false/true indent_template_param = false # false/true # Double the indent for indent_func_xxx_param options -indent_func_param_double = false # false/true +indent_func_param_double = true # false/true # Indentation column for standalone 'const' function decl/proto qualifier # WARNING: Code doesn't seem to use this feature - delete from the config? @@ -260,11 +262,10 @@ indent_oc_msg_colon = 0 # number #ignore # # Add or remove space around arithmetic operator '+', '-', '/', '*', etc -# NOTE: is 1002 worse than ignore sp_arith = ignore # ignore/add/remove/force #force # Add or remove space around assignment operator '=', '+=', etc -# NOTE: is 44 worse than ignore +# NOTE: is 54 worse than ignore sp_assign = add # ignore/add/remove/force # Add or remove space around '=' in C++11 lambda capture specifications. Overrides sp_assign @@ -310,7 +311,7 @@ sp_before_pp_stringify = add # ignore/add/remove/force sp_bool = add # ignore/add/remove/force # Add or remove space around compare operator '<', '>', '==', etc -# NOTE: is 184 worse than ignore +# NOTE: is 198 worse than ignore sp_compare = add # ignore/add/remove/force # Add or remove space inside '(' and ')' @@ -318,7 +319,7 @@ sp_compare = add # ignore/add/remove/force sp_inside_paren = remove # ignore/add/remove/force # Add or remove space between nested parens -# NOTE: is 14 worse than ignore +# NOTE: is 18 worse than ignore sp_paren_paren = remove # ignore/add/remove/force # Whether to balance spaces inside nested parens @@ -416,8 +417,7 @@ sp_angle_shift = ignore # ignore/add/remove/force sp_permit_cpp11_shift = false # false/true # Add or remove space before '(' of 'if', 'for', 'switch', and 'while' -# NOTE: is 4808 worse than ignore -sp_before_sparen = remove # ignore/add/remove/force +sp_before_sparen = remove # ignore/add/remove/force #force # Add or remove space inside if-condition '(' and ')' # NOTE: is 42 worse than ignore @@ -457,7 +457,7 @@ sp_before_semi_for = remove # ignore/add/remove/force sp_before_semi_for_empty = add # ignore/add/remove/force # Add or remove space after ';', except when followed by a comment. Default=Add -# NOTE: is 52 worse than ignore +# NOTE: is 56 worse than ignore sp_after_semi = add # ignore/add/remove/force # Add or remove space after ';' in non-empty 'for' statements. Default=Force @@ -477,8 +477,7 @@ sp_before_squares = ignore # ignore/add/remove/force sp_inside_square = remove # ignore/add/remove/force # Add or remove space after ',' -# NOTE: is 714 worse than ignore -sp_after_comma = add # ignore/add/remove/force +sp_after_comma = add # ignore/add/remove/force #force # Add or remove space before ',' # NOTE: is 58 worse than ignore @@ -559,7 +558,7 @@ sp_func_def_paren = remove # ignore/add/remove/force sp_inside_fparens = remove # ignore/add/remove/force # Add or remove space inside function '(' and ')' -# NOTE: is 76 worse than ignore +# NOTE: is 78 worse than ignore sp_inside_fparen = remove # ignore/add/remove/force # Add or remove space inside the first parens in the function type: 'void (*x)(...)' @@ -578,7 +577,7 @@ sp_square_fparen = ignore # ignore/add/remove/force sp_fparen_brace = add # ignore/add/remove/force # Add or remove space between function name and '(' on function calls -# NOTE: is 936 worse than ignore +# NOTE: is 940 worse than ignore sp_func_call_paren = remove # ignore/add/remove/force # Add or remove space between function name and '()' on function calls without parameters. @@ -797,8 +796,7 @@ sp_before_for_colon = ignore # ignore/add/remove/force sp_extern_paren = ignore # ignore/add/remove/force # Control the space after the opening of a C++ comment '// A' vs '//A' -# NOTE: is 1434 worse than ignore -sp_cmt_cpp_start = add # ignore/add/remove/force +sp_cmt_cpp_start = add # ignore/add/remove/force #force # Controls the spaces between #else or #endif and a trailing comment # WARNING: Code doesn't seem to use this feature - delete from the config? @@ -1119,7 +1117,7 @@ nl_struct_brace = add # ignore/add/remove/force nl_union_brace = ignore # ignore/add/remove/force # Add or remove newline between 'if' and '{' -# NOTE: is 253 worse than ignore +# NOTE: is 231 worse than ignore nl_if_brace = add # ignore/add/remove/force # Add or remove newline between '}' and 'else' @@ -1411,26 +1409,23 @@ nl_create_while_one_liner = false # false/true # # The position of arithmetic operators in wrapped expressions -pos_arith = join # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_arith = lead # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force #force # The position of assignment in wrapped expressions. # Do not affect '=' followed by '{' -pos_assign = join # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_assign = trail # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force #force # The position of boolean operators in wrapped expressions -pos_bool = join # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_bool = lead # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force #force # The position of comparison operators in wrapped expressions -# WARNING: Best is not unique (join lead) -pos_compare = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_compare = lead # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force #force # The position of conditional (b ? t : f) operators in wrapped expressions -# NOTE: is 4 worse than ignore -pos_conditional = trail # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_conditional = lead # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force #force # The position of the comma in wrapped expressions -# NOTE: is 2 worse than ignore -pos_comma = trail # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_comma = trail # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force #force # The position of the comma in the constructor initialization list # WARNING: Code doesn't seem to use this feature - delete from the config? @@ -1655,7 +1650,7 @@ mod_move_case_break = false # false/true # Will add or remove the braces around a fully braced case statement. # Will only remove the braces if there are no variable declarations in the block. -# NOTE: is 581 worse than ignore +# NOTE: is 507 worse than ignore mod_case_brace = remove # ignore/add/remove/force # If TRUE, it will remove a void 'return;' that appears as the last statement in a function.