From 0f20eb152a491dc8ffc675b0cb5d8a21c6a8690d Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Thu, 20 Jul 2023 03:52:34 +0400 Subject: [PATCH] Use string literal instead of const_string for QString constants --- ui/platform/linux/ui_utility_linux.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/ui/platform/linux/ui_utility_linux.cpp b/ui/platform/linux/ui_utility_linux.cpp index 96c4059..53d04a3 100644 --- a/ui/platform/linux/ui_utility_linux.cpp +++ b/ui/platform/linux/ui_utility_linux.cpp @@ -8,7 +8,6 @@ #include "base/platform/base_platform_info.h" #include "base/call_delayed.h" -#include "base/const_string.h" #include "ui/platform/linux/ui_linux_wayland_integration.h" #ifndef DESKTOP_APP_DISABLE_X11_INTEGRATION @@ -23,7 +22,7 @@ namespace Ui { namespace Platform { namespace { -constexpr auto kXCBFrameExtentsAtomName = "_GTK_FRAME_EXTENTS"_cs; +static const auto kXCBFrameExtentsAtomName = u"_GTK_FRAME_EXTENTS"_q; constexpr auto kDelayDeactivateEventTimeout = crl::time(400); bool PendingDeactivateEvent/* = false*/; @@ -298,7 +297,7 @@ void SetXCBFrameExtents(not_null widget, const QMargins &extents) { const auto frameExtentsAtom = base::Platform::XCB::GetAtom( connection, - kXCBFrameExtentsAtomName.utf16()); + kXCBFrameExtentsAtomName); if (!frameExtentsAtom.has_value()) { return; @@ -333,7 +332,7 @@ void UnsetXCBFrameExtents(not_null widget) { const auto frameExtentsAtom = base::Platform::XCB::GetAtom( connection, - kXCBFrameExtentsAtomName.utf16()); + kXCBFrameExtentsAtomName); if (!frameExtentsAtom.has_value()) { return; @@ -477,7 +476,7 @@ bool WindowExtentsSupported() { if (::Platform::IsX11() && XCB::IsSupportedByWM( XCB::GetConnectionFromQt(), - kXCBFrameExtentsAtomName.utf16())) { + kXCBFrameExtentsAtomName)) { return true; } #endif // !DESKTOP_APP_DISABLE_X11_INTEGRATION