Merge pull request #59 from PrairieAstronomer/readme_irrlicht_change

[dragonfireclient.git] / .clang-format

diff --git a/.clang-format b/.clang-format
index d2e2f2940f1a1bdce76b4eafd7c05b3f1e65b065..63f12b6c42adefca9fe9a5d7e5b34360ae79e018 100644 (file)
--- a/.clang-format
+++ b/.clang-format
@@ -1,8 +1,9 @@
 BasedOnStyle: LLVM
-IndentWidth: 8
+IndentWidth: 4
 UseTab: Always
+TabWidth: 4
 BreakBeforeBraces: Custom
-Standard: Cpp03
+Standard: Cpp11
 BraceWrapping:
   AfterClass: true
   AfterControlStatement: false
@@ -13,11 +14,12 @@ BraceWrapping:
   AfterUnion: true
   BeforeCatch: false
   BeforeElse: false
+FixNamespaceComments: false
 AllowShortIfStatementsOnASingleLine: false
 IndentCaseLabels: false
-AccessModifierOffset: -8
+AccessModifierOffset: -4
 ColumnLimit: 90
-AllowShortFunctionsOnASingleLine: Inline
+AllowShortFunctionsOnASingleLine: InlineOnly
 SortIncludes: false
 IncludeCategories:
   - Regex:           '^".*'
@@ -25,4 +27,7 @@ IncludeCategories:
   - Regex:           '^<.*'
     Priority:        1
 AlignAfterOpenBracket: DontAlign
-ContinuationIndentWidth: 16
+ContinuationIndentWidth: 8
+ConstructorInitializerIndentWidth: 8
+BreakConstructorInitializers: AfterColon
+AlwaysBreakTemplateDeclarations: Yes