@@ -17,7 +17,7 @@ AllowShortLoopsOnASingleLine: false # true
17
17
AlwaysBreakAfterDefinitionReturnType : None
18
18
AlwaysBreakAfterReturnType : None
19
19
AlwaysBreakBeforeMultilineStrings : true
20
- AlwaysBreakTemplateDeclarations : true
20
+ AlwaysBreakTemplateDeclarations : Yes
21
21
BinPackArguments : true
22
22
BinPackParameters : true
23
23
BraceWrapping :
@@ -39,6 +39,7 @@ BraceWrapping:
39
39
BreakBeforeBinaryOperators : None
40
40
BreakBeforeBraces : Attach
41
41
BreakBeforeInheritanceComma : true # false
42
+ BreakInheritanceList : BeforeComma # BeforeColon
42
43
BreakBeforeTernaryOperators : true
43
44
BreakConstructorInitializersBeforeComma : true # false
44
45
BreakConstructorInitializers : BeforeComma # BeforeColon
@@ -55,7 +56,9 @@ DerivePointerAlignment: true
55
56
DisableFormat : false
56
57
ExperimentalAutoDetectBinPacking : false
57
58
FixNamespaceComments : true
58
- ForEachMacros : [ Q_FOREACH_THIS_LIST_MUST_BE_NON_EMPTY ]
59
+ ForEachMacros :
60
+ - Q_FOREACH_THIS_LIST_MUST_BE_NON_EMPTY
61
+ IncludeBlocks : Preserve
59
62
IndentCaseLabels : true
60
63
IndentPPDirectives : None
61
64
IndentWidth : 2
@@ -67,14 +70,16 @@ MacroBlockBegin: ''
67
70
MacroBlockEnd : ' '
68
71
MaxEmptyLinesToKeep : 1
69
72
NamespaceIndentation : None
73
+ # ObjCBinPackProtocolList: Never
70
74
# ObjCBlockIndentWidth: 2
71
75
# ObjCSpaceAfterProperty: false
72
- # ObjCSpaceBeforeProtocolList: false
76
+ # ObjCSpaceBeforeProtocolList: true
73
77
PenaltyBreakAssignment : 2
74
78
PenaltyBreakBeforeFirstCallParameter : 1
75
79
PenaltyBreakComment : 300
76
80
PenaltyBreakFirstLessLess : 120
77
81
PenaltyBreakString : 1000
82
+ PenaltyBreakTemplateDeclaration : 10
78
83
PenaltyExcessCharacter : 1000000
79
84
PenaltyReturnTypeOnItsOwnLine : 200
80
85
PointerAlignment : Left
@@ -84,7 +89,11 @@ SortUsingDeclarations: false # true
84
89
SpaceAfterCStyleCast : false
85
90
SpaceAfterTemplateKeyword : true
86
91
SpaceBeforeAssignmentOperators : true
92
+ SpaceBeforeCpp11BracedList : false
93
+ SpaceBeforeCtorInitializerColon : true
94
+ SpaceBeforeInheritanceColon : true
87
95
SpaceBeforeParens : ControlStatements
96
+ SpaceBeforeRangeBasedForLoopColon : true
88
97
SpaceInEmptyParentheses : false
89
98
SpacesBeforeTrailingComments : 2
90
99
SpacesInAngles : false
0 commit comments