diff --git a/client/SDL/SDL2/dialogs/sdl_connection_dialog.hpp b/client/SDL/SDL2/dialogs/sdl_connection_dialog.hpp index 3bf7bc2c3..bca4daf81 100644 --- a/client/SDL/SDL2/dialogs/sdl_connection_dialog.hpp +++ b/client/SDL/SDL2/dialogs/sdl_connection_dialog.hpp @@ -118,7 +118,7 @@ class SDLConnectionDialogHider SDLConnectionDialogHider(const SDLConnectionDialogHider& other) = delete; SDLConnectionDialogHider(SDLConnectionDialogHider&& other) = delete; SDLConnectionDialogHider& operator=(const SDLConnectionDialogHider& other) = delete; - SDLConnectionDialogHider& operator=(SDLConnectionDialogHider& other) = delete; + SDLConnectionDialogHider& operator=(SDLConnectionDialogHider&& other) = delete; ~SDLConnectionDialogHider(); diff --git a/client/SDL/SDL2/dialogs/sdl_input.hpp b/client/SDL/SDL2/dialogs/sdl_input.hpp index 8e4f29a5a..10a85748b 100644 --- a/client/SDL/SDL2/dialogs/sdl_input.hpp +++ b/client/SDL/SDL2/dialogs/sdl_input.hpp @@ -38,6 +38,7 @@ class SdlInputWidget size_t offset, size_t width, size_t height); SdlInputWidget(SdlInputWidget&& other) noexcept; SdlInputWidget(const SdlInputWidget& other) = delete; + ~SdlInputWidget() = default; SdlInputWidget& operator=(const SdlInputWidget& other) = delete; SdlInputWidget& operator=(SdlInputWidget&& other) = delete; diff --git a/client/SDL/SDL2/sdl_freerdp.hpp b/client/SDL/SDL2/sdl_freerdp.hpp index f082d3214..3142e98a5 100644 --- a/client/SDL/SDL2/sdl_freerdp.hpp +++ b/client/SDL/SDL2/sdl_freerdp.hpp @@ -49,6 +49,7 @@ class SdlContext explicit SdlContext(rdpContext* context); SdlContext(const SdlContext& other) = delete; SdlContext(SdlContext&& other) = delete; + ~SdlContext() = default; SdlContext& operator=(const SdlContext& other) = delete; SdlContext& operator=(SdlContext&& other) = delete; diff --git a/client/SDL/SDL3/dialogs/sdl_connection_dialog.hpp b/client/SDL/SDL3/dialogs/sdl_connection_dialog.hpp index dd41905b3..c6e6b64fe 100644 --- a/client/SDL/SDL3/dialogs/sdl_connection_dialog.hpp +++ b/client/SDL/SDL3/dialogs/sdl_connection_dialog.hpp @@ -40,7 +40,7 @@ class SDLConnectionDialog virtual ~SDLConnectionDialog(); SDLConnectionDialog& operator=(const SDLConnectionDialog& other) = delete; - SDLConnectionDialog& operator=(SDLConnectionDialog& other) = delete; + SDLConnectionDialog& operator=(SDLConnectionDialog&& other) = delete; bool visible() const; @@ -119,7 +119,7 @@ class SDLConnectionDialogHider SDLConnectionDialogHider(const SDLConnectionDialogHider& other) = delete; SDLConnectionDialogHider(SDLConnectionDialogHider&& other) = delete; SDLConnectionDialogHider& operator=(const SDLConnectionDialogHider& other) = delete; - SDLConnectionDialogHider& operator=(SDLConnectionDialogHider& other) = delete; + SDLConnectionDialogHider& operator=(SDLConnectionDialogHider&& other) = delete; ~SDLConnectionDialogHider(); diff --git a/client/SDL/SDL3/dialogs/sdl_input.hpp b/client/SDL/SDL3/dialogs/sdl_input.hpp index bbb70f027..9f0be7947 100644 --- a/client/SDL/SDL3/dialogs/sdl_input.hpp +++ b/client/SDL/SDL3/dialogs/sdl_input.hpp @@ -38,6 +38,7 @@ class SdlInputWidget size_t offset, size_t width, size_t height); SdlInputWidget(SdlInputWidget&& other) noexcept; SdlInputWidget(const SdlInputWidget& other) = delete; + ~SdlInputWidget() = default; SdlInputWidget& operator=(const SdlInputWidget& other) = delete; SdlInputWidget& operator=(SdlInputWidget&& other) = delete; diff --git a/client/SDL/SDL3/dialogs/sdl_select.hpp b/client/SDL/SDL3/dialogs/sdl_select.hpp index cba214f0a..ce9b8f1c3 100644 --- a/client/SDL/SDL3/dialogs/sdl_select.hpp +++ b/client/SDL/SDL3/dialogs/sdl_select.hpp @@ -31,6 +31,7 @@ class SdlSelectWidget : public SdlWidget SdlSelectWidget(SDL_Renderer* renderer, std::string label, const SDL_FRect& rect); SdlSelectWidget(SdlSelectWidget&& other) noexcept; SdlSelectWidget(const SdlSelectWidget& other) = delete; + ~SdlSelectWidget() override = default; SdlSelectWidget& operator=(const SdlSelectWidget& other) = delete; SdlSelectWidget& operator=(SdlSelectWidget&& other) = delete; diff --git a/client/SDL/SDL3/sdl_clip.hpp b/client/SDL/SDL3/sdl_clip.hpp index 944a1a1f2..1119c840b 100644 --- a/client/SDL/SDL3/sdl_clip.hpp +++ b/client/SDL/SDL3/sdl_clip.hpp @@ -91,6 +91,12 @@ class sdlClip explicit sdlClip(SdlContext* sdl); virtual ~sdlClip(); + sdlClip(const sdlClip&) = delete; + sdlClip(sdlClip&&) = delete; + + sdlClip& operator=(const sdlClip&) = delete; + sdlClip& operator=(sdlClip&&) = delete; + BOOL init(CliprdrClientContext* clip); BOOL uninit(CliprdrClientContext* clip); diff --git a/client/SDL/SDL3/sdl_freerdp.hpp b/client/SDL/SDL3/sdl_freerdp.hpp index 72e992fea..71afb9dde 100644 --- a/client/SDL/SDL3/sdl_freerdp.hpp +++ b/client/SDL/SDL3/sdl_freerdp.hpp @@ -49,6 +49,7 @@ class SdlContext explicit SdlContext(rdpContext* context); SdlContext(const SdlContext& other) = delete; SdlContext(SdlContext&& other) = delete; + ~SdlContext() = default; SdlContext& operator=(const SdlContext& other) = delete; SdlContext& operator=(SdlContext&& other) = delete; diff --git a/client/SDL/SDL3/sdl_kbd.cpp b/client/SDL/SDL3/sdl_kbd.cpp index f6aa3f3c7..0aedad8da 100644 --- a/client/SDL/SDL3/sdl_kbd.cpp +++ b/client/SDL/SDL3/sdl_kbd.cpp @@ -32,7 +32,6 @@ #include #include -#define TAG CLIENT_TAG("SDL.kbd") typedef struct { diff --git a/client/SDL/common/res/resource.cpp.in b/client/SDL/common/res/resource.cpp.in index 980850285..d884f6b5d 100644 --- a/client/SDL/common/res/resource.cpp.in +++ b/client/SDL/common/res/resource.cpp.in @@ -9,17 +9,17 @@ #include #include "@CLASSNAME@.hpp" -std::string @CLASSNAME@::name() { +std::string @CLASSNAME@::name() noexcept { return "@FILENAME@"; } -std::string @CLASSNAME@::type() { +std::string @CLASSNAME@::type() noexcept { return "@CLASSTYPE@"; } // NOLINTNEXTLINE(clang-diagnostic-global-constructors) const SDLResourceFile @CLASSNAME@::_initializer(type(), name(), init()); -std::vector @CLASSNAME@::init() { +std::vector @CLASSNAME@::init() noexcept { static const unsigned char data[] = { @FILEDATA@ }; diff --git a/client/SDL/common/res/resource.hpp.in b/client/SDL/common/res/resource.hpp.in index da58d8f01..cf32089e0 100644 --- a/client/SDL/common/res/resource.hpp.in +++ b/client/SDL/common/res/resource.hpp.in @@ -17,11 +17,18 @@ class @CLASSNAME@ public: @CLASSNAME@() = delete; + ~@CLASSNAME@() = delete; + + @CLASSNAME@(const @CLASSNAME@&) = delete; + @CLASSNAME@(@CLASSNAME@&&) = delete; - static std::string name(); - static std::string type(); + @CLASSNAME@& operator=(const @CLASSNAME@&) = delete; + @CLASSNAME@& operator=(@CLASSNAME@&&) = delete; + + static std::string name() noexcept; + static std::string type() noexcept; protected: - static std::vector init(); + static std::vector init() noexcept; static const SDLResourceFile _initializer; }; diff --git a/client/SDL/common/res/sdl_resource_file.cpp b/client/SDL/common/res/sdl_resource_file.cpp index 53c47c09f..c614fb8f2 100644 --- a/client/SDL/common/res/sdl_resource_file.cpp +++ b/client/SDL/common/res/sdl_resource_file.cpp @@ -19,7 +19,7 @@ #include "sdl_resource_manager.hpp" SDLResourceFile::SDLResourceFile(const std::string& type, const std::string& id, - const std::vector& data) + const std::vector& data) noexcept { SDLResourceManager::insert(type, id, data); } diff --git a/client/SDL/common/res/sdl_resource_file.hpp b/client/SDL/common/res/sdl_resource_file.hpp index bc7c819f5..bad6af5ab 100644 --- a/client/SDL/common/res/sdl_resource_file.hpp +++ b/client/SDL/common/res/sdl_resource_file.hpp @@ -24,11 +24,11 @@ class SDLResourceFile { public: SDLResourceFile(const std::string& type, const std::string& id, - const std::vector& data); + const std::vector& data) noexcept; virtual ~SDLResourceFile(); SDLResourceFile(const SDLResourceFile& other) = delete; - SDLResourceFile(const SDLResourceFile&& other) = delete; + SDLResourceFile(SDLResourceFile&& other) = delete; SDLResourceFile& operator=(const SDLResourceFile& other) = delete; SDLResourceFile& operator=(SDLResourceFile&& other) = delete; };