summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorSchanzenbach, Martin <mschanzenbach@posteo.de>2019-04-16 10:47:28 +0200
committerSchanzenbach, Martin <mschanzenbach@posteo.de>2019-04-16 10:47:28 +0200
commit6299e8e87fb514782b1cf8eebde23dc044a3de89 (patch)
tree07b44adfc6c278b54f21209be87416ec1d58b91b /contrib
parentc3ea963e7c675ffb507ed94930321aef97d86adf (diff)
update clang-format; try formatting
Diffstat (limited to 'contrib')
-rw-r--r--contrib/conf/editors/clang-format16
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
AlignAfterOpenBracket: Align
AlignConsecutiveAssignments: false
AlignConsecutiveDeclarations: false
-AlignEscapedNewlines: Right
+AlignEscapedNewlines: Left
AlignOperands: true
-AlignTrailingComments: true
+AlignTrailingComments: false
AllowAllParametersOfDeclarationOnNextLine: true
AllowShortBlocksOnASingleLine: false
AllowShortCaseLabelsOnASingleLine: false
@@ -18,8 +18,8 @@ AlwaysBreakAfterDefinitionReturnType: None
AlwaysBreakAfterReturnType: TopLevel
AlwaysBreakBeforeMultilineStrings: false
AlwaysBreakTemplateDeclarations: MultiLine
-BinPackArguments: true
-BinPackParameters: true
+BinPackArguments: false
+BinPackParameters: false
BraceWrapping:
AfterClass: false
AfterControlStatement: false
@@ -36,7 +36,7 @@ BraceWrapping:
SplitEmptyFunction: true
SplitEmptyRecord: true
SplitEmptyNamespace: true
-BreakBeforeBinaryOperators: None
+BreakBeforeBinaryOperators: All
BreakBeforeBraces: Custom
BreakBeforeInheritanceComma: false
BreakInheritanceList: BeforeColon
@@ -44,7 +44,7 @@ BreakBeforeTernaryOperators: true
BreakConstructorInitializersBeforeComma: false
BreakConstructorInitializers: BeforeColon
BreakAfterJavaFieldAnnotations: false
-BreakStringLiterals: true
+BreakStringLiterals: false
ColumnLimit: 80
CommentPragmas: '^ IWYU pragma:'
CompactNamespaces: false
@@ -94,7 +94,7 @@ PenaltyExcessCharacter: 1000000
PenaltyReturnTypeOnItsOwnLine: 60
PointerAlignment: Right
ReflowComments: true
-SortIncludes: true
+SortIncludes: false
SortUsingDeclarations: true
SpaceAfterCStyleCast: false
SpaceAfterTemplateKeyword: true
@@ -112,7 +112,7 @@ SpacesInCStyleCastParentheses: false
SpacesInParentheses: false
SpacesInSquareBrackets: false
Standard: Cpp11
-StatementMacros:
+StatementMacros:
- Q_UNUSED
- QT_REQUIRE_VERSION
TabWidth: 8