summaryrefslogtreecommitdiff
path: root/.clang-format
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2014-04-10 14:29:24 -0400
committerKonstantin Käfer <mail@kkaefer.com>2014-04-10 14:29:24 -0400
commitca5de70b2b9b88b80e3c034bcfcc56c13632bf18 (patch)
treee8f2e9d0276427fe604a855869c9565e49896dd4 /.clang-format
parent06bcab956018e0759d036de0f55145926a124382 (diff)
downloadqtlocation-mapboxgl-ca5de70b2b9b88b80e3c034bcfcc56c13632bf18.tar.gz
update clang-format
Diffstat (limited to '.clang-format')
-rw-r--r--.clang-format5
1 files changed, 1 insertions, 4 deletions
diff --git a/.clang-format b/.clang-format
index 3557822cbd..0565d7379e 100644
--- a/.clang-format
+++ b/.clang-format
@@ -3,7 +3,6 @@ IndentWidth: 4
AccessModifierOffset: -4
UseTab: Never
BinPackParameters: true
-AllowShortFunctionsOnASingleLine: false
AllowShortIfStatementsOnASingleLine: false
AllowShortLoopsOnASingleLine: false
ConstructorInitializerAllOnOneLineOrOnePerLine: true
@@ -12,8 +11,6 @@ NamespaceIndentation: None
PointerBindsToType: false
SpacesInParentheses: false
BreakBeforeBraces: Attach
-ColumnLimit: 80
+ColumnLimit: 100
Cpp11BracedListStyle: true
-SpaceBeforeParens: ControlStatements
SpacesBeforeTrailingComments: 1
-SpacesInContainerLiterals: true