From 0f022f4b102e1bef098c9b949abe99fceeec5cce Mon Sep 17 00:00:00 2001 From: Kp Date: Mon, 30 Nov 2020 05:12:00 +0000 Subject: [PATCH] Fix clang build clang warns if all of: - type T is deleted by a pointer T* - T has a non-virtual destructor - T has a virtual function - T is not final Fix the build by making the relevant types T final, since nothing inherited from them. --- common/include/ui.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/common/include/ui.h b/common/include/ui.h index e68e5a114..c9a649d0b 100644 --- a/common/include/ui.h +++ b/common/include/ui.h @@ -86,7 +86,7 @@ protected: ~UI_GADGET() = default; }; -struct UI_GADGET_USERBOX : UI_GADGET +struct UI_GADGET_USERBOX final : UI_GADGET { static constexpr auto s_kind = std::integral_constant{}; virtual window_event_result event_handler(UI_DIALOG &dlg, const d_event &event) override; @@ -104,7 +104,7 @@ struct UI_GADGET_USERBOX : UI_GADGET grs_bitmap * bitmap; }; -struct UI_GADGET_BUTTON : UI_GADGET +struct UI_GADGET_BUTTON final : UI_GADGET { static constexpr auto s_kind = std::integral_constant{}; virtual window_event_result event_handler(UI_DIALOG &dlg, const d_event &event) override; @@ -119,7 +119,7 @@ struct UI_GADGET_BUTTON : UI_GADGET int (*user_function1)(void); }; -struct UI_GADGET_INPUTBOX : UI_GADGET +struct UI_GADGET_INPUTBOX final : UI_GADGET { static constexpr auto s_kind = std::integral_constant{}; virtual window_event_result event_handler(UI_DIALOG &dlg, const d_event &event) override; @@ -132,7 +132,7 @@ struct UI_GADGET_INPUTBOX : UI_GADGET short first_time; }; -struct UI_GADGET_RADIO : UI_GADGET +struct UI_GADGET_RADIO final : UI_GADGET { static constexpr auto s_kind = std::integral_constant{}; virtual window_event_result event_handler(UI_DIALOG &dlg, const d_event &event) override; @@ -145,7 +145,7 @@ struct UI_GADGET_RADIO : UI_GADGET short flag; }; -struct UI_GADGET_ICON : UI_GADGET +struct UI_GADGET_ICON final : UI_GADGET { static constexpr auto s_kind = std::integral_constant{}; virtual window_event_result event_handler(UI_DIALOG &dlg, const d_event &event) override; @@ -159,7 +159,7 @@ struct UI_GADGET_ICON : UI_GADGET int (*user_function)(void); }; -struct UI_GADGET_CHECKBOX : UI_GADGET +struct UI_GADGET_CHECKBOX final : UI_GADGET { static constexpr auto s_kind = std::integral_constant{}; virtual window_event_result event_handler(UI_DIALOG &dlg, const d_event &event) override; @@ -172,7 +172,7 @@ struct UI_GADGET_CHECKBOX : UI_GADGET short flag; }; -struct UI_GADGET_SCROLLBAR : UI_GADGET +struct UI_GADGET_SCROLLBAR final : UI_GADGET { static constexpr auto s_kind = std::integral_constant{}; virtual window_event_result event_handler(UI_DIALOG &dlg, const d_event &event) override; @@ -193,7 +193,7 @@ struct UI_GADGET_SCROLLBAR : UI_GADGET int moved; }; -struct UI_GADGET_LISTBOX : UI_GADGET +struct UI_GADGET_LISTBOX final : UI_GADGET { static constexpr auto s_kind = std::integral_constant{}; virtual window_event_result event_handler(UI_DIALOG &dlg, const d_event &event) override;