summaryrefslogtreecommitdiff
path: root/contrib
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
parent6299e8e87fb514782b1cf8eebde23dc044a3de89 (diff)
update clang-format
Diffstat (limited to 'contrib')
-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
AlignEscapedNewlines: Left
AlignOperands: true
AlignTrailingComments: false
+AllowAllArgumentsOnNextLine: false
AllowAllParametersOfDeclarationOnNextLine: true
AllowShortBlocksOnASingleLine: false
AllowShortCaseLabelsOnASingleLine: false
@@ -49,12 +50,12 @@ ColumnLimit: 80
CommentPragmas: '^ IWYU pragma:'
CompactNamespaces: false
ConstructorInitializerAllOnOneLineOrOnePerLine: false
-ConstructorInitializerIndentWidth: 4
-ContinuationIndentWidth: 4
+ConstructorInitializerIndentWidth: 2
+ContinuationIndentWidth: 2
Cpp11BracedListStyle: true
DerivePointerAlignment: false
DisableFormat: false
-ExperimentalAutoDetectBinPacking: false
+ExperimentalAutoDetectBinPacking: true
FixNamespaceComments: true
ForEachMacros:
- foreach
@@ -97,6 +98,7 @@ ReflowComments: true
SortIncludes: false
SortUsingDeclarations: true
SpaceAfterCStyleCast: false
+SpaceAfterLogicalNot: true
SpaceAfterTemplateKeyword: true
SpaceBeforeAssignmentOperators: true
SpaceBeforeCpp11BracedList: false
@@ -115,7 +117,7 @@ Standard: Cpp11
StatementMacros:
- Q_UNUSED
- QT_REQUIRE_VERSION
-TabWidth: 8
+TabWidth: 2
UseTab: Never
...