diff --git a/.clang-format b/.clang-format index 376910818..f5d9aa749 100644 --- a/.clang-format +++ b/.clang-format @@ -66,7 +66,7 @@ IndentWrappedFunctionNames: false KeepEmptyLinesAtTheStartOfBlocks: true MaxEmptyLinesToKeep: 1 NamespaceIndentation: None -ObjCBinPackProtocolList: Auto # requires clang-format 7 +#ObjCBinPackProtocolList: Auto # requires clang-format 7 ObjCBlockIndentWidth: 8 ObjCSpaceAfterProperty: true ObjCSpaceBeforeProtocolList: true @@ -87,10 +87,10 @@ SpaceAfterCStyleCast: false #SpaceAfterLogicalNot: false # requires clang-format 9 SpaceAfterTemplateKeyword: false SpaceBeforeAssignmentOperators: true -SpaceBeforeCtorInitializerColon: true # requires clang-format 7 -SpaceBeforeInheritanceColon: true # requires clang-format 7 +#SpaceBeforeCtorInitializerColon: true # requires clang-format 7 +#SpaceBeforeInheritanceColon: true # requires clang-format 7 SpaceBeforeParens: ControlStatements -SpaceBeforeRangeBasedForLoopColon: true # requires clang-format 7 +#SpaceBeforeRangeBasedForLoopColon: true # requires clang-format 7 SpaceInEmptyParentheses: false SpacesBeforeTrailingComments: 1 SpacesInAngles: false @@ -98,8 +98,8 @@ SpacesInCStyleCastParentheses: false SpacesInContainerLiterals: false SpacesInParentheses: false SpacesInSquareBrackets: false -StatementMacros: # requires clang-format 8 - - 'Q_OBJECT' +#StatementMacros: # requires clang-format 8 +# - 'Q_OBJECT' TabWidth: 8 #TypenameMacros: # requires clang-format 9 # - 'DARRAY'