aboutsummaryrefslogtreecommitdiff
path: root/.clang-format
diff options
context:
space:
mode:
authorrubenwardy <rw@rubenwardy.com>2021-10-15 17:14:48 +0100
committerGitHub <noreply@github.com>2021-10-15 18:14:48 +0200
commit6901c5fae54eafb05494823b60d4e26c14b342f1 (patch)
tree84cfeee77d5917d554a8eb3feca166083cbfdc9b /.clang-format
parentfe7195badb2801f4957d6dea2c961a3ffcf7debf (diff)
downloadminetest-6901c5fae54eafb05494823b60d4e26c14b342f1.tar.gz
minetest-6901c5fae54eafb05494823b60d4e26c14b342f1.tar.bz2
minetest-6901c5fae54eafb05494823b60d4e26c14b342f1.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-format9
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