Tweak formatting settings

author: Yuri Kunde Schlesner 2016-09-18 21:13:38 -0700
committer: Yuri Kunde Schlesner 2016-09-18 21:13:38 -0700
commit: 784b96d87f5b9ef4a238679d694b2d5a603725ca (patch)
tree: 781497bacfd21d5795b6480f9f6d8aa900447b60 /src/.clang-format
parent: Sources: Run clang-format on everything. (diff)
download: yuzu-784b96d87f5b9ef4a238679d694b2d5a603725ca.tar.gz
yuzu-784b96d87f5b9ef4a238679d694b2d5a603725ca.tar.xz
yuzu-784b96d87f5b9ef4a238679d694b2d5a603725ca.zip
1 files changed, 3 insertions, 4 deletions
diff --git a/src/.clang-format b/src/.clang-format
index 794df84ae..f9a5d1378 100644
--- a/src/.clang-format
+++ b/src/.clang-format
@@ -6,12 +6,12 @@ AlignAfterOpenBracket: Align
 AlignConsecutiveAssignments: false
 AlignConsecutiveDeclarations: false
 AlignEscapedNewlinesLeft: false
-AlignOperands:   true
+AlignOperands: true
 AlignTrailingComments: true
 AllowAllParametersOfDeclarationOnNextLine: true
 AllowShortBlocksOnASingleLine: false
 AllowShortCaseLabelsOnASingleLine: false
-AllowShortFunctionsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: Empty
 AllowShortIfStatementsOnASingleLine: false
 AllowShortLoopsOnASingleLine: false
 AlwaysBreakAfterDefinitionReturnType: None
@@ -44,7 +44,6 @@ ContinuationIndentWidth: 4
 Cpp11BracedListStyle: true
 DerivePointerAlignment: false
 DisableFormat:   false
-ExperimentalAutoDetectBinPacking: false
 ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
 IncludeCategories:
  - Regex:           '^\<[wW]indows.h\>'
@@ -69,7 +68,7 @@ PenaltyBreakComment: 300
 PenaltyBreakFirstLessLess: 120
 PenaltyBreakString: 1000
 PenaltyExcessCharacter: 1000000
-PenaltyReturnTypeOnItsOwnLine: 60
+PenaltyReturnTypeOnItsOwnLine: 150
 PointerAlignment: Left
 ReflowComments:  true
 SortIncludes:    true
author	Yuri Kunde Schlesner	2016-09-18 21:13:38 -0700
committer	Yuri Kunde Schlesner	2016-09-18 21:13:38 -0700
commit	784b96d87f5b9ef4a238679d694b2d5a603725ca (patch)
tree	781497bacfd21d5795b6480f9f6d8aa900447b60 /src/.clang-format
parent	Sources: Run clang-format on everything. (diff)
download	yuzu-784b96d87f5b9ef4a238679d694b2d5a603725ca.tar.gz yuzu-784b96d87f5b9ef4a238679d694b2d5a603725ca.tar.xz yuzu-784b96d87f5b9ef4a238679d694b2d5a603725ca.zip

diff --git a/src/.clang-format b/src/.clang-format index 794df84ae..f9a5d1378 100644 --- a/src/.clang-format +++ b/src/.clang-format
@@ -6,12 +6,12 @@ AlignAfterOpenBracket: Align
6	AlignConsecutiveAssignments: false	6	AlignConsecutiveAssignments: false
7	AlignConsecutiveDeclarations: false	7	AlignConsecutiveDeclarations: false
8	AlignEscapedNewlinesLeft: false	8	AlignEscapedNewlinesLeft: false
9	AlignOperands: true	9	AlignOperands: true
10	AlignTrailingComments: true	10	AlignTrailingComments: true
11	AllowAllParametersOfDeclarationOnNextLine: true	11	AllowAllParametersOfDeclarationOnNextLine: true
12	AllowShortBlocksOnASingleLine: false	12	AllowShortBlocksOnASingleLine: false
13	AllowShortCaseLabelsOnASingleLine: false	13	AllowShortCaseLabelsOnASingleLine: false
14	AllowShortFunctionsOnASingleLine: false	14	AllowShortFunctionsOnASingleLine: Empty
15	AllowShortIfStatementsOnASingleLine: false	15	AllowShortIfStatementsOnASingleLine: false
16	AllowShortLoopsOnASingleLine: false	16	AllowShortLoopsOnASingleLine: false
17	AlwaysBreakAfterDefinitionReturnType: None	17	AlwaysBreakAfterDefinitionReturnType: None
@@ -44,7 +44,6 @@ ContinuationIndentWidth: 4
44	Cpp11BracedListStyle: true	44	Cpp11BracedListStyle: true
45	DerivePointerAlignment: false	45	DerivePointerAlignment: false
46	DisableFormat: false	46	DisableFormat: false
47	ExperimentalAutoDetectBinPacking: false
48	ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH ]	47	ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH ]
49	IncludeCategories:	48	IncludeCategories:
50	- Regex: '^\<[wW]indows.h\>'	49	- Regex: '^\<[wW]indows.h\>'
@@ -69,7 +68,7 @@ PenaltyBreakComment: 300
69	PenaltyBreakFirstLessLess: 120	68	PenaltyBreakFirstLessLess: 120
70	PenaltyBreakString: 1000	69	PenaltyBreakString: 1000
71	PenaltyExcessCharacter: 1000000	70	PenaltyExcessCharacter: 1000000
72	PenaltyReturnTypeOnItsOwnLine: 60	71	PenaltyReturnTypeOnItsOwnLine: 150
73	PointerAlignment: Left	72	PointerAlignment: Left
74	ReflowComments: true	73	ReflowComments: true
75	SortIncludes: true	74	SortIncludes: true