diff --git a/.clang-format b/.clang-format deleted file mode 100644 index fd28e7c25..000000000 --- a/.clang-format +++ /dev/null @@ -1,34 +0,0 @@ -Language: Cpp - -AccessModifierOffset: -1 -AccessModifierOffset: -4 -AlignEscapedNewlinesLeft: true -AllowShortFunctionsOnASingleLine: false -AllowShortIfStatementsOnASingleLine: false -AllowShortLoopsOnASingleLine: false -AlwaysBreakAfterDefinitionReturnType: false -AlwaysBreakBeforeMultilineStrings: false -BasedOnStyle: Google -BraceWrapping: { - AfterNamespace: 'false' - AfterClass: 'true' - BeforeElse: 'true' - AfterControlStatement: 'true' - AfterFunction: 'true' - BeforeCatch: 'true' -} -BreakBeforeBraces: Custom -BreakConstructorInitializersBeforeComma: true -ColumnLimit: 80 -ConstructorInitializerAllOnOneLineOrOnePerLine: false -DerivePointerBinding: false -FixNamespaceComments: true -IndentCaseLabels: true -IndentWidth: 4 -IndentWrappedFunctionNames: true -IndentPPDirectives: AfterHash -NamespaceIndentation: Inner -PointerBindsToType: false -SpacesBeforeTrailingComments: 2 -Standard: Auto -ReflowComments: false diff --git a/.gitmodules b/.gitmodules index 28a1b9d6a..2036c3ab9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -26,3 +26,6 @@ [submodule "lib/rapidjson"] path = lib/rapidjson url = https://github.com/Tencent/rapidjson +[submodule "lib/qtkeychain"] + path = lib/qtkeychain + url = https://github.com/Chatterino/qtkeychain diff --git a/lib/qtkeychain b/lib/qtkeychain new file mode 160000 index 000000000..832f550da --- /dev/null +++ b/lib/qtkeychain @@ -0,0 +1 @@ +Subproject commit 832f550da3f6655168a737d2e1b7df37272e936d