From 544d399f089bbf444a33a74de9be72da0e90c3d5 Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Thu, 24 May 2018 17:35:54 +0200 Subject: [PATCH] Update configuration for clang-format Don't derive the pointer alignment. Always use left alignment. Remove also spaces at line endings. Signed-off-by: Stefan Weil --- .clang-format | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.clang-format b/.clang-format index a4da61d04d..dbdad53852 100644 --- a/.clang-format +++ b/.clang-format @@ -20,7 +20,7 @@ AlwaysBreakBeforeMultilineStrings: true AlwaysBreakTemplateDeclarations: true BinPackArguments: true BinPackParameters: true -BraceWrapping: +BraceWrapping: AfterClass: false AfterControlStatement: false AfterEnum: false @@ -51,16 +51,16 @@ ConstructorInitializerAllOnOneLineOrOnePerLine: true ConstructorInitializerIndentWidth: 4 ContinuationIndentWidth: 4 Cpp11BracedListStyle: true -DerivePointerAlignment: true +DerivePointerAlignment: false DisableFormat: false ExperimentalAutoDetectBinPacking: false FixNamespaceComments: true -ForEachMacros: +ForEachMacros: - foreach - Q_FOREACH - BOOST_FOREACH IncludeBlocks: Preserve -IncludeCategories: +IncludeCategories: - Regex: '^' Priority: 2 - Regex: '^<.*\.h>' @@ -93,9 +93,9 @@ PenaltyBreakString: 1000 PenaltyExcessCharacter: 1000000 PenaltyReturnTypeOnItsOwnLine: 200 PointerAlignment: Left -RawStringFormats: +RawStringFormats: - Language: Cpp - Delimiters: + Delimiters: - cc - CC - cpp @@ -106,7 +106,7 @@ RawStringFormats: CanonicalDelimiter: '' BasedOnStyle: google - Language: TextProto - Delimiters: + Delimiters: - pb - PB - proto