Compare commits
	
		
			No commits in common. "6a4ad2779606f4ff426eb8975b31222353e424ad" and "aa8cdfc50ee91edf1a91639e78cde35bd9211b66" have entirely different histories.
		
	
	
		
			6a4ad27796
			...
			aa8cdfc50e
		
	
		
					 1 changed files with 29 additions and 28 deletions
				
			
		|  | @ -1,5 +1,6 @@ | ||||||
| --- | --- | ||||||
| Language:        Cpp | Language:        Cpp | ||||||
|  | # BasedOnStyle:  LLVM | ||||||
| AccessModifierOffset: -2 | AccessModifierOffset: -2 | ||||||
| AlignAfterOpenBracket: Align | AlignAfterOpenBracket: Align | ||||||
| AlignArrayOfStructures: None | AlignArrayOfStructures: None | ||||||
|  | @ -25,7 +26,7 @@ AlignConsecutiveDeclarations: | ||||||
|   AlignFunctionPointers: false |   AlignFunctionPointers: false | ||||||
|   PadOperators:    false |   PadOperators:    false | ||||||
| AlignConsecutiveMacros: | AlignConsecutiveMacros: | ||||||
|   Enabled:         true |   Enabled:         false | ||||||
|   AcrossEmptyLines: false |   AcrossEmptyLines: false | ||||||
|   AcrossComments:  false |   AcrossComments:  false | ||||||
|   AlignCompound:   false |   AlignCompound:   false | ||||||
|  | @ -52,8 +53,8 @@ AllowShortFunctionsOnASingleLine: All | ||||||
| AllowShortIfStatementsOnASingleLine: Never | AllowShortIfStatementsOnASingleLine: Never | ||||||
| AllowShortLambdasOnASingleLine: All | AllowShortLambdasOnASingleLine: All | ||||||
| AllowShortLoopsOnASingleLine: false | AllowShortLoopsOnASingleLine: false | ||||||
| AlwaysBreakAfterDefinitionReturnType: All | AlwaysBreakAfterDefinitionReturnType: None | ||||||
| AlwaysBreakAfterReturnType: AllDefinitions | AlwaysBreakAfterReturnType: None | ||||||
| AlwaysBreakBeforeMultilineStrings: false | AlwaysBreakBeforeMultilineStrings: false | ||||||
| AlwaysBreakTemplateDeclarations: MultiLine | AlwaysBreakTemplateDeclarations: MultiLine | ||||||
| AttributeMacros: | AttributeMacros: | ||||||
|  | @ -62,21 +63,21 @@ BinPackArguments: true | ||||||
| BinPackParameters: true | BinPackParameters: true | ||||||
| BitFieldColonSpacing: Both | BitFieldColonSpacing: Both | ||||||
| BraceWrapping: | BraceWrapping: | ||||||
|   AfterCaseLabel:  true |   AfterCaseLabel:  false | ||||||
|   AfterClass:      true |   AfterClass:      false | ||||||
|   AfterControlStatement: Always |   AfterControlStatement: Never | ||||||
|   AfterEnum:       true |   AfterEnum:       false | ||||||
|   AfterExternBlock: true |   AfterExternBlock: false | ||||||
|   AfterFunction:   true |   AfterFunction:   false | ||||||
|   AfterNamespace:  true |   AfterNamespace:  false | ||||||
|   AfterObjCDeclaration: true |   AfterObjCDeclaration: false | ||||||
|   AfterStruct:     true |   AfterStruct:     false | ||||||
|   AfterUnion:      true |   AfterUnion:      false | ||||||
|   BeforeCatch:     true |   BeforeCatch:     false | ||||||
|   BeforeElse:      true |   BeforeElse:      false | ||||||
|   BeforeLambdaBody: false |   BeforeLambdaBody: false | ||||||
|   BeforeWhile:     true |   BeforeWhile:     false | ||||||
|   IndentBraces:    true |   IndentBraces:    false | ||||||
|   SplitEmptyFunction: true |   SplitEmptyFunction: true | ||||||
|   SplitEmptyRecord: true |   SplitEmptyRecord: true | ||||||
|   SplitEmptyNamespace: true |   SplitEmptyNamespace: true | ||||||
|  | @ -84,26 +85,26 @@ BreakAdjacentStringLiterals: true | ||||||
| BreakAfterAttributes: Leave | BreakAfterAttributes: Leave | ||||||
| BreakAfterJavaFieldAnnotations: false | BreakAfterJavaFieldAnnotations: false | ||||||
| BreakArrays:     true | BreakArrays:     true | ||||||
| BreakBeforeBinaryOperators: All | BreakBeforeBinaryOperators: None | ||||||
| BreakBeforeConceptDeclarations: Always | BreakBeforeConceptDeclarations: Always | ||||||
| BreakBeforeBraces: GNU | BreakBeforeBraces: Attach | ||||||
| BreakBeforeInlineASMColon: OnlyMultiline | BreakBeforeInlineASMColon: OnlyMultiline | ||||||
| BreakBeforeTernaryOperators: true | BreakBeforeTernaryOperators: true | ||||||
| BreakConstructorInitializers: BeforeColon | BreakConstructorInitializers: BeforeColon | ||||||
| BreakInheritanceList: BeforeColon | BreakInheritanceList: BeforeColon | ||||||
| BreakStringLiterals: true | BreakStringLiterals: true | ||||||
| ColumnLimit:     120 | ColumnLimit:     80 | ||||||
| CommentPragmas:  '^ IWYU pragma:' | CommentPragmas:  '^ IWYU pragma:' | ||||||
| CompactNamespaces: false | CompactNamespaces: false | ||||||
| ConstructorInitializerIndentWidth: 4 | ConstructorInitializerIndentWidth: 4 | ||||||
| ContinuationIndentWidth: 4 | ContinuationIndentWidth: 4 | ||||||
| Cpp11BracedListStyle: false | Cpp11BracedListStyle: true | ||||||
| DerivePointerAlignment: false | DerivePointerAlignment: false | ||||||
| DisableFormat:   false | DisableFormat:   false | ||||||
| EmptyLineAfterAccessModifier: Never | EmptyLineAfterAccessModifier: Never | ||||||
| EmptyLineBeforeAccessModifier: LogicalBlock | EmptyLineBeforeAccessModifier: LogicalBlock | ||||||
| ExperimentalAutoDetectBinPacking: false | ExperimentalAutoDetectBinPacking: false | ||||||
| FixNamespaceComments: false | FixNamespaceComments: true | ||||||
| ForEachMacros: | ForEachMacros: | ||||||
|   - foreach |   - foreach | ||||||
|   - Q_FOREACH |   - Q_FOREACH | ||||||
|  | @ -185,7 +186,7 @@ RequiresExpressionIndentation: OuterScope | ||||||
| SeparateDefinitionBlocks: Leave | SeparateDefinitionBlocks: Leave | ||||||
| ShortNamespaceLines: 1 | ShortNamespaceLines: 1 | ||||||
| SkipMacroDefinitionBody: false | SkipMacroDefinitionBody: false | ||||||
| SortIncludes: false # Original: CaseInsensitive, breaks build | SortIncludes:    false | ||||||
| SortJavaStaticImport: Before | SortJavaStaticImport: Before | ||||||
| SortUsingDeclarations: LexicographicNumeric | SortUsingDeclarations: LexicographicNumeric | ||||||
| SpaceAfterCStyleCast: false | SpaceAfterCStyleCast: false | ||||||
|  | @ -198,13 +199,13 @@ SpaceBeforeCpp11BracedList: false | ||||||
| SpaceBeforeCtorInitializerColon: true | SpaceBeforeCtorInitializerColon: true | ||||||
| SpaceBeforeInheritanceColon: true | SpaceBeforeInheritanceColon: true | ||||||
| SpaceBeforeJsonColon: false | SpaceBeforeJsonColon: false | ||||||
| SpaceBeforeParens: Never | SpaceBeforeParens: ControlStatements | ||||||
| SpaceBeforeParensOptions: | SpaceBeforeParensOptions: | ||||||
|   AfterControlStatements: false |   AfterControlStatements: true | ||||||
|   AfterForeachMacros: false |   AfterForeachMacros: true | ||||||
|   AfterFunctionDefinitionName: false |   AfterFunctionDefinitionName: false | ||||||
|   AfterFunctionDeclarationName: false |   AfterFunctionDeclarationName: false | ||||||
|   AfterIfMacros:   false |   AfterIfMacros:   true | ||||||
|   AfterOverloadedOperator: false |   AfterOverloadedOperator: false | ||||||
|   AfterPlacementOperator: true |   AfterPlacementOperator: true | ||||||
|   AfterRequiresInClause: false |   AfterRequiresInClause: false | ||||||
|  | @ -226,7 +227,7 @@ SpacesInParensOptions: | ||||||
|   InEmptyParentheses: false |   InEmptyParentheses: false | ||||||
|   Other:           false |   Other:           false | ||||||
| SpacesInSquareBrackets: false | SpacesInSquareBrackets: false | ||||||
| Standard:        c++03 | Standard:        Latest | ||||||
| StatementAttributeLikeMacros: | StatementAttributeLikeMacros: | ||||||
|   - Q_EMIT |   - Q_EMIT | ||||||
| StatementMacros: | StatementMacros: | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue