From c06da5b411237960cb0549d74d98670e109e3133 Mon Sep 17 00:00:00 2001 From: tylerjaacks Date: Fri, 23 Jan 2026 21:05:24 -0600 Subject: [PATCH] Add a global .clang-format and added a .gitignore. --- .gitignore | 1 + .../{WinDurango.Common => }/.clang-format | 3 +- .../include/WinDurango.Common/Config.h | 10 +- .../include/WinDurango.Common/WinDurango.h | 17 +- projects/WinDurango.Common/src/WinDurango.cpp | 14 +- projects/WinDurango.Kernel/.clang-format | 246 ------------------ .../include/WinDurango.Kernel/Kernel.h | 2 +- 7 files changed, 28 insertions(+), 265 deletions(-) create mode 100644 .gitignore rename projects/{WinDurango.Common => }/.clang-format (99%) delete mode 100644 projects/WinDurango.Kernel/.clang-format diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..07ed706 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +build/* \ No newline at end of file diff --git a/projects/WinDurango.Common/.clang-format b/projects/.clang-format similarity index 99% rename from projects/WinDurango.Common/.clang-format rename to projects/.clang-format index b984561..62f1663 100644 --- a/projects/WinDurango.Common/.clang-format +++ b/projects/.clang-format @@ -155,7 +155,7 @@ LineEnding: DeriveLF MacroBlockBegin: '' MacroBlockEnd: '' MaxEmptyLinesToKeep: 1 -NamespaceIndentation: None +NamespaceIndentation: All ObjCBinPackProtocolList: Auto ObjCBlockIndentWidth: 2 ObjCBreakBeforeNestedBlockParam: true @@ -242,4 +242,3 @@ WhitespaceSensitiveMacros: - NS_SWIFT_NAME - PP_STRINGIZE - STRINGIZE -... \ No newline at end of file diff --git a/projects/WinDurango.Common/include/WinDurango.Common/Config.h b/projects/WinDurango.Common/include/WinDurango.Common/Config.h index 55c3ea8..996329f 100644 --- a/projects/WinDurango.Common/include/WinDurango.Common/Config.h +++ b/projects/WinDurango.Common/include/WinDurango.Common/Config.h @@ -4,10 +4,12 @@ #ifndef WINDURANGO_CONFIG_H #define WINDURANGO_CONFIG_H -namespace wd::common { - class Config { +namespace wd::common +{ + class Config + { // todo for later since I don't want to deal with fileio atm }; -} // wd::common +} // namespace wd::common -#endif // WINDURANGO_CONFIG_H \ No newline at end of file +#endif // WINDURANGO_CONFIG_H diff --git a/projects/WinDurango.Common/include/WinDurango.Common/WinDurango.h b/projects/WinDurango.Common/include/WinDurango.Common/WinDurango.h index c7480e5..52000b2 100644 --- a/projects/WinDurango.Common/include/WinDurango.Common/WinDurango.h +++ b/projects/WinDurango.Common/include/WinDurango.Common/WinDurango.h @@ -6,19 +6,22 @@ #include "WinDurango.Common/Config.h" -namespace wd::common { - class WinDurango { - public: +namespace wd::common +{ + class WinDurango + { + public: static WinDurango *GetInstance(); WinDurango() = default; void Init(); - Config Config; - private: + Config Config; + + private: bool _inited = false; }; -} +} // namespace wd::common -#endif // WINDURANGO_COMMON_H \ No newline at end of file +#endif // WINDURANGO_COMMON_H diff --git a/projects/WinDurango.Common/src/WinDurango.cpp b/projects/WinDurango.Common/src/WinDurango.cpp index d6dfecf..67044fd 100644 --- a/projects/WinDurango.Common/src/WinDurango.cpp +++ b/projects/WinDurango.Common/src/WinDurango.cpp @@ -3,18 +3,22 @@ // #include "WinDurango.Common/WinDurango.h" -namespace wd::common { - WinDurango *WinDurango::GetInstance() { - static WinDurango Instance = WinDurango(); // if we don't declare it in src, it will make multiple instances per header import in different libs afaik +namespace wd::common +{ + WinDurango *WinDurango::GetInstance() + { + static WinDurango Instance = WinDurango(); // if we don't declare it in src, it will make multiple instances per + // header import in different libs afaik if (!Instance._inited) Instance.Init(); // lazy return &Instance; } - void WinDurango::Init() { + void WinDurango::Init() + { // todo load config this->_inited = true; } -} +} // namespace wd::common diff --git a/projects/WinDurango.Kernel/.clang-format b/projects/WinDurango.Kernel/.clang-format deleted file mode 100644 index 75347cd..0000000 --- a/projects/WinDurango.Kernel/.clang-format +++ /dev/null @@ -1,246 +0,0 @@ ---- -Language: Cpp -# BasedOnStyle: Microsoft -AccessModifierOffset: -2 -AlignAfterOpenBracket: Align -AlignArrayOfStructures: None -AlignConsecutiveAssignments: - Enabled: false - AcrossEmptyLines: false - AcrossComments: false - AlignCompound: false - AlignFunctionPointers: false - PadOperators: true -AlignConsecutiveBitFields: - Enabled: false - AcrossEmptyLines: false - AcrossComments: false - AlignCompound: false - AlignFunctionPointers: false - PadOperators: false -AlignConsecutiveDeclarations: - Enabled: false - AcrossEmptyLines: false - AcrossComments: false - AlignCompound: false - AlignFunctionPointers: false - PadOperators: false -AlignConsecutiveMacros: - Enabled: false - AcrossEmptyLines: false - AcrossComments: false - AlignCompound: false - AlignFunctionPointers: false - PadOperators: false -AlignConsecutiveShortCaseStatements: - Enabled: false - AcrossEmptyLines: false - AcrossComments: false - AlignCaseColons: false -AlignEscapedNewlines: Right -AlignOperands: Align -AlignTrailingComments: - Kind: Always - OverEmptyLines: 0 -AllowAllArgumentsOnNextLine: true -AllowAllParametersOfDeclarationOnNextLine: true -AllowBreakBeforeNoexceptSpecifier: Never -AllowShortBlocksOnASingleLine: Never -AllowShortCaseLabelsOnASingleLine: false -AllowShortCompoundRequirementOnASingleLine: true -AllowShortEnumsOnASingleLine: false -AllowShortFunctionsOnASingleLine: None -AllowShortIfStatementsOnASingleLine: Never -AllowShortLambdasOnASingleLine: All -AllowShortLoopsOnASingleLine: false -AlwaysBreakAfterDefinitionReturnType: None -AlwaysBreakAfterReturnType: None -AlwaysBreakBeforeMultilineStrings: false -AlwaysBreakTemplateDeclarations: MultiLine -AttributeMacros: - - __capability -BinPackArguments: true -BinPackParameters: true -BitFieldColonSpacing: Both -BraceWrapping: - AfterCaseLabel: false - AfterClass: true - AfterControlStatement: Always - AfterEnum: true - AfterExternBlock: true - AfterFunction: true - AfterNamespace: true - AfterObjCDeclaration: true - AfterStruct: true - AfterUnion: false - BeforeCatch: true - BeforeElse: true - BeforeLambdaBody: false - BeforeWhile: false - IndentBraces: false - SplitEmptyFunction: true - SplitEmptyRecord: true - SplitEmptyNamespace: true -BreakAdjacentStringLiterals: true -BreakAfterAttributes: Leave -BreakAfterJavaFieldAnnotations: false -BreakArrays: true -BreakBeforeBinaryOperators: None -BreakBeforeConceptDeclarations: Always -BreakBeforeBraces: Custom -BreakBeforeInlineASMColon: OnlyMultiline -BreakBeforeTernaryOperators: true -BreakConstructorInitializers: BeforeColon -BreakInheritanceList: BeforeColon -BreakStringLiterals: true -ColumnLimit: 120 -CommentPragmas: '^ IWYU pragma:' -CompactNamespaces: false -ConstructorInitializerIndentWidth: 4 -ContinuationIndentWidth: 4 -Cpp11BracedListStyle: true -DerivePointerAlignment: false -DisableFormat: false -EmptyLineAfterAccessModifier: Never -EmptyLineBeforeAccessModifier: LogicalBlock -ExperimentalAutoDetectBinPacking: false -FixNamespaceComments: true -ForEachMacros: - - foreach - - Q_FOREACH - - BOOST_FOREACH -IfMacros: - - KJ_IF_MAYBE -IncludeBlocks: Preserve -IncludeCategories: - - Regex: '^"(llvm|llvm-c|clang|clang-c)/' - Priority: 2 - SortPriority: 0 - CaseSensitive: false - - Regex: '^(<|"(gtest|gmock|isl|json)/)' - Priority: 3 - SortPriority: 0 - CaseSensitive: false - - Regex: '.*' - Priority: 1 - SortPriority: 0 - CaseSensitive: false -IncludeIsMainRegex: '(Test)?$' -IncludeIsMainSourceRegex: '' -IndentAccessModifiers: false -IndentCaseBlocks: false -IndentCaseLabels: false -IndentExternBlock: AfterExternBlock -IndentGotoLabels: true -IndentPPDirectives: None -IndentRequiresClause: true -IndentWidth: 4 -IndentWrappedFunctionNames: false -InsertBraces: false -InsertNewlineAtEOF: false -InsertTrailingCommas: None -IntegerLiteralSeparator: - Binary: 0 - BinaryMinDigits: 0 - Decimal: 0 - DecimalMinDigits: 0 - Hex: 0 - HexMinDigits: 0 -JavaScriptQuotes: Leave -JavaScriptWrapImports: true -KeepEmptyLinesAtTheStartOfBlocks: true -KeepEmptyLinesAtEOF: false -LambdaBodyIndentation: Signature -LineEnding: DeriveLF -MacroBlockBegin: '' -MacroBlockEnd: '' -MaxEmptyLinesToKeep: 1 -NamespaceIndentation: None -ObjCBinPackProtocolList: Auto -ObjCBlockIndentWidth: 2 -ObjCBreakBeforeNestedBlockParam: true -ObjCSpaceAfterProperty: false -ObjCSpaceBeforeProtocolList: true -PackConstructorInitializers: BinPack -PenaltyBreakAssignment: 2 -PenaltyBreakBeforeFirstCallParameter: 19 -PenaltyBreakComment: 300 -PenaltyBreakFirstLessLess: 120 -PenaltyBreakOpenParenthesis: 0 -PenaltyBreakScopeResolution: 500 -PenaltyBreakString: 1000 -PenaltyBreakTemplateDeclaration: 10 -PenaltyExcessCharacter: 1000000 -PenaltyIndentedWhitespace: 0 -PenaltyReturnTypeOnItsOwnLine: 1000 -PointerAlignment: Right -PPIndentWidth: -1 -QualifierAlignment: Leave -ReferenceAlignment: Pointer -ReflowComments: true -RemoveBracesLLVM: false -RemoveParentheses: Leave -RemoveSemicolon: false -RequiresClausePosition: OwnLine -RequiresExpressionIndentation: OuterScope -SeparateDefinitionBlocks: Leave -ShortNamespaceLines: 1 -SkipMacroDefinitionBody: false -SortIncludes: CaseSensitive -SortJavaStaticImport: Before -SortUsingDeclarations: LexicographicNumeric -SpaceAfterCStyleCast: false -SpaceAfterLogicalNot: false -SpaceAfterTemplateKeyword: true -SpaceAroundPointerQualifiers: Default -SpaceBeforeAssignmentOperators: true -SpaceBeforeCaseColon: false -SpaceBeforeCpp11BracedList: false -SpaceBeforeCtorInitializerColon: true -SpaceBeforeInheritanceColon: true -SpaceBeforeJsonColon: false -SpaceBeforeParens: ControlStatements -SpaceBeforeParensOptions: - AfterControlStatements: true - AfterForeachMacros: true - AfterFunctionDefinitionName: false - AfterFunctionDeclarationName: false - AfterIfMacros: true - AfterOverloadedOperator: false - AfterPlacementOperator: true - AfterRequiresInClause: false - AfterRequiresInExpression: false - BeforeNonEmptyParentheses: false -SpaceBeforeRangeBasedForLoopColon: true -SpaceBeforeSquareBrackets: false -SpaceInEmptyBlock: false -SpacesBeforeTrailingComments: 1 -SpacesInAngles: Never -SpacesInContainerLiterals: true -SpacesInLineCommentPrefix: - Minimum: 1 - Maximum: -1 -SpacesInParens: Never -SpacesInParensOptions: - InCStyleCasts: false - InConditionalStatements: false - InEmptyParentheses: false - Other: false -SpacesInSquareBrackets: false -Standard: Latest -StatementAttributeLikeMacros: - - Q_EMIT -StatementMacros: - - Q_UNUSED - - QT_REQUIRE_VERSION -TabWidth: 4 -UseTab: Never -VerilogBreakBetweenInstancePorts: true -WhitespaceSensitiveMacros: - - BOOST_PP_STRINGIZE - - CF_SWIFT_NAME - - NS_SWIFT_NAME - - PP_STRINGIZE - - STRINGIZE -... - diff --git a/projects/WinDurango.Kernel/include/WinDurango.Kernel/Kernel.h b/projects/WinDurango.Kernel/include/WinDurango.Kernel/Kernel.h index daf2f7f..6378304 100644 --- a/projects/WinDurango.Kernel/include/WinDurango.Kernel/Kernel.h +++ b/projects/WinDurango.Kernel/include/WinDurango.Kernel/Kernel.h @@ -4,4 +4,4 @@ #ifndef WINDURANGO_KERNEL_H #define WINDURANGO_KERNEL_H -#endif // WINDURANGO_KERNEL_H \ No newline at end of file +#endif // WINDURANGO_KERNEL_H