diff options
Diffstat (limited to 'contrib/conf/editors/clang-format')
-rw-r--r-- | contrib/conf/editors/clang-format | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/contrib/conf/editors/clang-format b/contrib/conf/editors/clang-format index 97493b58a..f891f0146 100644 --- a/contrib/conf/editors/clang-format +++ b/contrib/conf/editors/clang-format | |||
@@ -5,9 +5,9 @@ AccessModifierOffset: -2 | |||
5 | AlignAfterOpenBracket: Align | 5 | AlignAfterOpenBracket: Align |
6 | AlignConsecutiveAssignments: false | 6 | AlignConsecutiveAssignments: false |
7 | AlignConsecutiveDeclarations: false | 7 | AlignConsecutiveDeclarations: false |
8 | AlignEscapedNewlines: Right | 8 | AlignEscapedNewlines: Left |
9 | AlignOperands: true | 9 | AlignOperands: true |
10 | AlignTrailingComments: true | 10 | AlignTrailingComments: false |
11 | AllowAllParametersOfDeclarationOnNextLine: true | 11 | AllowAllParametersOfDeclarationOnNextLine: true |
12 | AllowShortBlocksOnASingleLine: false | 12 | AllowShortBlocksOnASingleLine: false |
13 | AllowShortCaseLabelsOnASingleLine: false | 13 | AllowShortCaseLabelsOnASingleLine: false |
@@ -18,8 +18,8 @@ AlwaysBreakAfterDefinitionReturnType: None | |||
18 | AlwaysBreakAfterReturnType: TopLevel | 18 | AlwaysBreakAfterReturnType: TopLevel |
19 | AlwaysBreakBeforeMultilineStrings: false | 19 | AlwaysBreakBeforeMultilineStrings: false |
20 | AlwaysBreakTemplateDeclarations: MultiLine | 20 | AlwaysBreakTemplateDeclarations: MultiLine |
21 | BinPackArguments: true | 21 | BinPackArguments: false |
22 | BinPackParameters: true | 22 | BinPackParameters: false |
23 | BraceWrapping: | 23 | BraceWrapping: |
24 | AfterClass: false | 24 | AfterClass: false |
25 | AfterControlStatement: false | 25 | AfterControlStatement: false |
@@ -36,7 +36,7 @@ BraceWrapping: | |||
36 | SplitEmptyFunction: true | 36 | SplitEmptyFunction: true |
37 | SplitEmptyRecord: true | 37 | SplitEmptyRecord: true |
38 | SplitEmptyNamespace: true | 38 | SplitEmptyNamespace: true |
39 | BreakBeforeBinaryOperators: None | 39 | BreakBeforeBinaryOperators: All |
40 | BreakBeforeBraces: Custom | 40 | BreakBeforeBraces: Custom |
41 | BreakBeforeInheritanceComma: false | 41 | BreakBeforeInheritanceComma: false |
42 | BreakInheritanceList: BeforeColon | 42 | BreakInheritanceList: BeforeColon |
@@ -44,7 +44,7 @@ BreakBeforeTernaryOperators: true | |||
44 | BreakConstructorInitializersBeforeComma: false | 44 | BreakConstructorInitializersBeforeComma: false |
45 | BreakConstructorInitializers: BeforeColon | 45 | BreakConstructorInitializers: BeforeColon |
46 | BreakAfterJavaFieldAnnotations: false | 46 | BreakAfterJavaFieldAnnotations: false |
47 | BreakStringLiterals: true | 47 | BreakStringLiterals: false |
48 | ColumnLimit: 80 | 48 | ColumnLimit: 80 |
49 | CommentPragmas: '^ IWYU pragma:' | 49 | CommentPragmas: '^ IWYU pragma:' |
50 | CompactNamespaces: false | 50 | CompactNamespaces: false |
@@ -94,7 +94,7 @@ PenaltyExcessCharacter: 1000000 | |||
94 | PenaltyReturnTypeOnItsOwnLine: 60 | 94 | PenaltyReturnTypeOnItsOwnLine: 60 |
95 | PointerAlignment: Right | 95 | PointerAlignment: Right |
96 | ReflowComments: true | 96 | ReflowComments: true |
97 | SortIncludes: true | 97 | SortIncludes: false |
98 | SortUsingDeclarations: true | 98 | SortUsingDeclarations: true |
99 | SpaceAfterCStyleCast: false | 99 | SpaceAfterCStyleCast: false |
100 | SpaceAfterTemplateKeyword: true | 100 | SpaceAfterTemplateKeyword: true |
@@ -112,7 +112,7 @@ SpacesInCStyleCastParentheses: false | |||
112 | SpacesInParentheses: false | 112 | SpacesInParentheses: false |
113 | SpacesInSquareBrackets: false | 113 | SpacesInSquareBrackets: false |
114 | Standard: Cpp11 | 114 | Standard: Cpp11 |
115 | StatementMacros: | 115 | StatementMacros: |
116 | - Q_UNUSED | 116 | - Q_UNUSED |
117 | - QT_REQUIRE_VERSION | 117 | - QT_REQUIRE_VERSION |
118 | TabWidth: 8 | 118 | TabWidth: 8 |