From 61afebcedb1417bbe47adc0c69f71c3e5b70ebc3 Mon Sep 17 00:00:00 2001 From: dranik Date: Fri, 29 May 2026 22:40:24 +0300 Subject: [PATCH] format code --- client/cmake/sources.cmake | 23 ++++--- client/platforms/macos/macosutils.mm | 2 - client/platforms/windows/windowsutils.cpp | 79 +++++++++++------------ 3 files changed, 48 insertions(+), 56 deletions(-) diff --git a/client/cmake/sources.cmake b/client/cmake/sources.cmake index f4654f92d..ed09a4bfb 100644 --- a/client/cmake/sources.cmake +++ b/client/cmake/sources.cmake @@ -295,7 +295,7 @@ if(WIN32 OR (APPLE AND NOT IOS AND NOT MACOS_NE) OR (LINUX AND NOT ANDROID)) ) endif() - if(LINUX AND NOT ANDROID) + if(LINUX) set(HEADERS ${HEADERS} ${CLIENT_ROOT_DIR}/platforms/linux/linuxutils.h ) @@ -303,17 +303,16 @@ if(WIN32 OR (APPLE AND NOT IOS AND NOT MACOS_NE) OR (LINUX AND NOT ANDROID)) ${CLIENT_ROOT_DIR}/platforms/linux/linuxutils.cpp ) endif() -endif() -if(APPLE AND MACOS_NE) - # Include only the tray notification handler in NE builds - set(HEADERS ${HEADERS} - ${CLIENT_ROOT_DIR}/ui/utils/systemTrayNotificationHandler.h - ${CLIENT_ROOT_DIR}/ui/utils/platformTheme.h - ) + if(APPLE AND MACOS_NE) + set(HEADERS ${HEADERS} + ${CLIENT_ROOT_DIR}/ui/utils/systemTrayNotificationHandler.h + ${CLIENT_ROOT_DIR}/ui/utils/platformTheme.h + ) - set(SOURCES ${SOURCES} - ${CLIENT_ROOT_DIR}/ui/utils/systemTrayNotificationHandler.cpp - ${CLIENT_ROOT_DIR}/ui/utils/platformTheme.cpp - ) + set(SOURCES ${SOURCES} + ${CLIENT_ROOT_DIR}/ui/utils/systemTrayNotificationHandler.cpp + ${CLIENT_ROOT_DIR}/ui/utils/platformTheme.cpp + ) + endif() endif() diff --git a/client/platforms/macos/macosutils.mm b/client/platforms/macos/macosutils.mm index a36dd9ac7..4007f82d0 100644 --- a/client/platforms/macos/macosutils.mm +++ b/client/platforms/macos/macosutils.mm @@ -150,8 +150,6 @@ void MacOSUtils::installInterfaceThemeObserver(std::function callback) { return; } - // Copy into block storage: capturing the parameter by reference would dangle - // once this function returns. const std::function themeCallback = std::move(callback); NSDistributedNotificationCenter *center = [NSDistributedNotificationCenter defaultCenter]; diff --git a/client/platforms/windows/windowsutils.cpp b/client/platforms/windows/windowsutils.cpp index 071158d08..76e231204 100644 --- a/client/platforms/windows/windowsutils.cpp +++ b/client/platforms/windows/windowsutils.cpp @@ -51,69 +51,64 @@ namespace } } // namespace -constexpr const int WINDOWS_11_BUILD = 22000; // Build Number of the first release win 11 iso +constexpr const int WINDOWS_11_BUILD = + 22000; // Build Number of the first release win 11 iso -QString WindowsUtils::getErrorMessage(quint32 code) -{ - LPSTR messageBuffer = nullptr; - size_t size = - FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, - nullptr, code, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPSTR)&messageBuffer, 0, nullptr); +QString WindowsUtils::getErrorMessage(quint32 code) { + LPSTR messageBuffer = nullptr; + size_t size = + FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, + nullptr, code, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPSTR)&messageBuffer, 0, nullptr); - std::string message(messageBuffer, size); - QString result(message.c_str()); - LocalFree(messageBuffer); - return result; + std::string message(messageBuffer, size); + QString result(message.c_str()); + LocalFree(messageBuffer); + return result; } -QString WindowsUtils::getErrorMessage() -{ - return getErrorMessage(GetLastError()); +QString WindowsUtils::getErrorMessage() { + return getErrorMessage(GetLastError()); } // A simple function to log windows error messages. -void WindowsUtils::windowsLog(const QString &msg) -{ - QString errmsg = getErrorMessage(); - logger.error() << msg << "-" << errmsg; +void WindowsUtils::windowsLog(const QString& msg) { + QString errmsg = getErrorMessage(); + logger.error() << msg << "-" << errmsg; } // Static -QString WindowsUtils::windowsVersion() -{ - QSettings regCurrentVersion("HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion", - QSettings::NativeFormat); +QString WindowsUtils::windowsVersion() { + QSettings regCurrentVersion("HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion", + QSettings::NativeFormat); - int buildNr = regCurrentVersion.value("CurrentBuild").toInt(); - if (buildNr >= WINDOWS_11_BUILD) { - return "11"; - } - return QSysInfo::productVersion(); + int buildNr = regCurrentVersion.value("CurrentBuild").toInt(); + if (buildNr >= WINDOWS_11_BUILD) { + return "11"; + } + return QSysInfo::productVersion(); } // static -void WindowsUtils::forceCrash() -{ +void WindowsUtils::forceCrash() { RaiseException(0x0000DEAD, EXCEPTION_NONCONTINUABLE, 0, NULL); } // static -bool WindowsUtils::isDarkTheme() -{ - QSettings settings( - QStringLiteral("HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize"), - QSettings::NativeFormat); +bool WindowsUtils::isDarkTheme() { + QSettings settings( + QStringLiteral("HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize"), + QSettings::NativeFormat); - if (settings.contains(QStringLiteral("SystemUsesLightTheme"))) { - return registryUsesDarkTheme(settings, QStringLiteral("SystemUsesLightTheme")); - } + if (settings.contains(QStringLiteral("SystemUsesLightTheme"))) { + return registryUsesDarkTheme(settings, QStringLiteral("SystemUsesLightTheme")); + } - if (settings.contains(QStringLiteral("AppsUseLightTheme"))) { - return registryUsesDarkTheme(settings, QStringLiteral("AppsUseLightTheme")); - } + if (settings.contains(QStringLiteral("AppsUseLightTheme"))) { + return registryUsesDarkTheme(settings, QStringLiteral("AppsUseLightTheme")); + } - logger.warning() << "SystemUsesLightTheme registry key is unavailable; assuming dark theme"; - return true; + logger.warning() << "SystemUsesLightTheme registry key is unavailable; assuming dark theme"; + return true; } void WindowsUtils::installThemeChangeObserver(std::function callback)