Set some new Uncrustify options.

eskroch · eskroch · commit 4d9b1cc65b56 · 2013-06-28T21:26:22.000-04:00
diff --git a/scripts/uncrustify.cfg b/scripts/uncrustify.cfg
@@ -79,15 +79,15 @@ sp_bool                                   = force
 sp_compare                                = force
 sp_inside_paren                           = remove
 sp_paren_paren                            = remove
-sp_cparen_oparen                          = ignore
+sp_cparen_oparen                          = remove
 sp_balance_nested_parens                  = true
 sp_paren_brace                            = force
 sp_before_ptr_star                        = force
 sp_before_unnamed_ptr_star                = force
 sp_between_ptr_star                       = remove
 sp_after_ptr_star                         = remove
 sp_after_ptr_star_func                    = remove
-sp_ptr_star_paren                         = ignore
+sp_ptr_star_paren                         = remove
 sp_before_ptr_star_func                   = force
 sp_before_byref                           = force
 sp_before_unnamed_byref                   = force
@@ -145,8 +145,8 @@ sp_func_proto_paren                       = remove
 sp_func_def_paren                         = remove
 sp_inside_fparens                         = remove
 sp_inside_fparen                          = remove
-sp_inside_tparen                          = ignore
-sp_after_tparen_close                     = ignore
+sp_inside_tparen                          = remove
+sp_after_tparen_close                     = remove
 sp_square_fparen                          = remove
 sp_fparen_brace                           = force
 sp_func_call_paren                        = remove
@@ -157,7 +157,7 @@ sp_return_paren                           = force
 sp_attribute_paren                        = remove
 sp_defined_paren                          = remove
 sp_throw_paren                            = force
-sp_after_throw                            = ignore
+sp_after_throw                            = force
 sp_catch_paren                            = force
 sp_version_paren                          = ignore
 sp_scope_paren                            = ignore
@@ -176,7 +176,7 @@ sp_word_brace                             = add
 sp_word_brace_ns                          = add
 sp_before_dc                              = remove
 sp_after_dc                               = remove
-sp_d_array_colon                          = ignore
+sp_d_array_colon                          = remove
 sp_not                                    = remove
 sp_inv                                    = remove
 sp_addr                                   = remove
@@ -188,8 +188,8 @@ sp_before_nl_cont                         = force
 sp_after_oc_scope                         = remove
 sp_after_oc_colon                         = remove
 sp_before_oc_colon                        = remove
-sp_after_oc_dict_colon                    = ignore
-sp_before_oc_dict_colon                   = ignore
+sp_after_oc_dict_colon                    = remove
+sp_before_oc_dict_colon                   = force
 sp_after_send_oc_colon                    = remove
 sp_before_send_oc_colon                   = remove
 sp_after_oc_type                          = remove
@@ -199,19 +199,19 @@ sp_after_oc_at_sel_parens                 = force
 sp_inside_oc_at_sel_parens                = remove
 sp_before_oc_block_caret                  = force
 sp_after_oc_block_caret                   = remove
-sp_after_oc_msg_receiver                  = ignore
-sp_after_oc_property                      = ignore
+sp_after_oc_msg_receiver                  = force
+sp_after_oc_property                      = force
 sp_cond_colon                             = force
 sp_cond_question                          = force
 sp_case_label                             = force
 sp_range                                  = ignore
 sp_after_for_colon                        = ignore
 sp_before_for_colon                       = ignore
-sp_extern_paren                           = ignore
+sp_extern_paren                           = remove
 sp_cmt_cpp_start                          = ignore
 sp_endif_cmt                              = force
-sp_after_new                              = ignore
-sp_before_tr_emb_cmt                      = ignore
+sp_after_new                              = force
+sp_before_tr_emb_cmt                      = force
 sp_num_before_tr_emb_cmt                  = 1
 sp_annotation_paren                       = ignore
 align_keep_tabs                           = false
@@ -306,7 +306,7 @@ nl_scope_brace                            = ignore
 nl_unittest_brace                         = ignore
 nl_version_brace                          = ignore
 nl_using_brace                            = ignore
-nl_brace_brace                            = ignore
+nl_brace_brace                            = force
 nl_do_brace                               = remove
 nl_brace_while                            = force
 nl_switch_brace                           = remove
@@ -315,7 +315,7 @@ nl_multi_line_define                      = false
 nl_before_case                            = true
 nl_before_throw                           = force
 nl_after_case                             = true
-nl_case_colon_brace                       = ignore
+nl_case_colon_brace                       = force
 nl_namespace_brace                        = force
 nl_template_class                         = force
 nl_class_brace                            = force
@@ -349,7 +349,7 @@ nl_after_vbrace_open                      = true
 nl_after_vbrace_open_empty                = false
 nl_after_brace_close                      = true
 nl_after_vbrace_close                     = false
-nl_brace_struct_var                       = ignore
+nl_brace_struct_var                       = force
 nl_define_macro                           = false
 nl_squeeze_ifdef                          = true
 nl_before_if                              = ignore
