From 596fa6b51ed2ab6be80041684ad805f7b22256ac Mon Sep 17 00:00:00 2001 From: LemonBoy Date: Sat, 11 Nov 2017 09:14:41 +0100 Subject: [PATCH] Take into account Nei's suggestions --- .clang-format | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.clang-format b/.clang-format index 5501478f..295356df 100644 --- a/.clang-format +++ b/.clang-format @@ -1,4 +1,4 @@ -# IndentPPDirectives: None +# IndentPPDirectives: AfterHash # SpaceInParentheses: false AlignAfterOpenBracket: Align AlignConsecutiveAssignments: false @@ -12,22 +12,23 @@ AllowShortFunctionsOnASingleLine: Empty AllowShortIfStatementsOnASingleLine: false AllowShortLoopsOnASingleLine: false AlwaysBreakAfterReturnType: None -AlwaysBreakBeforeMultilineStrings: true +AlwaysBreakBeforeMultilineStrings: false BinPackArguments: true BinPackParameters: true BreakBeforeBinaryOperators: None -BreakBeforeBraces: Attach -BreakBeforeTernaryOperators: true +BreakBeforeBraces: Linux +BreakBeforeTernaryOperators: false ColumnLimit: 100 IndentCaseLabels: true IndentWidth: 8 IndentWrappedFunctionNames: true KeepEmptyLinesAtTheStartOfBlocks: false Language: Cpp +Cpp11BracedListStyle: false MaxEmptyLinesToKeep: 1 PointerAlignment: Right SortIncludes: true -SpaceAfterCStyleCast: false +SpaceAfterCStyleCast: true SpaceBeforeAssignmentOperators: true SpaceBeforeParens: ControlStatements SpaceInEmptyParentheses: false