diff options
| author | rubenwardy <rw@rubenwardy.com> | 2021-10-15 17:14:48 +0100 |
|---|---|---|
| committer | rubenwardy <rw@rubenwardy.com> | 2021-10-18 18:12:03 +0100 |
| commit | c61d8cfb857bbc591ae87f662e0e6e67b813a5c4 (patch) | |
| tree | dabe2aed3eb722eb1167e8dfef2911c26a4adc09 /.clang-format | |
| parent | 27f4195471fbbac33b5cdc19025ec5aa6c118a75 (diff) | |
| download | minetest-c61d8cfb857bbc591ae87f662e0e6e67b813a5c4.tar.gz minetest-c61d8cfb857bbc591ae87f662e0e6e67b813a5c4.tar.bz2 minetest-c61d8cfb857bbc591ae87f662e0e6e67b813a5c4.zip | |
Use scoped app storage on Android (#11466)
From November 2021, the Play Store will no longer be accepting
apps which use the deprecated getExternalStorageDirectory() API.
Therefore, this commit replaces uses of deprecated API with the new
scoped API (`getExternalFilesDir()` and `getExternalCacheDir()`).
It also provides a temporary migration to move user data from the
shared external directory to new storage.
Fixes #2097, #11417 and #11118
Diffstat (limited to '.clang-format')
| -rw-r--r-- | .clang-format | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/.clang-format b/.clang-format index 0db8ab167..63f12b6c4 100644 --- a/.clang-format +++ b/.clang-format @@ -1,6 +1,7 @@ BasedOnStyle: LLVM -IndentWidth: 8 +IndentWidth: 4 UseTab: Always +TabWidth: 4 BreakBeforeBraces: Custom Standard: Cpp11 BraceWrapping: @@ -16,7 +17,7 @@ BraceWrapping: FixNamespaceComments: false AllowShortIfStatementsOnASingleLine: false IndentCaseLabels: false -AccessModifierOffset: -8 +AccessModifierOffset: -4 ColumnLimit: 90 AllowShortFunctionsOnASingleLine: InlineOnly SortIncludes: false @@ -26,7 +27,7 @@ IncludeCategories: - Regex: '^<.*' Priority: 1 AlignAfterOpenBracket: DontAlign -ContinuationIndentWidth: 16 -ConstructorInitializerIndentWidth: 16 +ContinuationIndentWidth: 8 +ConstructorInitializerIndentWidth: 8 BreakConstructorInitializers: AfterColon AlwaysBreakTemplateDeclarations: Yes |