From f6caecfb765a4cda0cd1e6982f20f8ce037516f4 Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Sat, 13 Jun 2026 19:21:49 +0200 Subject: update .clang-format --- .clang-format | 3 +++ src/main.cpp | 22 +++++++++++++--------- src/string.hpp | 19 +++++++++++-------- 3 files changed, 27 insertions(+), 17 deletions(-) diff --git a/.clang-format b/.clang-format index 27d7ce1..17605d8 100644 --- a/.clang-format +++ b/.clang-format @@ -5,14 +5,17 @@ BasedOnStyle: Chromium IndentWidth: 4 AccessModifierOffset: -4 +AlignAfterOpenBracket: BlockIndent AlignConsecutiveMacros: AcrossComments AllowShortFunctionsOnASingleLine: Empty BinPackArguments: false +BinPackParameters: OnePerLine BreakConstructorInitializers: BeforeComma BreakInheritanceList: BeforeComma BreakStringLiterals: false ColumnLimit: 100 IncludeBlocks: Regroup +PenaltyReturnTypeOnItsOwnLine: 1000 SpacesBeforeTrailingComments: 1 WrapNamespaceBodyWithEmptyLines: Always diff --git a/src/main.cpp b/src/main.cpp index 8b81587..b228175 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -21,9 +21,10 @@ #include #if defined(_MSC_VER) -#pragma comment( \ - linker, \ - "/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'\"") +#pragma comment( \ + linker, \ + "/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'\"" \ +) #endif namespace { @@ -36,8 +37,9 @@ HWND get_dialog_item(HWND wnd, int id) { } bool is_administrator() { - auto token = token::open_for_current_process(token::permissions::query() | - token::permissions::duplicate()); + auto token = token::open_for_current_process( + token::permissions::query() | token::permissions::duplicate() + ); if (!token::get_linked(token)) token = token::get_for_identification(token); @@ -121,10 +123,12 @@ BOOL on_init_dialog(HWND wnd, HWND, LPARAM) { } void report_already_elevated(HWND wnd) { - MessageBoxW(wnd, - resource::load_string(IDS_ALREADY_ELEVATED_TEXT).c_str(), - resource::load_string(IDS_ALREADY_ELEVATED_CAPTION).c_str(), - MB_OK); + MessageBoxW( + wnd, + resource::load_string(IDS_ALREADY_ELEVATED_TEXT).c_str(), + resource::load_string(IDS_ALREADY_ELEVATED_CAPTION).c_str(), + MB_OK + ); } void on_button_elevate_click(HWND wnd) { diff --git a/src/string.hpp b/src/string.hpp index dee1966..64e6e84 100644 --- a/src/string.hpp +++ b/src/string.hpp @@ -18,15 +18,17 @@ namespace string { template void ltrim(std::basic_string& s) { - s.erase(s.begin(), - std::find_if(s.begin(), s.end(), [](const Char& c) { return !std::isspace(c); })); + s.erase(s.begin(), std::find_if(s.begin(), s.end(), [](const Char& c) { + return !std::isspace(c); + })); } template void rtrim(std::basic_string& s) { s.erase( std::find_if(s.rbegin(), s.rend(), [](const Char& c) { return !std::isspace(c); }).base(), - s.end()); + s.end() + ); } template @@ -59,11 +61,12 @@ template struct StringHelper {}; template -struct StringHelper::type>::type, - Char>::value>::type> { +struct StringHelper< + Char, + String, + typename std::enable_if::type>::type, + Char>::value>::type> { StringHelper(const Char& c) : buf{&c}, len{1} {} StringHelper(const Char* s) : buf{s}, len{std::char_traits::length(s)} {} -- cgit v1.3