aboutsummaryrefslogtreecommitdiff
path: root/contrib/conf/editors
diff options
context:
space:
mode:
authorSchanzenbach, Martin <mschanzenbach@posteo.de>2019-04-16 11:30:55 +0200
committerSchanzenbach, Martin <mschanzenbach@posteo.de>2019-04-16 11:30:55 +0200
commitc60e83d3939da9f4e368c13ba3d2ea950b6c28d1 (patch)
treebdb7fa6884c0aa529d01d6fc5d5e1ff75b0ad479 /contrib/conf/editors
parent6299e8e87fb514782b1cf8eebde23dc044a3de89 (diff)
downloadgnunet-c60e83d3939da9f4e368c13ba3d2ea950b6c28d1.tar.gz
gnunet-c60e83d3939da9f4e368c13ba3d2ea950b6c28d1.zip
update clang-format
Diffstat (limited to 'contrib/conf/editors')
-rw-r--r--contrib/conf/editors/clang-format10
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
8AlignEscapedNewlines: Left 8AlignEscapedNewlines: Left
9AlignOperands: true 9AlignOperands: true
10AlignTrailingComments: false 10AlignTrailingComments: false
11AllowAllArgumentsOnNextLine: false
11AllowAllParametersOfDeclarationOnNextLine: true 12AllowAllParametersOfDeclarationOnNextLine: true
12AllowShortBlocksOnASingleLine: false 13AllowShortBlocksOnASingleLine: false
13AllowShortCaseLabelsOnASingleLine: false 14AllowShortCaseLabelsOnASingleLine: false
@@ -49,12 +50,12 @@ ColumnLimit: 80
49CommentPragmas: '^ IWYU pragma:' 50CommentPragmas: '^ IWYU pragma:'
50CompactNamespaces: false 51CompactNamespaces: false
51ConstructorInitializerAllOnOneLineOrOnePerLine: false 52ConstructorInitializerAllOnOneLineOrOnePerLine: false
52ConstructorInitializerIndentWidth: 4 53ConstructorInitializerIndentWidth: 2
53ContinuationIndentWidth: 4 54ContinuationIndentWidth: 2
54Cpp11BracedListStyle: true 55Cpp11BracedListStyle: true
55DerivePointerAlignment: false 56DerivePointerAlignment: false
56DisableFormat: false 57DisableFormat: false
57ExperimentalAutoDetectBinPacking: false 58ExperimentalAutoDetectBinPacking: true
58FixNamespaceComments: true 59FixNamespaceComments: true
59ForEachMacros: 60ForEachMacros:
60 - foreach 61 - foreach
@@ -97,6 +98,7 @@ ReflowComments: true
97SortIncludes: false 98SortIncludes: false
98SortUsingDeclarations: true 99SortUsingDeclarations: true
99SpaceAfterCStyleCast: false 100SpaceAfterCStyleCast: false
101SpaceAfterLogicalNot: true
100SpaceAfterTemplateKeyword: true 102SpaceAfterTemplateKeyword: true
101SpaceBeforeAssignmentOperators: true 103SpaceBeforeAssignmentOperators: true
102SpaceBeforeCpp11BracedList: false 104SpaceBeforeCpp11BracedList: false
@@ -115,7 +117,7 @@ Standard: Cpp11
115StatementMacros: 117StatementMacros:
116 - Q_UNUSED 118 - Q_UNUSED
117 - QT_REQUIRE_VERSION 119 - QT_REQUIRE_VERSION
118TabWidth: 8 120TabWidth: 2
119UseTab: Never 121UseTab: Never
120... 122...
121 123