projects
/
xonotic
/
xonotic-data.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8456056
)
Updated.
author
Rudolf Polzer <divverent@xonotic.org>
Thu, 7 Nov 2013 07:40:46 +0000
(08:40 +0100)
committer
Rudolf Polzer <divverent@xonotic.org>
Thu, 7 Nov 2013 07:40:46 +0000
(08:40 +0100)
qcsrc/uncrustify.cfg
patch
|
blob
|
history
diff --git
a/qcsrc/uncrustify.cfg
b/qcsrc/uncrustify.cfg
index
fc84376
..
728462d
100644
(file)
--- a/
qcsrc/uncrustify.cfg
+++ b/
qcsrc/uncrustify.cfg
@@
-260,7
+260,6
@@
indent_oc_msg_colon = 0 # number #ignore
#
# Add or remove space around arithmetic operator '+', '-', '/', '*', etc
#
# 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
sp_arith = ignore # ignore/add/remove/force #force
# Add or remove space around assignment operator '=', '+=', etc
@@
-310,7
+309,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 1
84
worse than ignore
+# NOTE: is 1
96
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 ')'
@@
-416,7
+415,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_permit_cpp11_shift = false # false/true
# Add or remove space before '(' of 'if', 'for', 'switch', and 'while'
-# NOTE: is 48
08
worse than ignore
+# NOTE: is 48
44
worse than ignore
sp_before_sparen = remove # ignore/add/remove/force
# Add or remove space inside if-condition '(' and ')'
sp_before_sparen = remove # ignore/add/remove/force
# Add or remove space inside if-condition '(' and ')'
@@
-457,7
+456,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
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 5
2
worse than ignore
+# NOTE: is 5
6
worse than ignore
sp_after_semi = add # ignore/add/remove/force
# Add or remove space after ';' in non-empty 'for' statements. Default=Force
sp_after_semi = add # ignore/add/remove/force
# Add or remove space after ';' in non-empty 'for' statements. Default=Force
@@
-477,7
+476,7
@@
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 7
14
worse than ignore
+# NOTE: is 7
42
worse than ignore
sp_after_comma = add # ignore/add/remove/force
# Add or remove space before ','
sp_after_comma = add # ignore/add/remove/force
# Add or remove space before ','
@@
-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 ')'
sp_inside_fparens = remove # ignore/add/remove/force
# Add or remove space inside function '(' and ')'
-# NOTE: is 7
6
worse than ignore
+# NOTE: is 7
8
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)(...)'
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
sp_fparen_brace = add # ignore/add/remove/force
# Add or remove space between function name and '(' on function calls
-# NOTE: is 9
36
worse than ignore
+# NOTE: is 9
40
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.
sp_func_call_paren = remove # ignore/add/remove/force
# Add or remove space between function name and '()' on function calls without parameters.
@@
-797,7
+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'
sp_extern_paren = ignore # ignore/add/remove/force
# Control the space after the opening of a C++ comment '// A' vs '//A'
-# NOTE: is 143
4
worse than ignore
+# NOTE: is 143
6
worse than ignore
sp_cmt_cpp_start = add # ignore/add/remove/force
# Controls the spaces between #else or #endif and a trailing comment
sp_cmt_cpp_start = add # ignore/add/remove/force
# Controls the spaces between #else or #endif and a trailing comment
@@
-1119,7
+1118,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 2
53
worse than ignore
+# NOTE: is 2
45
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'