X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=.clang-format;h=63f12b6c42adefca9fe9a5d7e5b34360ae79e018;hb=fe299e24d6ad5bb58e077ec372737b117ac6cf94;hp=05a6b3385725603a0508671f4405cb2a8687d6b2;hpb=be0663696514dd3d3525949be7c317c9eae9dbb0;p=dragonfireclient.git

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