-
Notifications
You must be signed in to change notification settings - Fork 700
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into trace-to-logs-on-all-platforms
- Loading branch information
Showing
521 changed files
with
21,358 additions
and
23,167 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| # Copyright (C) 2016 Olivier Goffart <[email protected]> | ||
| # | ||
| # You may use this file under the terms of the 3-clause BSD license. | ||
| # See the file LICENSE from this package for details. | ||
|
|
||
| # This is the clang-format configuration style to be used by Qt, | ||
| # based on the rules from https://wiki.qt.io/Qt_Coding_Style and | ||
| # https://wiki.qt.io/Coding_Conventions | ||
|
|
||
| --- | ||
| # Webkit style was loosely based on the Qt style | ||
| BasedOnStyle: WebKit | ||
|
|
||
| Standard: c++17 | ||
|
|
||
| # Column width is limited to 100 in accordance with Qt Coding Style. | ||
| # https://wiki.qt.io/Qt_Coding_Style | ||
| # Note that this may be changed at some point in the future. | ||
| ColumnLimit: 100 | ||
| # How much weight do extra characters after the line length limit have. | ||
| # PenaltyExcessCharacter: 4 | ||
|
|
||
| # We want a space between the type and the star for pointer types. | ||
| PointerAlignment: Left | ||
|
|
||
| # Align reference like PointerAlignment. | ||
| # ReferenceAlignment: Left | ||
|
|
||
| # We use template< without space. | ||
| SpaceAfterTemplateKeyword: false | ||
|
|
||
| # We want to break before the operators, but not before a '='. | ||
| BreakBeforeBinaryOperators: NonAssignment | ||
|
|
||
| # Braces are usually attached, but not after functions or class declarations. | ||
| BreakBeforeBraces: Attach | ||
|
|
||
| # When constructor initializers do not fit on one line, put them each on a new line. | ||
| # PackConstructorInitializers: CurrentLine | ||
|
|
||
| # Indent initializers by 4 spaces | ||
| ConstructorInitializerIndentWidth: 4 | ||
|
|
||
| # Indent width for line continuations. | ||
| ContinuationIndentWidth: 8 | ||
|
|
||
| # No spaces inside the braced list. | ||
| Cpp11BracedListStyle: true | ||
|
|
||
| # No indentation for namespaces. | ||
| NamespaceIndentation: None | ||
|
|
||
| # Allow indentation for preprocessing directives (if/ifdef/endif). https://reviews.llvm.org/rL312125 | ||
| IndentPPDirectives: None | ||
|
|
||
| # Horizontally align arguments after an open bracket. | ||
| # The coding style does not specify the following, but this is what gives | ||
| # results closest to the existing code. | ||
| AlignAfterOpenBracket: true | ||
| AlwaysBreakTemplateDeclarations: true | ||
|
|
||
| # Ideally we should also allow less short function in a single line, but | ||
| # clang-format does not handle that. | ||
| AllowShortFunctionsOnASingleLine: Inline | ||
|
|
||
| # The coding style specifies some include order categories, but also tells to | ||
| # separate categories with an empty line. It does not specify the order within | ||
| # the categories. Since the SortInclude feature of clang-format does not | ||
| # re-order includes separated by empty lines, the feature is not used. | ||
| SortIncludes: false | ||
|
|
||
| # Break constructor initializers before the colon and after the commas. | ||
| BreakConstructorInitializers: AfterColon | ||
|
|
||
| # Do not format macro definition body. | ||
| SkipMacroDefinitionBody: true |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| fail_fast: false | ||
| repos: | ||
| - repo: https://github.com/pocc/pre-commit-hooks | ||
| rev: v1.3.5 | ||
| hooks: | ||
| - id: clang-format | ||
| args: [-i] |
Oops, something went wrong.