Skip to content

Commit 7891774

Browse files
committed
Merge branch 'master' into feature/bbAssignAllToFX
2 parents 8aa1537 + 5ccc8d9 commit 7891774

File tree

2,265 files changed

+514516
-195678
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,265 files changed

+514516
-195678
lines changed

.appveyor.yml

Lines changed: 0 additions & 31 deletions
This file was deleted.

.circleci/config.yml

Lines changed: 0 additions & 225 deletions
This file was deleted.

.clang-format

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
---
2+
# Language
3+
Language: Cpp
4+
Standard: Cpp11 # Cpp14 and Cpp17 are not supported by clang 11
5+
6+
# Indentation
7+
TabWidth: 4
8+
UseTab: Always
9+
IndentWidth: 4
10+
ColumnLimit: 120
11+
12+
# Indentation detail
13+
AlignAfterOpenBracket: DontAlign
14+
ContinuationIndentWidth: 4
15+
BreakConstructorInitializers: BeforeComma
16+
ConstructorInitializerIndentWidth: 4
17+
ConstructorInitializerAllOnOneLineOrOnePerLine: false
18+
BinPackParameters: true
19+
BinPackArguments: true
20+
AlignOperands: false
21+
22+
# Alignment
23+
AlignEscapedNewlines: DontAlign
24+
AccessModifierOffset: -4
25+
AllowShortBlocksOnASingleLine: Always
26+
AllowShortIfStatementsOnASingleLine: Always
27+
AllowShortCaseLabelsOnASingleLine: false
28+
AllowShortFunctionsOnASingleLine: InlineOnly
29+
BreakBeforeBinaryOperators: All
30+
31+
# Includes
32+
IncludeBlocks: Regroup
33+
IncludeCategories:
34+
# windows.h must go before everything else
35+
# otherwise, you will get errors
36+
- Regex: '^<windows.h>$'
37+
Priority: -99
38+
# the "main header" implicitly gets priority 0
39+
# system headers
40+
- Regex: '^<[^>]+>$'
41+
Priority: 1
42+
# non-system headers
43+
- Regex: '.*'
44+
Priority: 2
45+
SortIncludes: true
46+
47+
# Spaces
48+
SpaceBeforeAssignmentOperators: true
49+
SpaceBeforeParens: ControlStatements
50+
SpacesInAngles: false
51+
SpacesInCStyleCastParentheses: false
52+
SpacesInParentheses: false
53+
54+
# Brace wrapping
55+
# Not directly mentioned in the coding conventions,
56+
# but required to avoid tons of auto reformatting
57+
BreakBeforeBraces: Custom
58+
BraceWrapping:
59+
AfterClass: true
60+
AfterControlStatement: Always
61+
AfterEnum: true
62+
AfterFunction: true
63+
AfterNamespace: false
64+
AfterStruct: true
65+
AfterUnion: true
66+
AfterExternBlock: false
67+
BeforeCatch: true
68+
BeforeElse: true
69+
IndentBraces: false
70+
SplitEmptyFunction: true
71+
SplitEmptyRecord: true
72+
SplitEmptyNamespace: true
73+
BeforeWhile: false
74+
BeforeLambdaBody: false
75+
76+
# Do not break doxygen comments
77+
CommentPragmas: '^[[:space:]]*\\.+'
78+
79+
# Pointers
80+
# Use pointer close to type: `const char* const* function()`
81+
PointerAlignment: Left
82+
83+
...
84+

.clang-tidy

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
---
2+
Checks: >
3+
bugprone-macro-parentheses,
4+
bugprone-macro-repeated-side-effects,
5+
modernize-avoid-c-arrays,
6+
modernize-loop-convert,
7+
modernize-redundant-void-arg,
8+
modernize-use-auto,
9+
modernize-use-bool-literals,
10+
modernize-use-emplace,
11+
modernize-use-equals-default,
12+
modernize-use-equals-delete,
13+
modernize-use-override,
14+
modernize-use-using,
15+
performance-trivially-destructible,
16+
readability-braces-around-statements,
17+
readability-const-return-type,
18+
readability-identifier-naming,
19+
readability-misleading-indentation,
20+
readability-simplify-boolean-expr
21+
WarningsAsErrors: ''
22+
HeaderFilterRegex: '' # don't show errors from headers
23+
AnalyzeTemporaryDtors: false
24+
FormatStyle: none
25+
User: user
26+
CheckOptions:
27+
- key: readability-identifier-naming.ClassCase
28+
value: CamelCase
29+
- key: readability-identifier-naming.EnumCase
30+
value: CamelCase
31+
- key: readability-identifier-naming.TypedefCase
32+
value: CamelCase
33+
- key: readability-identifier-naming.UnionCase
34+
value: CamelCase
35+
- key: readability-identifier-naming.StructCase
36+
value: CamelCase
37+
- key: readability-identifier-naming.UnionCase
38+
value: CamelCase
39+
# not yet working, as it currently applies both for static and object members
40+
# - key: readability-identifier-naming.MemberPrefix
41+
# value: 'm_'
42+
# currently only working for local static variables:
43+
- key: readability-identifier-naming.StaticVariablePrefix
44+
value: 's_'
45+
# not yet working
46+
# - key: readability-identifier-naming.VariableCase
47+
# value: camelBack
48+
- key: readability-identifier-naming.FunctionCase
49+
value: camelBack
50+
...
51+

0 commit comments

Comments
 (0)