More stuff.

diff --git a/qcsrc/uncrustify.cfg b/qcsrc/uncrustify.cfg
index 04bacb7ce9e1f10930a7de236ed8fbfdf2a7cba9..982e527f9e7b20a798bbf7a904487480d2bdec25 100644 (file)
--- 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_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
 
 # 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?
 
 # 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_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?
 
 # Indentation column for standalone 'const' function decl/proto qualifier
 # WARNING: Code doesn't seem to use this feature - delete from the config?


@@ -263,7 +265,7 @@ indent_oc_msg_colon                      = 0        # number #ignore
 sp_arith                                 = ignore   # ignore/add/remove/force #force
 
 # Add or remove space around assignment operator '=', '+=', etc
 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
 sp_assign                                = add      # ignore/add/remove/force
 
 # Add or remove space around '=' in C++11 lambda capture specifications. Overrides sp_assign


@@ -309,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
 sp_bool                                  = add      # ignore/add/remove/force
 
 # Add or remove space around compare operator '<', '>', '==', etc

-# NOTE: is 196 worse than ignore
+# NOTE: is 198 worse than ignore

 sp_compare                               = add      # ignore/add/remove/force
 
 # Add or remove space inside '(' and ')'
 sp_compare                               = add      # ignore/add/remove/force
 
 # Add or remove space inside '(' and ')'


@@ -317,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
 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
 sp_paren_paren                           = remove   # ignore/add/remove/force
 
 # Whether to balance spaces inside nested parens


@@ -475,7 +477,6 @@ sp_before_squares                        = ignore   # ignore/add/remove/force
 sp_inside_square                         = remove   # ignore/add/remove/force
 
 # Add or remove space after ','
 sp_inside_square                         = remove   # ignore/add/remove/force
 
 # Add or remove space after ','

-# NOTE: is 742 worse than ignore

 sp_after_comma                           = add      # ignore/add/remove/force #force
 
 # Add or remove space before ','
 sp_after_comma                           = add      # ignore/add/remove/force #force
 
 # Add or remove space before ','


@@ -1116,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 '{'
 nl_union_brace                           = ignore   # ignore/add/remove/force
 
 # Add or remove newline between 'if' and '{'

-# NOTE: is 245 worse than ignore
+# NOTE: is 231 worse than ignore

 nl_if_brace                              = add      # ignore/add/remove/force
 
 # Add or remove newline between '}' and 'else'
 nl_if_brace                              = add      # ignore/add/remove/force
 
 # Add or remove newline between '}' and 'else'


@@ -1418,16 +1419,13 @@ pos_assign                               = trail    # ignore/join/lead/lead_brea
 pos_bool                                 = lead     # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force #force
 
 # The position of comparison operators in wrapped expressions
 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                              = 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
 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                          = lead     # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force #force
 
 # The position of the comma in wrapped expressions
 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?
 
 # The position of the comma in the constructor initialization list
 # WARNING: Code doesn't seem to use this feature - delete from the config?


@@ -1652,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.
 
 # 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.
 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.