From 2bbe3310ba6dd3ef4772404d7d7cdc359c940de8 Mon Sep 17 00:00:00 2001 From: akallabeth Date: Fri, 23 Jan 2026 20:42:32 +0100 Subject: [PATCH] [warnings] fix compiler and clang-tidy issues --- .../SDL3/dialogs/sdl_connection_dialog.cpp | 9 ++-- client/SDL/SDL3/dialogs/sdl_widget.cpp | 2 +- client/SDL/SDL3/sdl_clip.cpp | 4 -- client/SDL/SDL3/sdl_clip.hpp | 5 +-- client/SDL/SDL3/sdl_context.cpp | 4 -- client/SDL/SDL3/sdl_context.hpp | 16 +++---- client/SDL/SDL3/sdl_utils.cpp | 45 ++++++++++--------- client/SDL/SDL3/sdl_utils.hpp | 2 +- 8 files changed, 39 insertions(+), 48 deletions(-) diff --git a/client/SDL/SDL3/dialogs/sdl_connection_dialog.cpp b/client/SDL/SDL3/dialogs/sdl_connection_dialog.cpp index 904a735a8..e97ce62f4 100644 --- a/client/SDL/SDL3/dialogs/sdl_connection_dialog.cpp +++ b/client/SDL/SDL3/dialogs/sdl_connection_dialog.cpp @@ -354,16 +354,15 @@ bool SDLConnectionDialog::createWindow() break; } - const auto height = (total_height - 3ul * vpadding) / 2ul; - SDL_FRect iconRect{ hpadding, vpadding, widget_width / 4ul - 2ul * hpadding, - static_cast(height) }; + const auto height = (total_height - 3.0f * vpadding) / 2.0f; + SDL_FRect iconRect{ hpadding, vpadding, widget_width / 4.0f - 2.0f * hpadding, height }; widget_cfg_t icon{ textcolor, res_bgcolor, { _renderer, iconRect, SDL3ResourceManager::get(SDLResourceManager::typeImages(), res_name) } }; _list.emplace_back(std::move(icon)); - iconRect.y += static_cast(height); + iconRect.y += height; widget_cfg_t logo{ textcolor, _backgroundcolor, @@ -372,7 +371,7 @@ bool SDLConnectionDialog::createWindow() "FreeRDP_Icon.svg") } }; _list.emplace_back(std::move(logo)); - SDL_FRect rect = { widget_width / 4ul, vpadding, widget_width * 3ul / 4ul, + SDL_FRect rect = { widget_width / 4.0f, vpadding, widget_width * 3.0f / 4.0f, total_height - 3ul * vpadding - widget_height }; #else SDL_FRect rect = { hpadding, vpadding, widget_width - 2ul * hpadding, diff --git a/client/SDL/SDL3/dialogs/sdl_widget.cpp b/client/SDL/SDL3/dialogs/sdl_widget.cpp index 50630d4d5..d0cbaefc8 100644 --- a/client/SDL/SDL3/dialogs/sdl_widget.cpp +++ b/client/SDL/SDL3/dialogs/sdl_widget.cpp @@ -69,7 +69,7 @@ SdlWidget::SdlWidget(std::shared_ptr& renderer, const SDL_FRect& r { if (ops) { - _image = std::shared_ptr(IMG_LoadTexture_IO(renderer.get(), ops, 1), + _image = std::shared_ptr(IMG_LoadTexture_IO(renderer.get(), ops, true), SDL_DestroyTexture); if (!_image) (void)widget_log_error(false, "IMG_LoadTexture_IO"); diff --git a/client/SDL/SDL3/sdl_clip.cpp b/client/SDL/SDL3/sdl_clip.cpp index b3768ccc5..172576a3b 100644 --- a/client/SDL/SDL3/sdl_clip.cpp +++ b/client/SDL/SDL3/sdl_clip.cpp @@ -964,10 +964,6 @@ ClipRequest::ClipRequest(UINT32 format, const std::string& mime) { } -ClipRequest::~ClipRequest() -{ -} - uint32_t ClipRequest::format() const { return _format; diff --git a/client/SDL/SDL3/sdl_clip.hpp b/client/SDL/SDL3/sdl_clip.hpp index d5531e4fa..e4497e111 100644 --- a/client/SDL/SDL3/sdl_clip.hpp +++ b/client/SDL/SDL3/sdl_clip.hpp @@ -41,7 +41,7 @@ class ClipRequest ClipRequest(UINT32 format, const std::string& mime); ClipRequest(const ClipRequest& other) = default; ClipRequest(ClipRequest&& other) = default; - virtual ~ClipRequest(); + ~ClipRequest() = default; ClipRequest& operator=(const ClipRequest& other) = delete; ClipRequest& operator=(ClipRequest&& other) = delete; @@ -130,14 +130,13 @@ class sdlClip [[nodiscard]] static bool mime_is_bmp(const std::string& mime); [[nodiscard]] static bool mime_is_html(const std::string& mime); - private: SdlContext* _sdl = nullptr; CliprdrFileContext* _file = nullptr; CliprdrClientContext* _ctx = nullptr; wLog* _log = nullptr; wClipboard* _system = nullptr; std::atomic _sync = false; - HANDLE _event; + HANDLE _event = nullptr; Uint64 _last_timestamp = 0; std::vector _serverFormats; diff --git a/client/SDL/SDL3/sdl_context.cpp b/client/SDL/SDL3/sdl_context.cpp index 16f3a4fbe..962dbb8e7 100644 --- a/client/SDL/SDL3/sdl_context.cpp +++ b/client/SDL/SDL3/sdl_context.cpp @@ -61,10 +61,6 @@ SdlContext::SdlContext(rdpContext* context) /* TODO: Client display set up */ } -SdlContext::~SdlContext() -{ -} - void SdlContext::setHasCursor(bool val) { this->_cursor_visible = val; diff --git a/client/SDL/SDL3/sdl_context.hpp b/client/SDL/SDL3/sdl_context.hpp index a19dc8ab6..0c25e3377 100644 --- a/client/SDL/SDL3/sdl_context.hpp +++ b/client/SDL/SDL3/sdl_context.hpp @@ -46,7 +46,7 @@ class SdlContext explicit SdlContext(rdpContext* context); SdlContext(const SdlContext& other) = delete; SdlContext(SdlContext&& other) = delete; - virtual ~SdlContext(); + ~SdlContext() = default; SdlContext& operator=(const SdlContext& other) = delete; SdlContext& operator=(SdlContext&& other) = delete; @@ -147,9 +147,9 @@ class SdlContext std::atomic _connected = false; bool _cursor_visible = true; rdpPointer* _cursor = nullptr; - std::vector _monitorIds{}; - std::mutex _queue_mux{}; - std::queue> _queue{}; + std::vector _monitorIds; + std::mutex _queue_mux; + std::queue> _queue; /* SDL */ bool _fullscreen = false; bool _resizeable = false; @@ -159,7 +159,7 @@ class SdlContext std::atomic _rdpThreadRunning = false; SDL_PixelFormat _sdlPixelFormat = SDL_PIXELFORMAT_UNKNOWN; - CriticalSection _critical{}; + CriticalSection _critical; using SDLSurfacePtr = std::unique_ptr; @@ -171,8 +171,8 @@ class SdlContext SdlConnectionDialogWrapper _dialog; - std::map _windows{}; + std::map _windows; - WinPREvent _windowsCreatedEvent{}; - std::thread _thread{}; + WinPREvent _windowsCreatedEvent; + std::thread _thread; }; diff --git a/client/SDL/SDL3/sdl_utils.cpp b/client/SDL/SDL3/sdl_utils.cpp index e827fe4a9..83129eeae 100644 --- a/client/SDL/SDL3/sdl_utils.cpp +++ b/client/SDL/SDL3/sdl_utils.cpp @@ -530,29 +530,30 @@ namespace sdl::error } return nullptr; } -} -int sdl::error::errorToExitCode(DWORD error) -{ - auto entry = mapEntryByError(error); - if (entry) - return entry->code; + int errorToExitCode(DWORD error) + { + auto entry = mapEntryByError(error); + if (entry) + return entry->code; - return CONN_FAILED; -} + return CONN_FAILED; + } -const char* sdl::error::errorToExitCodeTag(UINT32 error) -{ - auto entry = mapEntryByError(error); - if (entry) - return entry->code_tag; - return nullptr; -} + const char* errorToExitCodeTag(UINT32 error) + { + auto entry = mapEntryByError(error); + if (entry) + return entry->code_tag; + return nullptr; + } -const char* sdl::error::exitCodeToTag(int code) -{ - auto entry = mapEntryByCode(code); - if (entry) - return entry->code_tag; - return nullptr; -} + const char* exitCodeToTag(int code) + { + auto entry = mapEntryByCode(code); + if (entry) + return entry->code_tag; + return nullptr; + } + +} // namespace sdl::error diff --git a/client/SDL/SDL3/sdl_utils.hpp b/client/SDL/SDL3/sdl_utils.hpp index be00920f6..8fa10f30f 100644 --- a/client/SDL/SDL3/sdl_utils.hpp +++ b/client/SDL/SDL3/sdl_utils.hpp @@ -177,4 +177,4 @@ namespace sdl::error [[nodiscard]] int errorToExitCode(DWORD error); [[nodiscard]] const char* errorToExitCodeTag(UINT32 error); [[nodiscard]] const char* exitCodeToTag(int code); -} +} // namespace sdl::error