clang format: don't allow statement on single lines + disable resource.h too (generated file)

Following discussion in #1530
This commit is contained in:
Gregory Hainaut 2016-08-22 18:21:17 +02:00
parent 1fb2c66a21
commit de32691b4e
2 changed files with 4 additions and 3 deletions

View File

@ -8,10 +8,10 @@ AlignEscapedNewlinesLeft: false
AlignOperands: true AlignOperands: true
AlignTrailingComments: true AlignTrailingComments: true
AllowAllParametersOfDeclarationOnNextLine: true AllowAllParametersOfDeclarationOnNextLine: true
AllowShortBlocksOnASingleLine: true AllowShortBlocksOnASingleLine: false
AllowShortCaseLabelsOnASingleLine: true AllowShortCaseLabelsOnASingleLine: false
AllowShortFunctionsOnASingleLine: All AllowShortFunctionsOnASingleLine: All
AllowShortIfStatementsOnASingleLine: true AllowShortIfStatementsOnASingleLine: false
AllowShortLoopsOnASingleLine: false AllowShortLoopsOnASingleLine: false
AlwaysBreakAfterDefinitionReturnType: None AlwaysBreakAfterDefinitionReturnType: None
AlwaysBreakAfterReturnType: None AlwaysBreakAfterReturnType: None

View File

@ -44,6 +44,7 @@ files=`git diff $diff_range --name-only --diff-filter=ACMRT | \
grep -v "${1}plugins/zerospu2/" | \ grep -v "${1}plugins/zerospu2/" | \
grep -v "${1}plugins/zzogl-pg/" | \ grep -v "${1}plugins/zzogl-pg/" | \
\ \
grep -v "/resource.h" | \
grep -v "3rdpary/" | \ grep -v "3rdpary/" | \
grep -v "bin/" | \ grep -v "bin/" | \
grep -v "cmake/" | \ grep -v "cmake/" | \