diff options
author | Schanzenbach, Martin <mschanzenbach@posteo.de> | 2019-04-16 11:30:55 +0200 |
---|---|---|
committer | Schanzenbach, Martin <mschanzenbach@posteo.de> | 2019-04-16 11:30:55 +0200 |
commit | c60e83d3939da9f4e368c13ba3d2ea950b6c28d1 (patch) | |
tree | bdb7fa6884c0aa529d01d6fc5d5e1ff75b0ad479 /contrib/conf/editors | |
parent | 6299e8e87fb514782b1cf8eebde23dc044a3de89 (diff) | |
download | gnunet-c60e83d3939da9f4e368c13ba3d2ea950b6c28d1.tar.gz gnunet-c60e83d3939da9f4e368c13ba3d2ea950b6c28d1.zip |
update clang-format
Diffstat (limited to 'contrib/conf/editors')
-rw-r--r-- | contrib/conf/editors/clang-format | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/contrib/conf/editors/clang-format b/contrib/conf/editors/clang-format index f891f0146..ff9333612 100644 --- a/contrib/conf/editors/clang-format +++ b/contrib/conf/editors/clang-format | |||
@@ -8,6 +8,7 @@ AlignConsecutiveDeclarations: false | |||
8 | AlignEscapedNewlines: Left | 8 | AlignEscapedNewlines: Left |
9 | AlignOperands: true | 9 | AlignOperands: true |
10 | AlignTrailingComments: false | 10 | AlignTrailingComments: false |
11 | AllowAllArgumentsOnNextLine: false | ||
11 | AllowAllParametersOfDeclarationOnNextLine: true | 12 | AllowAllParametersOfDeclarationOnNextLine: true |
12 | AllowShortBlocksOnASingleLine: false | 13 | AllowShortBlocksOnASingleLine: false |
13 | AllowShortCaseLabelsOnASingleLine: false | 14 | AllowShortCaseLabelsOnASingleLine: false |
@@ -49,12 +50,12 @@ ColumnLimit: 80 | |||
49 | CommentPragmas: '^ IWYU pragma:' | 50 | CommentPragmas: '^ IWYU pragma:' |
50 | CompactNamespaces: false | 51 | CompactNamespaces: false |
51 | ConstructorInitializerAllOnOneLineOrOnePerLine: false | 52 | ConstructorInitializerAllOnOneLineOrOnePerLine: false |
52 | ConstructorInitializerIndentWidth: 4 | 53 | ConstructorInitializerIndentWidth: 2 |
53 | ContinuationIndentWidth: 4 | 54 | ContinuationIndentWidth: 2 |
54 | Cpp11BracedListStyle: true | 55 | Cpp11BracedListStyle: true |
55 | DerivePointerAlignment: false | 56 | DerivePointerAlignment: false |
56 | DisableFormat: false | 57 | DisableFormat: false |
57 | ExperimentalAutoDetectBinPacking: false | 58 | ExperimentalAutoDetectBinPacking: true |
58 | FixNamespaceComments: true | 59 | FixNamespaceComments: true |
59 | ForEachMacros: | 60 | ForEachMacros: |
60 | - foreach | 61 | - foreach |
@@ -97,6 +98,7 @@ ReflowComments: true | |||
97 | SortIncludes: false | 98 | SortIncludes: false |
98 | SortUsingDeclarations: true | 99 | SortUsingDeclarations: true |
99 | SpaceAfterCStyleCast: false | 100 | SpaceAfterCStyleCast: false |
101 | SpaceAfterLogicalNot: true | ||
100 | SpaceAfterTemplateKeyword: true | 102 | SpaceAfterTemplateKeyword: true |
101 | SpaceBeforeAssignmentOperators: true | 103 | SpaceBeforeAssignmentOperators: true |
102 | SpaceBeforeCpp11BracedList: false | 104 | SpaceBeforeCpp11BracedList: false |
@@ -115,7 +117,7 @@ Standard: Cpp11 | |||
115 | StatementMacros: | 117 | StatementMacros: |
116 | - Q_UNUSED | 118 | - Q_UNUSED |
117 | - QT_REQUIRE_VERSION | 119 | - QT_REQUIRE_VERSION |
118 | TabWidth: 8 | 120 | TabWidth: 2 |
119 | UseTab: Never | 121 | UseTab: Never |
120 | ... | 122 | ... |
121 | 123 | ||