X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=qcsrc%2Funcrustify.cfg;h=b09403f9545fa44e5d246bfab479be9815f535b2;hb=2aec7ddc8197ff4f7f730d5fb7c21e1d9f567a44;hp=5af29fc9b29e9011016cd39e66b83a8b2b781de8;hpb=afd0bb647a10128dd5212d54564f9448e8b8f2f8;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/uncrustify.cfg b/qcsrc/uncrustify.cfg index 5af29fc9b..b09403f95 100644 --- a/qcsrc/uncrustify.cfg +++ b/qcsrc/uncrustify.cfg @@ -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 @@ -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? @@ -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