X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Funcrustify.cfg;h=b598727223ee7321209bbc9360e9d32cd833a565;hp=5af29fc9b29e9011016cd39e66b83a8b2b781de8;hb=af43b181a15f348a4de2045b716ebc7765ce8f9f;hpb=afd0bb647a10128dd5212d54564f9448e8b8f2f8 diff --git a/qcsrc/uncrustify.cfg b/qcsrc/uncrustify.cfg index 5af29fc9b2..b598727223 100644 --- a/qcsrc/uncrustify.cfg +++ b/qcsrc/uncrustify.cfg @@ -418,7 +418,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' -sp_before_sparen = add # ignore/add/remove/force #force +sp_before_sparen = force # ignore/add/remove/force #force # Add or remove space inside if-condition '(' and ')' # NOTE: is 68 worse than ignore @@ -431,10 +431,10 @@ sp_inside_sparen_close = ignore # ignore/add/remove/force #f sp_inside_sparen_open = ignore # ignore/add/remove/force #force # Add or remove space after ')' of 'if', 'for', 'switch', and 'while' -sp_after_sparen = add # ignore/add/remove/force +sp_after_sparen = force # ignore/add/remove/force # Add or remove space between ')' and '{' of 'if', 'for', 'switch', and 'while' -sp_sparen_brace = add # ignore/add/remove/force +sp_sparen_brace = force # ignore/add/remove/force # Add or remove space between 'invariant' and '(' in the D language. sp_invariant_paren = ignore # ignore/add/remove/force #ignore @@ -630,11 +630,11 @@ sp_macro = remove # ignore/add/remove/force #f sp_macro_func = remove # ignore/add/remove/force #force # Add or remove space between 'else' and '{' if on the same line -sp_else_brace = add # ignore/add/remove/force +sp_else_brace = force # ignore/add/remove/force # Add or remove space between '}' and 'else' if on the same line # WARNING: Code doesn't seem to use this feature - delete from the config? -sp_brace_else = ignore # ignore/add/remove/force +sp_brace_else = force # ignore/add/remove/force # Add or remove space between '}' and the name of a typedef on the same line sp_brace_typedef = add # ignore/add/remove/force @@ -1016,23 +1016,23 @@ align_oc_decl_colon = false # false/true #ignore # # Whether to collapse empty blocks between '{' and '}' -nl_collapse_empty_body = false # false/true +nl_collapse_empty_body = true # false/true # Don't split one-line braced assignments - 'foo_t f = { 1, 2 };' # WARNING: Code doesn't seem to use this feature - delete from the config? -nl_assign_leave_one_liners = false # false/true +nl_assign_leave_one_liners = true # false/true # Don't split one-line braced statements inside a class xx { } body # WARNING: Code doesn't seem to use this feature - delete from the config? -nl_class_leave_one_liners = false # false/true +nl_class_leave_one_liners = true # false/true # Don't split one-line enums: 'enum foo { BAR = 15 };' # WARNING: Code doesn't seem to use this feature - delete from the config? -nl_enum_leave_one_liners = false # false/true +nl_enum_leave_one_liners = true # false/true # Don't split one-line get or set functions # WARNING: Code doesn't seem to use this feature - delete from the config? -nl_getset_leave_one_liners = false # false/true +nl_getset_leave_one_liners = true # false/true # Don't split one-line function definitions - 'int foo() { return 0; }' nl_func_leave_one_liners = true # false/true @@ -1116,17 +1116,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 = add # ignore/add/remove/force +nl_if_brace = remove # ignore/add/remove/force # Add or remove newline between '}' and 'else' -nl_brace_else = add # 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 -nl_elseif_brace = add # ignore/add/remove/force +nl_elseif_brace = remove # ignore/add/remove/force # Add or remove newline between 'else' and '{' -nl_else_brace = add # ignore/add/remove/force +nl_else_brace = remove # ignore/add/remove/force # Add or remove newline between 'else' and 'if' nl_else_if = remove # ignore/add/remove/force @@ -1137,7 +1137,7 @@ nl_brace_finally = ignore # ignore/add/remove/force # Add or remove newline between 'finally' and '{' # WARNING: Code doesn't seem to use this feature - delete from the config? -nl_finally_brace = ignore # ignore/add/remove/force +nl_finally_brace = remove # ignore/add/remove/force # Add or remove newline between 'try' and '{' # WARNING: Code doesn't seem to use this feature - delete from the config? @@ -1149,7 +1149,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 = add # ignore/add/remove/force +nl_for_brace = remove # ignore/add/remove/force # Add or remove newline between 'catch' and '{' # WARNING: Code doesn't seem to use this feature - delete from the config? @@ -1161,7 +1161,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 = add # ignore/add/remove/force +nl_while_brace = remove # 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? @@ -1200,7 +1200,7 @@ nl_switch_brace = add # ignore/add/remove/force nl_multi_line_cond = false # false/true # Force a newline in a define after the macro name for multi-line defines. -nl_multi_line_define = false # false/true +nl_multi_line_define = true # false/true # Whether to put a newline before 'case' statement nl_before_case = false # false/true @@ -1307,7 +1307,7 @@ nl_fdef_brace = add # ignore/add/remove/force nl_return_expr = remove # ignore/add/remove/force # Whether to put a newline after semicolons, except in 'for' statements -nl_after_semicolon = false # false/true +nl_after_semicolon = true # false/true # Whether to put a newline after brace open. # This also adds a newline before the matching brace close. @@ -1340,7 +1340,7 @@ nl_after_vbrace_close = false # false/true nl_brace_struct_var = remove # ignore/add/remove/force # Whether to alter newlines in '#define' macros -nl_define_macro = false # false/true +nl_define_macro = true # false/true # Whether to not put blanks after '#ifxx', '#elxx', or before '#endif' nl_squeeze_ifdef = false # false/true @@ -1390,7 +1390,7 @@ nl_class_colon = ignore # ignore/add/remove/force # Change simple unbraced if statements into a one-liner # 'if(b)\n i++;' => 'if(b) i++;' -nl_create_if_one_liner = false # false/true +nl_create_if_one_liner = true # false/true # Change simple unbraced for statements into a one-liner # 'for (i=0;i<5;i++)\n foo(i);' => 'for (i=0;i<5;i++) foo(i);' @@ -1436,7 +1436,7 @@ pos_class_colon = ignore # ignore/join/lead/lead_brea # # Try to limit code width to N number of columns -code_width = 0 # number +code_width = 120 # number # Whether to fully split long 'for' statements at semi-colons # WARNING: Code doesn't seem to use this feature - delete from the config? @@ -1570,27 +1570,27 @@ nl_between_annotation = ignore # ignore/add/remove/force # # Add or remove braces on single-line 'do' statement -mod_full_brace_do = add # ignore/add/remove/force +mod_full_brace_do = force # ignore/add/remove/force # Add or remove braces on single-line 'for' statement # NOTE: is 3 worse than ignore -mod_full_brace_for = remove # ignore/add/remove/force +mod_full_brace_for = force # ignore/add/remove/force # Add or remove braces on single-line function definitions. (Pawn) mod_full_brace_function = ignore # ignore/add/remove/force #ignore # Add or remove braces on single-line 'if' statement. Will not remove the braces if they contain an 'else'. -mod_full_brace_if = add # ignore/add/remove/force +mod_full_brace_if = force # ignore/add/remove/force # Make all if/elseif/else statements in a chain be braced or not. Overrides mod_full_brace_if. # If any must be braced, they are all braced. If all can be unbraced, then the braces are removed. -mod_full_brace_if_chain = true # false/true #force +mod_full_brace_if_chain = false # false/true #force # Don't remove braces around statements that span N newlines mod_full_brace_nl = 2 # number #force # Add or remove braces on single-line 'while' statement -mod_full_brace_while = remove # ignore/add/remove/force +mod_full_brace_while = force # ignore/add/remove/force # Add or remove braces on single-line 'using ()' statement # WARNING: Code doesn't seem to use this feature - delete from the config? @@ -1608,7 +1608,7 @@ mod_pawn_semicolon = false # false/true mod_full_paren_if_bool = false # false/true # Whether to remove superfluous semicolons -mod_remove_extra_semicolon = false # false/true +mod_remove_extra_semicolon = true # false/true # If a function body exceeds the specified number of newlines and doesn't have a comment after # the close brace, a comment will be added. @@ -1636,7 +1636,7 @@ mod_sort_using = false # false/true # If TRUE, will sort consecutive single-line '#include' statements [C/C++] and '#import' statements [Obj-C] # This is generally a bad idea, as it may break your code. -mod_sort_include = true # false/true +mod_sort_include = false # false/true # If TRUE, it will move a 'break' that appears after a fully braced 'case' before the close brace. # WARNING: Code doesn't seem to use this feature - delete from the config? @@ -1748,14 +1748,14 @@ cmt_insert_before_preproc = false # false/true # Control indent of preprocessors inside #if blocks at brace level 0 # WARNING: Indifferent... please decide manually. -pp_indent = ignore # ignore/add/remove/force +pp_indent = force # ignore/add/remove/force # Whether to indent #if/#else/#endif at the brace level (true) or from column 1 (false) pp_indent_at_level = false # false/true # If pp_indent_at_level=false, specifies the number of columns to indent per level. Default=1. # WARNING: Code doesn't seem to use this feature - delete from the config? -pp_indent_count = 0 # number +pp_indent_count = 4 # number # Add or remove space after # based on pp_level of #if blocks # NOTE: is 28 worse than ignore @@ -1771,14 +1771,14 @@ pp_indent_region = 0 # number # Whether to indent the code between #region and #endregion # WARNING: Code doesn't seem to use this feature - delete from the config? -pp_region_indent_code = false # false/true +pp_region_indent_code = true # false/true # If pp_indent_at_level=true, sets the indent for #if, #else, and #endif when not at file-level # WARNING: Code doesn't seem to use this feature - delete from the config? -pp_indent_if = 0 # number +pp_indent_if = 4 # number # Control whether to indent the code between #if, #else and #endif when not at file-level -pp_if_indent_code = false # false/true +pp_if_indent_code = true # false/true # Whether to indent '#define' at the brace level (true) or from column 1 (false) pp_define_at_level = true # false/true @@ -1815,7 +1815,6 @@ type .string # QC OO macro-open CLASS -macro-else EXTENDS macro-close ENDCLASS # translations