diff --git a/Userland/Libraries/LibGUI/AboutDialog.cpp b/Userland/Libraries/LibGUI/AboutDialog.cpp index 9791cb618f5..c0ae44b967e 100644 --- a/Userland/Libraries/LibGUI/AboutDialog.cpp +++ b/Userland/Libraries/LibGUI/AboutDialog.cpp @@ -1,5 +1,6 @@ /* * Copyright (c) 2018-2020, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -85,8 +86,4 @@ AboutDialog::AboutDialog(StringView name, const Gfx::Bitmap* icon, Window* paren }; } -AboutDialog::~AboutDialog() -{ -} - } diff --git a/Userland/Libraries/LibGUI/AboutDialog.h b/Userland/Libraries/LibGUI/AboutDialog.h index 840ae8295ec..4fb3ac3ee4e 100644 --- a/Userland/Libraries/LibGUI/AboutDialog.h +++ b/Userland/Libraries/LibGUI/AboutDialog.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2018-2020, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -14,7 +15,7 @@ namespace GUI { class AboutDialog final : public Dialog { C_OBJECT(AboutDialog) public: - virtual ~AboutDialog() override; + virtual ~AboutDialog() override = default; static void show(StringView name, const Gfx::Bitmap* icon = nullptr, Window* parent_window = nullptr, const Gfx::Bitmap* window_icon = nullptr, StringView version = Core::Version::SERENITY_VERSION) { diff --git a/Userland/Libraries/LibGUI/AbstractButton.cpp b/Userland/Libraries/LibGUI/AbstractButton.cpp index 2a682f30abd..4697c490b06 100644 --- a/Userland/Libraries/LibGUI/AbstractButton.cpp +++ b/Userland/Libraries/LibGUI/AbstractButton.cpp @@ -1,5 +1,6 @@ /* * Copyright (c) 2018-2021, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -32,10 +33,6 @@ AbstractButton::AbstractButton(String text) REGISTER_BOOL_PROPERTY("exclusive", is_exclusive, set_exclusive); } -AbstractButton::~AbstractButton() -{ -} - void AbstractButton::set_text(String text) { if (m_text == text) diff --git a/Userland/Libraries/LibGUI/AbstractButton.h b/Userland/Libraries/LibGUI/AbstractButton.h index 649d713dd2e..40c3b71d56d 100644 --- a/Userland/Libraries/LibGUI/AbstractButton.h +++ b/Userland/Libraries/LibGUI/AbstractButton.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2018-2020, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -15,7 +16,7 @@ class AbstractButton : public Widget { C_OBJECT_ABSTRACT(AbstractButton); public: - virtual ~AbstractButton() override; + virtual ~AbstractButton() override = default; Function on_checked; diff --git a/Userland/Libraries/LibGUI/AbstractScrollableWidget.cpp b/Userland/Libraries/LibGUI/AbstractScrollableWidget.cpp index 77ec27eda2f..b1a022f1a97 100644 --- a/Userland/Libraries/LibGUI/AbstractScrollableWidget.cpp +++ b/Userland/Libraries/LibGUI/AbstractScrollableWidget.cpp @@ -1,5 +1,6 @@ /* * Copyright (c) 2018-2021, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -37,10 +38,6 @@ AbstractScrollableWidget::AbstractScrollableWidget() }; } -AbstractScrollableWidget::~AbstractScrollableWidget() -{ -} - void AbstractScrollableWidget::handle_wheel_event(MouseEvent& event, Widget& event_source) { if (!m_scrollbars_enabled) { diff --git a/Userland/Libraries/LibGUI/AbstractScrollableWidget.h b/Userland/Libraries/LibGUI/AbstractScrollableWidget.h index 01a6647abba..fdc3ff5d127 100644 --- a/Userland/Libraries/LibGUI/AbstractScrollableWidget.h +++ b/Userland/Libraries/LibGUI/AbstractScrollableWidget.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2018-2021, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -15,7 +16,7 @@ class AbstractScrollableWidget : public Frame { C_OBJECT_ABSTRACT(AbstractScrollableWidget); public: - virtual ~AbstractScrollableWidget() override; + virtual ~AbstractScrollableWidget() override = default; Gfx::IntSize content_size() const { return m_content_size; } int content_width() const { return m_content_size.width(); } diff --git a/Userland/Libraries/LibGUI/AbstractSlider.cpp b/Userland/Libraries/LibGUI/AbstractSlider.cpp index 97b353b3c4c..9759df20fe9 100644 --- a/Userland/Libraries/LibGUI/AbstractSlider.cpp +++ b/Userland/Libraries/LibGUI/AbstractSlider.cpp @@ -1,5 +1,6 @@ /* * Copyright (c) 2018-2020, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -25,10 +26,6 @@ AbstractSlider::AbstractSlider(Orientation orientation) { Orientation::Vertical, "Vertical" }); } -AbstractSlider::~AbstractSlider() -{ -} - void AbstractSlider::set_orientation(Orientation value) { if (m_orientation == value) diff --git a/Userland/Libraries/LibGUI/AbstractSlider.h b/Userland/Libraries/LibGUI/AbstractSlider.h index 10e3fc829d9..83c29254d84 100644 --- a/Userland/Libraries/LibGUI/AbstractSlider.h +++ b/Userland/Libraries/LibGUI/AbstractSlider.h @@ -14,7 +14,7 @@ class AbstractSlider : public Widget { C_OBJECT_ABSTRACT(AbstractSlider); public: - virtual ~AbstractSlider() override; + virtual ~AbstractSlider() override = default; void set_orientation(Orientation value); Orientation orientation() const { return m_orientation; } diff --git a/Userland/Libraries/LibGUI/AbstractTableView.cpp b/Userland/Libraries/LibGUI/AbstractTableView.cpp index 91fb4d33bdf..eded7cf0846 100644 --- a/Userland/Libraries/LibGUI/AbstractTableView.cpp +++ b/Userland/Libraries/LibGUI/AbstractTableView.cpp @@ -1,5 +1,6 @@ /* * Copyright (c) 2018-2020, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -34,10 +35,6 @@ AbstractTableView::AbstractTableView() set_should_hide_unnecessary_scrollbars(true); } -AbstractTableView::~AbstractTableView() -{ -} - void AbstractTableView::select_all() { selection().clear(); diff --git a/Userland/Libraries/LibGUI/AbstractTableView.h b/Userland/Libraries/LibGUI/AbstractTableView.h index 996f33487b2..d4e43b00ce1 100644 --- a/Userland/Libraries/LibGUI/AbstractTableView.h +++ b/Userland/Libraries/LibGUI/AbstractTableView.h @@ -1,6 +1,7 @@ /* * Copyright (c) 2018-2020, Andreas Kling * Copyright (c) 2022, Jakob-Niklas See + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -8,12 +9,14 @@ #pragma once #include +#include +#include namespace GUI { class TableCellPaintingDelegate { public: - virtual ~TableCellPaintingDelegate() { } + virtual ~TableCellPaintingDelegate() = default; virtual bool should_paint(ModelIndex const&) { return true; } virtual void paint(Painter&, const Gfx::IntRect&, const Gfx::Palette&, const ModelIndex&) = 0; @@ -82,7 +85,7 @@ public: virtual void model_did_update(unsigned flags) override; protected: - virtual ~AbstractTableView() override; + virtual ~AbstractTableView() override = default; AbstractTableView(); virtual void mousedown_event(MouseEvent&) override; diff --git a/Userland/Libraries/LibGUI/Action.h b/Userland/Libraries/LibGUI/Action.h index 7823796714c..b1eca83b7a2 100644 --- a/Userland/Libraries/LibGUI/Action.h +++ b/Userland/Libraries/LibGUI/Action.h @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include diff --git a/Userland/Libraries/LibGUI/ActionGroup.h b/Userland/Libraries/LibGUI/ActionGroup.h index 090b7c0d9eb..505b413ca2a 100644 --- a/Userland/Libraries/LibGUI/ActionGroup.h +++ b/Userland/Libraries/LibGUI/ActionGroup.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2018-2020, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -14,8 +15,8 @@ namespace GUI { class ActionGroup : public Weakable { public: - ActionGroup() { } - ~ActionGroup() { } + ActionGroup() = default; + ~ActionGroup() = default; void add_action(Action&); void remove_action(Action&); diff --git a/Userland/Libraries/LibGUI/AutocompleteProvider.cpp b/Userland/Libraries/LibGUI/AutocompleteProvider.cpp index 87104bcfc3d..82a46800f2d 100644 --- a/Userland/Libraries/LibGUI/AutocompleteProvider.cpp +++ b/Userland/Libraries/LibGUI/AutocompleteProvider.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, the SerenityOS developers. + * Copyright (c) 2020-2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -84,8 +84,6 @@ private: Vector m_suggestions; }; -AutocompleteBox::~AutocompleteBox() { } - AutocompleteBox::AutocompleteBox(TextEditor& editor) : m_editor(editor) { diff --git a/Userland/Libraries/LibGUI/AutocompleteProvider.h b/Userland/Libraries/LibGUI/AutocompleteProvider.h index 4bdebc7a2d7..d9e95739183 100644 --- a/Userland/Libraries/LibGUI/AutocompleteProvider.h +++ b/Userland/Libraries/LibGUI/AutocompleteProvider.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, the SerenityOS developers. + * Copyright (c) 2020-2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -20,7 +20,7 @@ class AutocompleteProvider { AK_MAKE_NONMOVABLE(AutocompleteProvider); public: - virtual ~AutocompleteProvider() { } + virtual ~AutocompleteProvider() = default; enum class Language { Unspecified, @@ -103,7 +103,7 @@ public: void detach() { m_editor.clear(); } protected: - AutocompleteProvider() { } + AutocompleteProvider() = default; WeakPtr m_editor; }; @@ -111,7 +111,7 @@ protected: class AutocompleteBox final { public: explicit AutocompleteBox(TextEditor&); - ~AutocompleteBox(); + ~AutocompleteBox() = default; void update_suggestions(Vector&& suggestions); bool is_visible() const; diff --git a/Userland/Libraries/LibGUI/BoxLayout.h b/Userland/Libraries/LibGUI/BoxLayout.h index 433c5bf4bbc..6e6921d59cb 100644 --- a/Userland/Libraries/LibGUI/BoxLayout.h +++ b/Userland/Libraries/LibGUI/BoxLayout.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2018-2020, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -16,7 +17,7 @@ class BoxLayout : public Layout { C_OBJECT(BoxLayout); public: - virtual ~BoxLayout() override { } + virtual ~BoxLayout() override = default; Gfx::Orientation orientation() const { return m_orientation; } @@ -41,7 +42,7 @@ private: : BoxLayout(Gfx::Orientation::Vertical) { } - virtual ~VerticalBoxLayout() override { } + virtual ~VerticalBoxLayout() override = default; }; class HorizontalBoxLayout final : public BoxLayout { @@ -52,7 +53,7 @@ private: : BoxLayout(Gfx::Orientation::Horizontal) { } - virtual ~HorizontalBoxLayout() override { } + virtual ~HorizontalBoxLayout() override = default; }; } diff --git a/Userland/Libraries/LibGUI/Breadcrumbbar.cpp b/Userland/Libraries/LibGUI/Breadcrumbbar.cpp index 8c0f29b5911..3cf593c4707 100644 --- a/Userland/Libraries/LibGUI/Breadcrumbbar.cpp +++ b/Userland/Libraries/LibGUI/Breadcrumbbar.cpp @@ -1,6 +1,7 @@ /* * Copyright (c) 2020, Andreas Kling * Copyright (c) 2021, Sam Atkins + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -20,7 +21,7 @@ class BreadcrumbButton : public Button { C_OBJECT(BreadcrumbButton); public: - virtual ~BreadcrumbButton() override { } + virtual ~BreadcrumbButton() override = default; virtual bool is_uncheckable() const override { return false; } virtual void drop_event(DropEvent& event) override @@ -54,7 +55,7 @@ public: Function on_drag_enter; private: - BreadcrumbButton() { } + BreadcrumbButton() = default; }; Breadcrumbbar::Breadcrumbbar() @@ -63,10 +64,6 @@ Breadcrumbbar::Breadcrumbbar() layout.set_spacing(0); } -Breadcrumbbar::~Breadcrumbbar() -{ -} - void Breadcrumbbar::clear_segments() { m_segments.clear(); diff --git a/Userland/Libraries/LibGUI/Breadcrumbbar.h b/Userland/Libraries/LibGUI/Breadcrumbbar.h index b07dbe39517..93515eada3e 100644 --- a/Userland/Libraries/LibGUI/Breadcrumbbar.h +++ b/Userland/Libraries/LibGUI/Breadcrumbbar.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2020, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -14,7 +15,7 @@ class Breadcrumbbar : public GUI::Widget { C_OBJECT(Breadcrumbbar); public: - virtual ~Breadcrumbbar() override; + virtual ~Breadcrumbbar() override = default; void clear_segments(); void append_segment(String text, Gfx::Bitmap const* icon = nullptr, String data = {}, String tooltip = {}); diff --git a/Userland/Libraries/LibGUI/Button.h b/Userland/Libraries/LibGUI/Button.h index 5cb06ef25de..73c4102a81d 100644 --- a/Userland/Libraries/LibGUI/Button.h +++ b/Userland/Libraries/LibGUI/Button.h @@ -8,6 +8,7 @@ #include #include +#include #include #include #include diff --git a/Userland/Libraries/LibGUI/CMakeLists.txt b/Userland/Libraries/LibGUI/CMakeLists.txt index 48fb661c9ba..cc10cbfbd4d 100644 --- a/Userland/Libraries/LibGUI/CMakeLists.txt +++ b/Userland/Libraries/LibGUI/CMakeLists.txt @@ -26,7 +26,6 @@ set(SOURCES CommonActions.cpp CommonLocationsProvider.cpp ComboBox.cpp - Command.cpp CommandPalette.cpp Desktop.cpp Dialog.cpp diff --git a/Userland/Libraries/LibGUI/Calendar.cpp b/Userland/Libraries/LibGUI/Calendar.cpp index 229b036551e..06f9f2ca1a9 100644 --- a/Userland/Libraries/LibGUI/Calendar.cpp +++ b/Userland/Libraries/LibGUI/Calendar.cpp @@ -1,6 +1,6 @@ /* * Copyright (c) 2019-2020, Ryan Grieb - * Copyright (c) 2020-2021, the SerenityOS developers. + * Copyright (c) 2020-2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -62,10 +62,6 @@ Calendar::Calendar(Core::DateTime date_time, Mode mode) update_tiles(m_selected_date.year(), m_selected_date.month()); } -Calendar::~Calendar() -{ -} - void Calendar::set_grid(bool show) { if (m_grid == show) diff --git a/Userland/Libraries/LibGUI/Calendar.h b/Userland/Libraries/LibGUI/Calendar.h index 017a1182b2d..72d653fc6e0 100644 --- a/Userland/Libraries/LibGUI/Calendar.h +++ b/Userland/Libraries/LibGUI/Calendar.h @@ -1,6 +1,6 @@ /* * Copyright (c) 2019-2020, Ryan Grieb - * Copyright (c) 2020-2021, the SerenityOS developers. + * Copyright (c) 2020-2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -73,7 +73,7 @@ public: private: Calendar(Core::DateTime date_time = Core::DateTime::now(), Mode mode = Month); - virtual ~Calendar() override; + virtual ~Calendar() override = default; virtual void resize_event(GUI::ResizeEvent&) override; virtual void paint_event(GUI::PaintEvent&) override; diff --git a/Userland/Libraries/LibGUI/CheckBox.cpp b/Userland/Libraries/LibGUI/CheckBox.cpp index 2cfd26d88c1..207df1f0c02 100644 --- a/Userland/Libraries/LibGUI/CheckBox.cpp +++ b/Userland/Libraries/LibGUI/CheckBox.cpp @@ -1,5 +1,6 @@ /* * Copyright (c) 2018-2020, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -28,10 +29,6 @@ CheckBox::CheckBox(String text) set_fixed_height(22); } -CheckBox::~CheckBox() -{ -} - void CheckBox::paint_event(PaintEvent& event) { Painter painter(*this); diff --git a/Userland/Libraries/LibGUI/CheckBox.h b/Userland/Libraries/LibGUI/CheckBox.h index 6a663001524..bbc882f6a8e 100644 --- a/Userland/Libraries/LibGUI/CheckBox.h +++ b/Userland/Libraries/LibGUI/CheckBox.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2018-2020, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -14,7 +15,7 @@ class CheckBox : public AbstractButton { C_OBJECT(CheckBox); public: - virtual ~CheckBox() override; + virtual ~CheckBox() override = default; virtual void click(unsigned modifiers = 0) override; diff --git a/Userland/Libraries/LibGUI/ColorInput.cpp b/Userland/Libraries/LibGUI/ColorInput.cpp index 383df59025f..ec524009820 100644 --- a/Userland/Libraries/LibGUI/ColorInput.cpp +++ b/Userland/Libraries/LibGUI/ColorInput.cpp @@ -1,5 +1,6 @@ /* * Copyright (c) 2020, Hüseyin Aslıtürk + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -29,10 +30,6 @@ ColorInput::ColorInput() REGISTER_BOOL_PROPERTY("has_alpha_channel", has_alpha_channel, set_color_has_alpha_channel); } -ColorInput::~ColorInput() -{ -} - Gfx::IntRect ColorInput::color_rect() const { auto color_box_padding = 3; diff --git a/Userland/Libraries/LibGUI/ColorInput.h b/Userland/Libraries/LibGUI/ColorInput.h index 32c6467838f..099478cef53 100644 --- a/Userland/Libraries/LibGUI/ColorInput.h +++ b/Userland/Libraries/LibGUI/ColorInput.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2020, Hüseyin Aslıtürk + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -15,7 +16,7 @@ class ColorInput final : public TextEditor { C_OBJECT(ColorInput); public: - virtual ~ColorInput() override; + virtual ~ColorInput() override = default; bool has_alpha_channel() const { return m_color_has_alpha_channel; } void set_color_has_alpha_channel(bool has_alpha) { m_color_has_alpha_channel = has_alpha; } diff --git a/Userland/Libraries/LibGUI/ColorPicker.cpp b/Userland/Libraries/LibGUI/ColorPicker.cpp index 4736c451e26..3711d7858e9 100644 --- a/Userland/Libraries/LibGUI/ColorPicker.cpp +++ b/Userland/Libraries/LibGUI/ColorPicker.cpp @@ -1,5 +1,6 @@ /* * Copyright (c) 2018-2020, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -22,7 +23,7 @@ class ColorButton : public AbstractButton { C_OBJECT(ColorButton); public: - virtual ~ColorButton() override; + virtual ~ColorButton() override = default; void set_selected(bool selected); Color color() const { return m_color; } @@ -146,7 +147,7 @@ public: return m_col; } - virtual ~ColorSelectOverlay() override { } + virtual ~ColorSelectOverlay() override = default; Function on_color_changed; private: @@ -193,10 +194,6 @@ ColorPicker::ColorPicker(Color color, Window* parent_window, String title) build_ui(); } -ColorPicker::~ColorPicker() -{ -} - void ColorPicker::set_color_has_alpha_channel(bool has_alpha) { if (m_color_has_alpha_channel == has_alpha) @@ -458,10 +455,6 @@ ColorButton::ColorButton(ColorPicker& picker, Color color) m_color = color; } -ColorButton::~ColorButton() -{ -} - void ColorButton::set_selected(bool selected) { m_selected = selected; diff --git a/Userland/Libraries/LibGUI/ColorPicker.h b/Userland/Libraries/LibGUI/ColorPicker.h index fb9ed0eee3b..2021e858510 100644 --- a/Userland/Libraries/LibGUI/ColorPicker.h +++ b/Userland/Libraries/LibGUI/ColorPicker.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2018-2020, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -20,7 +21,7 @@ class ColorPicker final : public Dialog { C_OBJECT(ColorPicker) public: - virtual ~ColorPicker() override; + virtual ~ColorPicker() override = default; bool color_has_alpha_channel() const { return m_color_has_alpha_channel; } void set_color_has_alpha_channel(bool); diff --git a/Userland/Libraries/LibGUI/ColumnsView.cpp b/Userland/Libraries/LibGUI/ColumnsView.cpp index 6b409656ac3..67ba0bce1b3 100644 --- a/Userland/Libraries/LibGUI/ColumnsView.cpp +++ b/Userland/Libraries/LibGUI/ColumnsView.cpp @@ -35,10 +35,6 @@ ColumnsView::ColumnsView() m_columns.append({ {}, 0 }); } -ColumnsView::~ColumnsView() -{ -} - void ColumnsView::select_all() { Vector columns_for_selection; diff --git a/Userland/Libraries/LibGUI/ColumnsView.h b/Userland/Libraries/LibGUI/ColumnsView.h index d0c7a29dee5..3f37463106f 100644 --- a/Userland/Libraries/LibGUI/ColumnsView.h +++ b/Userland/Libraries/LibGUI/ColumnsView.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2020, Sergey Bugaev + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -23,7 +24,7 @@ public: private: ColumnsView(); - virtual ~ColumnsView() override; + virtual ~ColumnsView() override = default; void push_column(const ModelIndex& parent_index); void update_column_sizes(); diff --git a/Userland/Libraries/LibGUI/ComboBox.cpp b/Userland/Libraries/LibGUI/ComboBox.cpp index 8060764999a..294461fc457 100644 --- a/Userland/Libraries/LibGUI/ComboBox.cpp +++ b/Userland/Libraries/LibGUI/ComboBox.cpp @@ -1,5 +1,6 @@ /* * Copyright (c) 2018-2020, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -137,9 +138,7 @@ ComboBox::ComboBox() }; } -ComboBox::~ComboBox() -{ -} +ComboBox::~ComboBox() = default; void ComboBox::set_editor_placeholder(StringView placeholder) { diff --git a/Userland/Libraries/LibGUI/Command.cpp b/Userland/Libraries/LibGUI/Command.cpp deleted file mode 100644 index c13917e926d..00000000000 --- a/Userland/Libraries/LibGUI/Command.cpp +++ /dev/null @@ -1,15 +0,0 @@ -/* - * Copyright (c) 2018-2020, Andreas Kling - * - * SPDX-License-Identifier: BSD-2-Clause - */ - -#include - -namespace GUI { - -Command::~Command() -{ -} - -} diff --git a/Userland/Libraries/LibGUI/Command.h b/Userland/Libraries/LibGUI/Command.h index e7db7d76787..1bff5a10d05 100644 --- a/Userland/Libraries/LibGUI/Command.h +++ b/Userland/Libraries/LibGUI/Command.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2018-2020, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -12,7 +13,7 @@ namespace GUI { class Command { public: - virtual ~Command(); + virtual ~Command() = default; virtual void undo() { } virtual void redo() { } @@ -21,7 +22,7 @@ public: virtual bool merge_with(Command const&) { return false; } protected: - Command() { } + Command() = default; }; } diff --git a/Userland/Libraries/LibGUI/CommandPalette.cpp b/Userland/Libraries/LibGUI/CommandPalette.cpp index 78ac4130719..81b502e4007 100644 --- a/Userland/Libraries/LibGUI/CommandPalette.cpp +++ b/Userland/Libraries/LibGUI/CommandPalette.cpp @@ -1,6 +1,7 @@ /* * Copyright (c) 2022, Andreas Kling * Copyright (c) 2022, Jakob-Niklas See + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -34,7 +35,7 @@ AK_ENUM_BITWISE_OPERATORS(IconFlags); class ActionIconDelegate final : public GUI::TableCellPaintingDelegate { public: - virtual ~ActionIconDelegate() override { } + virtual ~ActionIconDelegate() override = default; bool should_paint(ModelIndex const& index) override { @@ -76,7 +77,7 @@ public: { } - virtual ~ActionModel() override { } + virtual ~ActionModel() override = default; virtual int row_count(ModelIndex const& parent_index) const override { @@ -218,10 +219,6 @@ CommandPalette::CommandPalette(GUI::Window& parent_window, ScreenPosition screen m_text_box->set_focus(true); } -CommandPalette::~CommandPalette() -{ -} - void CommandPalette::collect_actions(GUI::Window& parent_window) { OrderedHashTable> actions; diff --git a/Userland/Libraries/LibGUI/CommandPalette.h b/Userland/Libraries/LibGUI/CommandPalette.h index 998f7f489ef..5e1853c7ab1 100644 --- a/Userland/Libraries/LibGUI/CommandPalette.h +++ b/Userland/Libraries/LibGUI/CommandPalette.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2022, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -20,7 +21,7 @@ public: private: explicit CommandPalette(GUI::Window& parent_window, ScreenPosition screen_position = CenterWithinParent); - virtual ~CommandPalette() override; + virtual ~CommandPalette() override = default; void collect_actions(GUI::Window& parent_window); void finish_with_index(GUI::ModelIndex const&); diff --git a/Userland/Libraries/LibGUI/Desktop.cpp b/Userland/Libraries/LibGUI/Desktop.cpp index 81003eeae14..f962a005c97 100644 --- a/Userland/Libraries/LibGUI/Desktop.cpp +++ b/Userland/Libraries/LibGUI/Desktop.cpp @@ -1,5 +1,6 @@ /* * Copyright (c) 2018-2020, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -21,10 +22,6 @@ Desktop& Desktop::the() return s_the; } -Desktop::Desktop() -{ -} - void Desktop::did_receive_screen_rects(Badge, const Vector& rects, size_t main_screen_index, unsigned workspace_rows, unsigned workspace_columns) { m_main_screen_index = main_screen_index; diff --git a/Userland/Libraries/LibGUI/Desktop.h b/Userland/Libraries/LibGUI/Desktop.h index 788aef4785e..82f5143fb35 100644 --- a/Userland/Libraries/LibGUI/Desktop.h +++ b/Userland/Libraries/LibGUI/Desktop.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2018-2020, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -23,7 +24,7 @@ public: static constexpr size_t default_screen_rect_count = 4; static Desktop& the(); - Desktop(); + Desktop() = default; void set_background_color(StringView background_color); diff --git a/Userland/Libraries/LibGUI/Dialog.cpp b/Userland/Libraries/LibGUI/Dialog.cpp index 2993433d12f..07d6cdb36c6 100644 --- a/Userland/Libraries/LibGUI/Dialog.cpp +++ b/Userland/Libraries/LibGUI/Dialog.cpp @@ -1,5 +1,6 @@ /* * Copyright (c) 2018-2020, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -19,10 +20,6 @@ Dialog::Dialog(Window* parent_window, ScreenPosition screen_position) set_minimizable(false); } -Dialog::~Dialog() -{ -} - int Dialog::exec() { VERIFY(!m_event_loop); diff --git a/Userland/Libraries/LibGUI/Dialog.h b/Userland/Libraries/LibGUI/Dialog.h index 8fccf6ab50c..259e3462614 100644 --- a/Userland/Libraries/LibGUI/Dialog.h +++ b/Userland/Libraries/LibGUI/Dialog.h @@ -1,11 +1,13 @@ /* * Copyright (c) 2018-2020, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ #pragma once +#include #include namespace GUI { @@ -36,7 +38,7 @@ public: BottomRight = 9, }; - virtual ~Dialog() override; + virtual ~Dialog() override = default; int exec(); diff --git a/Userland/Libraries/LibGUI/DragOperation.cpp b/Userland/Libraries/LibGUI/DragOperation.cpp index c521f90bdcd..839b1f8aef6 100644 --- a/Userland/Libraries/LibGUI/DragOperation.cpp +++ b/Userland/Libraries/LibGUI/DragOperation.cpp @@ -1,5 +1,6 @@ /* * Copyright (c) 2018-2020, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -20,10 +21,6 @@ DragOperation::DragOperation(Core::Object* parent) { } -DragOperation::~DragOperation() -{ -} - DragOperation::Outcome DragOperation::exec() { VERIFY(!s_current_drag_operation); diff --git a/Userland/Libraries/LibGUI/DragOperation.h b/Userland/Libraries/LibGUI/DragOperation.h index 7b9107c577a..647e728d7c7 100644 --- a/Userland/Libraries/LibGUI/DragOperation.h +++ b/Userland/Libraries/LibGUI/DragOperation.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2018-2020, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -23,7 +24,7 @@ public: Cancelled, }; - virtual ~DragOperation() override; + virtual ~DragOperation() override = default; void set_mime_data(RefPtr mime_data) { m_mime_data = move(mime_data); } void set_text(const String& text); diff --git a/Userland/Libraries/LibGUI/EditingEngine.cpp b/Userland/Libraries/LibGUI/EditingEngine.cpp index 9a4526f441a..0141ffee11a 100644 --- a/Userland/Libraries/LibGUI/EditingEngine.cpp +++ b/Userland/Libraries/LibGUI/EditingEngine.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, the SerenityOS developers. + * Copyright (c) 2021-2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -21,10 +21,6 @@ constexpr bool is_vim_punctuation(u32 code_point) return is_ascii_punctuation(code_point) && code_point != '_'; } -EditingEngine::~EditingEngine() -{ -} - void EditingEngine::attach(TextEditor& editor) { VERIFY(!m_editor); diff --git a/Userland/Libraries/LibGUI/EditingEngine.h b/Userland/Libraries/LibGUI/EditingEngine.h index a7588191b7f..3b0e617cc74 100644 --- a/Userland/Libraries/LibGUI/EditingEngine.h +++ b/Userland/Libraries/LibGUI/EditingEngine.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, the SerenityOS developers. + * Copyright (c) 2021-2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -27,7 +27,7 @@ class EditingEngine { AK_MAKE_NONMOVABLE(EditingEngine); public: - virtual ~EditingEngine(); + virtual ~EditingEngine() = default; virtual CursorWidth cursor_width() const { return NARROW; } @@ -46,7 +46,7 @@ public: bool is_vim() const { return engine_type() == EngineType::Vim; } protected: - EditingEngine() { } + EditingEngine() = default; WeakPtr m_editor; diff --git a/Userland/Libraries/LibGUI/Event.cpp b/Userland/Libraries/LibGUI/Event.cpp index 7cc272becd8..414e21576de 100644 --- a/Userland/Libraries/LibGUI/Event.cpp +++ b/Userland/Libraries/LibGUI/Event.cpp @@ -1,5 +1,6 @@ /* * Copyright (c) 2020-2021, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -19,10 +20,6 @@ DropEvent::DropEvent(const Gfx::IntPoint& position, const String& text, NonnullR { } -DropEvent::~DropEvent() -{ -} - String KeyEvent::to_string() const { Vector parts; @@ -56,8 +53,4 @@ ActionEvent::ActionEvent(Type type, Action& action) { } -ActionEvent::~ActionEvent() -{ -} - } diff --git a/Userland/Libraries/LibGUI/Event.h b/Userland/Libraries/LibGUI/Event.h index 20340ec04e0..d3018b2dfa8 100644 --- a/Userland/Libraries/LibGUI/Event.h +++ b/Userland/Libraries/LibGUI/Event.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2018-2020, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -72,12 +73,12 @@ public: __End_WM_Events, }; - Event() { } + Event() = default; explicit Event(Type type) : Core::Event(type) { } - virtual ~Event() { } + virtual ~Event() = default; bool is_key_event() const { return type() == KeyUp || type() == KeyDown; } bool is_paint_event() const { return type() == Paint; } @@ -454,7 +455,7 @@ class DropEvent final : public Event { public: DropEvent(const Gfx::IntPoint&, const String& text, NonnullRefPtr mime_data); - ~DropEvent(); + ~DropEvent() = default; const Gfx::IntPoint& position() const { return m_position; } const String& text() const { return m_text; } @@ -530,7 +531,7 @@ private: class ActionEvent final : public Event { public: ActionEvent(Type, Action&); - ~ActionEvent(); + ~ActionEvent() = default; Action const& action() const { return *m_action; } Action& action() { return *m_action; } diff --git a/Userland/Libraries/LibGUI/FileSystemModel.cpp b/Userland/Libraries/LibGUI/FileSystemModel.cpp index 89840db8b2d..1bf7fbcc048 100644 --- a/Userland/Libraries/LibGUI/FileSystemModel.cpp +++ b/Userland/Libraries/LibGUI/FileSystemModel.cpp @@ -1,6 +1,7 @@ /* * Copyright (c) 2018-2020, Andreas Kling * Copyright (c) 2021, sin-ack + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -271,10 +272,6 @@ FileSystemModel::FileSystemModel(String root_path, Mode mode) invalidate(); } -FileSystemModel::~FileSystemModel() -{ -} - String FileSystemModel::name_for_uid(uid_t uid) const { auto it = m_user_names.find(uid); diff --git a/Userland/Libraries/LibGUI/FileSystemModel.h b/Userland/Libraries/LibGUI/FileSystemModel.h index 4eede5e947f..6fd6c9baf4a 100644 --- a/Userland/Libraries/LibGUI/FileSystemModel.h +++ b/Userland/Libraries/LibGUI/FileSystemModel.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2018-2020, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -43,7 +44,7 @@ public: }; struct Node { - ~Node() { } + ~Node() = default; String name; String symlink_target; @@ -102,7 +103,7 @@ public: { return adopt_ref(*new FileSystemModel(root_path, mode)); } - virtual ~FileSystemModel() override; + virtual ~FileSystemModel() override = default; String root_path() const { return m_root_path; } void set_root_path(String); diff --git a/Userland/Libraries/LibGUI/FontPicker.cpp b/Userland/Libraries/LibGUI/FontPicker.cpp index 98f231076de..6def60e8f41 100644 --- a/Userland/Libraries/LibGUI/FontPicker.cpp +++ b/Userland/Libraries/LibGUI/FontPicker.cpp @@ -1,5 +1,6 @@ /* * Copyright (c) 2020, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -169,10 +170,6 @@ FontPicker::FontPicker(Window* parent_window, const Gfx::Font* current_font, boo set_font(current_font); } -FontPicker::~FontPicker() -{ -} - void FontPicker::set_font(const Gfx::Font* font) { if (m_font == font) diff --git a/Userland/Libraries/LibGUI/FontPicker.h b/Userland/Libraries/LibGUI/FontPicker.h index 087f0a469e6..a40a28f1688 100644 --- a/Userland/Libraries/LibGUI/FontPicker.h +++ b/Userland/Libraries/LibGUI/FontPicker.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2020, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -16,7 +17,7 @@ class FontPicker final : public GUI::Dialog { C_OBJECT(FontPicker); public: - virtual ~FontPicker() override; + virtual ~FontPicker() override = default; RefPtr font() const { return m_font; } void set_font(const Gfx::Font*); diff --git a/Userland/Libraries/LibGUI/Frame.cpp b/Userland/Libraries/LibGUI/Frame.cpp index d82bf4d7fed..cf5d676fbea 100644 --- a/Userland/Libraries/LibGUI/Frame.cpp +++ b/Userland/Libraries/LibGUI/Frame.cpp @@ -1,5 +1,6 @@ /* * Copyright (c) 2018-2020, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -32,10 +33,6 @@ Frame::Frame() { Gfx::FrameShape::Window, "Window" }); } -Frame::~Frame() -{ -} - void Frame::set_frame_thickness(int thickness) { if (m_thickness == thickness) diff --git a/Userland/Libraries/LibGUI/Frame.h b/Userland/Libraries/LibGUI/Frame.h index 321d920d10e..5bd7ead299d 100644 --- a/Userland/Libraries/LibGUI/Frame.h +++ b/Userland/Libraries/LibGUI/Frame.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2018-2020, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -14,7 +15,7 @@ namespace GUI { class Frame : public Widget { C_OBJECT(Frame) public: - virtual ~Frame() override; + virtual ~Frame() override = default; int frame_thickness() const { return m_thickness; } void set_frame_thickness(int thickness); diff --git a/Userland/Libraries/LibGUI/GML/AutocompleteProvider.h b/Userland/Libraries/LibGUI/GML/AutocompleteProvider.h index 98dfe35a07b..f3008b8517d 100644 --- a/Userland/Libraries/LibGUI/GML/AutocompleteProvider.h +++ b/Userland/Libraries/LibGUI/GML/AutocompleteProvider.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2020, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -12,8 +13,8 @@ namespace GUI::GML { class AutocompleteProvider final : public virtual GUI::AutocompleteProvider { public: - AutocompleteProvider() { } - virtual ~AutocompleteProvider() override { } + AutocompleteProvider() = default; + virtual ~AutocompleteProvider() override = default; private: static bool can_have_declared_layout(StringView class_name) diff --git a/Userland/Libraries/LibGUI/GML/SyntaxHighlighter.cpp b/Userland/Libraries/LibGUI/GML/SyntaxHighlighter.cpp index 4a6e3f3344d..41c9de0446c 100644 --- a/Userland/Libraries/LibGUI/GML/SyntaxHighlighter.cpp +++ b/Userland/Libraries/LibGUI/GML/SyntaxHighlighter.cpp @@ -1,5 +1,6 @@ /* * Copyright (c) 2020-2021, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -77,8 +78,4 @@ bool SyntaxHighlighter::token_types_equal(u64 token1, u64 token2) const return static_cast(token1) == static_cast(token2); } -SyntaxHighlighter::~SyntaxHighlighter() -{ -} - } diff --git a/Userland/Libraries/LibGUI/GML/SyntaxHighlighter.h b/Userland/Libraries/LibGUI/GML/SyntaxHighlighter.h index 5b52bdacf2f..0c2961e90a4 100644 --- a/Userland/Libraries/LibGUI/GML/SyntaxHighlighter.h +++ b/Userland/Libraries/LibGUI/GML/SyntaxHighlighter.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2020-2021, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -12,8 +13,8 @@ namespace GUI::GML { class SyntaxHighlighter final : public Syntax::Highlighter { public: - SyntaxHighlighter() { } - virtual ~SyntaxHighlighter() override; + SyntaxHighlighter() = default; + virtual ~SyntaxHighlighter() override = default; virtual bool is_identifier(u64) const override; diff --git a/Userland/Libraries/LibGUI/GitCommitSyntaxHighlighter.cpp b/Userland/Libraries/LibGUI/GitCommitSyntaxHighlighter.cpp index dbceb075505..abc597861c7 100644 --- a/Userland/Libraries/LibGUI/GitCommitSyntaxHighlighter.cpp +++ b/Userland/Libraries/LibGUI/GitCommitSyntaxHighlighter.cpp @@ -1,5 +1,6 @@ /* * Copyright (c) 2022, Brian Gianforcaro + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -52,8 +53,4 @@ bool GitCommitSyntaxHighlighter::token_types_equal(u64 token1, u64 token2) const return static_cast(token1) == static_cast(token2); } -GitCommitSyntaxHighlighter::~GitCommitSyntaxHighlighter() -{ -} - } diff --git a/Userland/Libraries/LibGUI/GitCommitSyntaxHighlighter.h b/Userland/Libraries/LibGUI/GitCommitSyntaxHighlighter.h index 3e9cec60a74..1153e8b9a91 100644 --- a/Userland/Libraries/LibGUI/GitCommitSyntaxHighlighter.h +++ b/Userland/Libraries/LibGUI/GitCommitSyntaxHighlighter.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2022, Brian Gianforcaro + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -12,8 +13,8 @@ namespace GUI { class GitCommitSyntaxHighlighter final : public Syntax::Highlighter { public: - GitCommitSyntaxHighlighter() { } - virtual ~GitCommitSyntaxHighlighter() override; + GitCommitSyntaxHighlighter() = default; + virtual ~GitCommitSyntaxHighlighter() override = default; virtual Syntax::Language language() const override { return Syntax::Language::GitCommit; } virtual void rehighlight(Palette const&) override; diff --git a/Userland/Libraries/LibGUI/GlyphMapWidget.cpp b/Userland/Libraries/LibGUI/GlyphMapWidget.cpp index a023d2301ea..ec15920ae08 100644 --- a/Userland/Libraries/LibGUI/GlyphMapWidget.cpp +++ b/Userland/Libraries/LibGUI/GlyphMapWidget.cpp @@ -2,6 +2,7 @@ * Copyright (c) 2018-2020, Andreas Kling * Copyright (c) 2021, Mustafa Quraish * Copyright (c) 2022, Sam Atkins + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -55,10 +56,6 @@ GlyphMapWidget::GlyphMapWidget() set_active_glyph('A'); } -GlyphMapWidget::~GlyphMapWidget() -{ -} - void GlyphMapWidget::resize_event(ResizeEvent& event) { recalculate_content_size(); diff --git a/Userland/Libraries/LibGUI/GlyphMapWidget.h b/Userland/Libraries/LibGUI/GlyphMapWidget.h index f2295d95fec..7fc07e1f504 100644 --- a/Userland/Libraries/LibGUI/GlyphMapWidget.h +++ b/Userland/Libraries/LibGUI/GlyphMapWidget.h @@ -1,6 +1,7 @@ /* * Copyright (c) 2018-2020, Andreas Kling * Copyright (c) 2022, Sam Atkins + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -17,7 +18,7 @@ namespace GUI { class GlyphMapWidget final : public AbstractScrollableWidget { C_OBJECT(GlyphMapWidget) public: - virtual ~GlyphMapWidget() override; + virtual ~GlyphMapWidget() override = default; class Selection { public: diff --git a/Userland/Libraries/LibGUI/GroupBox.cpp b/Userland/Libraries/LibGUI/GroupBox.cpp index f0f4a853ffb..2b410e1c69f 100644 --- a/Userland/Libraries/LibGUI/GroupBox.cpp +++ b/Userland/Libraries/LibGUI/GroupBox.cpp @@ -1,5 +1,6 @@ /* * Copyright (c) 2018-2020, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -20,10 +21,6 @@ GroupBox::GroupBox(StringView title) REGISTER_STRING_PROPERTY("title", title, set_title); } -GroupBox::~GroupBox() -{ -} - Margins GroupBox::content_margins() const { return { diff --git a/Userland/Libraries/LibGUI/GroupBox.h b/Userland/Libraries/LibGUI/GroupBox.h index a928bd87896..0513a7ed11d 100644 --- a/Userland/Libraries/LibGUI/GroupBox.h +++ b/Userland/Libraries/LibGUI/GroupBox.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2018-2020, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -13,7 +14,7 @@ namespace GUI { class GroupBox : public Widget { C_OBJECT(GroupBox) public: - virtual ~GroupBox() override; + virtual ~GroupBox() override = default; String title() const { return m_title; } void set_title(StringView); diff --git a/Userland/Libraries/LibGUI/HeaderView.cpp b/Userland/Libraries/LibGUI/HeaderView.cpp index 14f40f84a0e..0eacc7e284c 100644 --- a/Userland/Libraries/LibGUI/HeaderView.cpp +++ b/Userland/Libraries/LibGUI/HeaderView.cpp @@ -1,5 +1,6 @@ /* * Copyright (c) 2020, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -30,10 +31,6 @@ HeaderView::HeaderView(AbstractTableView& table_view, Gfx::Orientation orientati } } -HeaderView::~HeaderView() -{ -} - void HeaderView::set_section_size(int section, int size) { auto& data = section_data(section); diff --git a/Userland/Libraries/LibGUI/HeaderView.h b/Userland/Libraries/LibGUI/HeaderView.h index 2010d5d1f41..89c98ede6de 100644 --- a/Userland/Libraries/LibGUI/HeaderView.h +++ b/Userland/Libraries/LibGUI/HeaderView.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2020, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -15,7 +16,7 @@ class HeaderView final : public Widget { C_OBJECT(HeaderView); public: - virtual ~HeaderView() override; + virtual ~HeaderView() override = default; Gfx::Orientation orientation() const { return m_orientation; } diff --git a/Userland/Libraries/LibGUI/INISyntaxHighlighter.cpp b/Userland/Libraries/LibGUI/INISyntaxHighlighter.cpp index 71941d45578..0dd2c2d9496 100644 --- a/Userland/Libraries/LibGUI/INISyntaxHighlighter.cpp +++ b/Userland/Libraries/LibGUI/INISyntaxHighlighter.cpp @@ -1,5 +1,6 @@ /* * Copyright (c) 2020, Hüseyin Aslıtürk + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -76,8 +77,4 @@ bool IniSyntaxHighlighter::token_types_equal(u64 token1, u64 token2) const return static_cast(token1) == static_cast(token2); } -IniSyntaxHighlighter::~IniSyntaxHighlighter() -{ -} - } diff --git a/Userland/Libraries/LibGUI/INISyntaxHighlighter.h b/Userland/Libraries/LibGUI/INISyntaxHighlighter.h index 5e23da25e87..bb56a790710 100644 --- a/Userland/Libraries/LibGUI/INISyntaxHighlighter.h +++ b/Userland/Libraries/LibGUI/INISyntaxHighlighter.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2020, Hüseyin Aslıtürk + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -12,8 +13,8 @@ namespace GUI { class IniSyntaxHighlighter final : public Syntax::Highlighter { public: - IniSyntaxHighlighter() { } - virtual ~IniSyntaxHighlighter() override; + IniSyntaxHighlighter() = default; + virtual ~IniSyntaxHighlighter() override = default; virtual bool is_identifier(u64) const override; diff --git a/Userland/Libraries/LibGUI/Icon.h b/Userland/Libraries/LibGUI/Icon.h index 4be214b91de..a8592082d5d 100644 --- a/Userland/Libraries/LibGUI/Icon.h +++ b/Userland/Libraries/LibGUI/Icon.h @@ -1,6 +1,7 @@ /* * Copyright (c) 2018-2020, Andreas Kling * Copyright (c) 2021, Julius Heijmen + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -17,7 +18,7 @@ namespace GUI { class IconImpl : public RefCounted { public: static NonnullRefPtr create() { return adopt_ref(*new IconImpl); } - ~IconImpl() { } + ~IconImpl() = default; const Gfx::Bitmap* bitmap_for_size(int) const; void set_bitmap_for_size(int, RefPtr&&); @@ -31,7 +32,7 @@ public: } private: - IconImpl() { } + IconImpl() = default; HashMap> m_bitmaps; }; @@ -42,7 +43,7 @@ public: explicit Icon(RefPtr&&, RefPtr&&); explicit Icon(const IconImpl&); Icon(const Icon&); - ~Icon() { } + ~Icon() = default; static Icon default_icon(StringView); static ErrorOr try_create_default_icon(StringView); diff --git a/Userland/Libraries/LibGUI/IconView.cpp b/Userland/Libraries/LibGUI/IconView.cpp index 2e99e6bbd6c..1d6717d210f 100644 --- a/Userland/Libraries/LibGUI/IconView.cpp +++ b/Userland/Libraries/LibGUI/IconView.cpp @@ -1,5 +1,6 @@ /* * Copyright (c) 2018-2020, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -26,10 +27,6 @@ IconView::IconView() horizontal_scrollbar().set_visible(false); } -IconView::~IconView() -{ -} - void IconView::select_all() { for (int item_index = 0; item_index < item_count(); ++item_index) { diff --git a/Userland/Libraries/LibGUI/IconView.h b/Userland/Libraries/LibGUI/IconView.h index 1b97b91dc64..787d21cb1a4 100644 --- a/Userland/Libraries/LibGUI/IconView.h +++ b/Userland/Libraries/LibGUI/IconView.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2018-2020, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -16,7 +17,7 @@ namespace GUI { class IconView : public AbstractView { C_OBJECT(IconView) public: - virtual ~IconView() override; + virtual ~IconView() override = default; enum class FlowDirection { LeftToRight, diff --git a/Userland/Libraries/LibGUI/ImageWidget.cpp b/Userland/Libraries/LibGUI/ImageWidget.cpp index b28ee605a28..c59620db914 100644 --- a/Userland/Libraries/LibGUI/ImageWidget.cpp +++ b/Userland/Libraries/LibGUI/ImageWidget.cpp @@ -1,5 +1,6 @@ /* * Copyright (c) 2020, Hüseyin Aslıtürk + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -27,10 +28,6 @@ ImageWidget::ImageWidget(StringView) REGISTER_BOOL_PROPERTY("should_stretch", should_stretch, set_should_stretch); } -ImageWidget::~ImageWidget() -{ -} - void ImageWidget::set_bitmap(const Gfx::Bitmap* bitmap) { if (m_bitmap == bitmap) diff --git a/Userland/Libraries/LibGUI/ImageWidget.h b/Userland/Libraries/LibGUI/ImageWidget.h index 6cee2aab416..e0fb19838de 100644 --- a/Userland/Libraries/LibGUI/ImageWidget.h +++ b/Userland/Libraries/LibGUI/ImageWidget.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2020, Hüseyin Aslıtürk + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -8,13 +9,14 @@ #include #include +#include namespace GUI { class ImageWidget : public Frame { C_OBJECT(ImageWidget) public: - virtual ~ImageWidget() override; + virtual ~ImageWidget() override = default; void set_bitmap(const Gfx::Bitmap*); Gfx::Bitmap* bitmap() { return m_bitmap.ptr(); } diff --git a/Userland/Libraries/LibGUI/InputBox.cpp b/Userland/Libraries/LibGUI/InputBox.cpp index ebec5d88be3..1be35696fb0 100644 --- a/Userland/Libraries/LibGUI/InputBox.cpp +++ b/Userland/Libraries/LibGUI/InputBox.cpp @@ -1,6 +1,7 @@ /* * Copyright (c) 2018-2020, Andreas Kling * Copyright (c) 2021, Jakob-Niklas See + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -24,10 +25,6 @@ InputBox::InputBox(Window* parent_window, String& text_value, StringView prompt, build(input_type); } -InputBox::~InputBox() -{ -} - int InputBox::show(Window* parent_window, String& text_value, StringView prompt, StringView title, StringView placeholder, InputType input_type) { auto box = InputBox::construct(parent_window, text_value, prompt, title, placeholder, input_type); diff --git a/Userland/Libraries/LibGUI/InputBox.h b/Userland/Libraries/LibGUI/InputBox.h index 60705ad21cd..16593ed91ce 100644 --- a/Userland/Libraries/LibGUI/InputBox.h +++ b/Userland/Libraries/LibGUI/InputBox.h @@ -1,6 +1,7 @@ /* * Copyright (c) 2018-2020, Andreas Kling * Copyright (c) 2021, Jakob-Niklas See + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -19,7 +20,7 @@ enum class InputType { class InputBox : public Dialog { C_OBJECT(InputBox) public: - virtual ~InputBox() override; + virtual ~InputBox() override = default; static int show(Window* parent_window, String& text_value, StringView prompt, StringView title, StringView placeholder = {}, InputType input_type = InputType::Text); diff --git a/Userland/Libraries/LibGUI/ItemListModel.h b/Userland/Libraries/LibGUI/ItemListModel.h index 5703e69179a..68a9e26a0f6 100644 --- a/Userland/Libraries/LibGUI/ItemListModel.h +++ b/Userland/Libraries/LibGUI/ItemListModel.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2019-2020, Jesse Buhgaiar + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -34,7 +35,7 @@ public: return adopt_ref(*new ItemListModel(data, row_count)); } - virtual ~ItemListModel() override { } + virtual ~ItemListModel() override = default; virtual int row_count(ModelIndex const& index) const override { diff --git a/Userland/Libraries/LibGUI/JsonArrayModel.h b/Userland/Libraries/LibGUI/JsonArrayModel.h index faec864f26e..fcdb4ecfd30 100644 --- a/Userland/Libraries/LibGUI/JsonArrayModel.h +++ b/Userland/Libraries/LibGUI/JsonArrayModel.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2018-2020, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -44,7 +45,7 @@ public: return adopt_ref(*new JsonArrayModel(json_path, move(fields))); } - virtual ~JsonArrayModel() override { } + virtual ~JsonArrayModel() override = default; virtual int row_count(const ModelIndex& = ModelIndex()) const override { return m_array.size(); } virtual int column_count(const ModelIndex& = ModelIndex()) const override { return m_fields.size(); } diff --git a/Userland/Libraries/LibGUI/Label.cpp b/Userland/Libraries/LibGUI/Label.cpp index e7a0ee254da..8745611ed2a 100644 --- a/Userland/Libraries/LibGUI/Label.cpp +++ b/Userland/Libraries/LibGUI/Label.cpp @@ -1,5 +1,6 @@ /* * Copyright (c) 2018-2020, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -33,10 +34,6 @@ Label::Label(String text) REGISTER_STRING_PROPERTY("icon", icon, set_icon_from_path); } -Label::~Label() -{ -} - void Label::set_autosize(bool autosize) { if (m_autosize == autosize) diff --git a/Userland/Libraries/LibGUI/Label.h b/Userland/Libraries/LibGUI/Label.h index 4d889996a33..97e4493ddc4 100644 --- a/Userland/Libraries/LibGUI/Label.h +++ b/Userland/Libraries/LibGUI/Label.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2018-2020, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -16,7 +17,7 @@ class Label : public Frame { C_OBJECT(Label); public: - virtual ~Label() override; + virtual ~Label() override = default; String text() const { return m_text; } void set_text(String); diff --git a/Userland/Libraries/LibGUI/Layout.cpp b/Userland/Libraries/LibGUI/Layout.cpp index 76818bbb633..3c54efda781 100644 --- a/Userland/Libraries/LibGUI/Layout.cpp +++ b/Userland/Libraries/LibGUI/Layout.cpp @@ -1,5 +1,6 @@ /* * Copyright (c) 2018-2020, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -37,9 +38,7 @@ Layout::Layout() }); } -Layout::~Layout() -{ -} +Layout::~Layout() = default; void Layout::notify_adopted(Badge, Widget& widget) { diff --git a/Userland/Libraries/LibGUI/LazyWidget.cpp b/Userland/Libraries/LibGUI/LazyWidget.cpp index 82dd5946882..6756cc46950 100644 --- a/Userland/Libraries/LibGUI/LazyWidget.cpp +++ b/Userland/Libraries/LibGUI/LazyWidget.cpp @@ -1,5 +1,6 @@ /* * Copyright (c) 2018-2020, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -8,14 +9,6 @@ namespace GUI { -LazyWidget::LazyWidget() -{ -} - -LazyWidget::~LazyWidget() -{ -} - void LazyWidget::show_event(ShowEvent&) { if (m_has_been_shown) diff --git a/Userland/Libraries/LibGUI/LazyWidget.h b/Userland/Libraries/LibGUI/LazyWidget.h index 7011b14b676..9e8f985b12f 100644 --- a/Userland/Libraries/LibGUI/LazyWidget.h +++ b/Userland/Libraries/LibGUI/LazyWidget.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2018-2020, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -13,12 +14,12 @@ namespace GUI { class LazyWidget : public Widget { C_OBJECT(LazyWidget) public: - virtual ~LazyWidget() override; + virtual ~LazyWidget() override = default; Function on_first_show; protected: - LazyWidget(); + LazyWidget() = default; private: virtual void show_event(ShowEvent&) override; diff --git a/Userland/Libraries/LibGUI/ListView.cpp b/Userland/Libraries/LibGUI/ListView.cpp index 6fbdd8bc340..fecd4b8d80a 100644 --- a/Userland/Libraries/LibGUI/ListView.cpp +++ b/Userland/Libraries/LibGUI/ListView.cpp @@ -1,5 +1,6 @@ /* * Copyright (c) 2018-2020, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -22,9 +23,7 @@ ListView::ListView() set_searchable(true); } -ListView::~ListView() -{ -} +ListView::~ListView() = default; void ListView::select_all() { diff --git a/Userland/Libraries/LibGUI/Menubar.cpp b/Userland/Libraries/LibGUI/Menubar.cpp index 69fdb27f13d..587dd229c87 100644 --- a/Userland/Libraries/LibGUI/Menubar.cpp +++ b/Userland/Libraries/LibGUI/Menubar.cpp @@ -1,6 +1,7 @@ /* * Copyright (c) 2018-2021, Andreas Kling * Copyright (c) 2021, sin-ack + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -9,14 +10,6 @@ namespace GUI { -Menubar::Menubar() -{ -} - -Menubar::~Menubar() -{ -} - ErrorOr> Menubar::try_add_menu(Badge, String name) { auto menu = TRY(try_add(move(name))); diff --git a/Userland/Libraries/LibGUI/Menubar.h b/Userland/Libraries/LibGUI/Menubar.h index 71e1b35416c..884c5b475a4 100644 --- a/Userland/Libraries/LibGUI/Menubar.h +++ b/Userland/Libraries/LibGUI/Menubar.h @@ -1,6 +1,7 @@ /* * Copyright (c) 2018-2021, Andreas Kling * Copyright (c) 2021, sin-ack + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -20,7 +21,7 @@ class Menubar : public Core::Object { C_OBJECT(Menubar); public: - virtual ~Menubar() override; + virtual ~Menubar() override = default; ErrorOr> try_add_menu(Badge, String name); Menu& add_menu(Badge, String name); @@ -28,7 +29,7 @@ public: void for_each_menu(Function); private: - Menubar(); + Menubar() = default; NonnullRefPtrVector m_menus; }; diff --git a/Userland/Libraries/LibGUI/MessageBox.cpp b/Userland/Libraries/LibGUI/MessageBox.cpp index b282430435c..bc2c67fda21 100644 --- a/Userland/Libraries/LibGUI/MessageBox.cpp +++ b/Userland/Libraries/LibGUI/MessageBox.cpp @@ -1,5 +1,6 @@ /* * Copyright (c) 2018-2022, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -71,10 +72,6 @@ MessageBox::MessageBox(Window* parent_window, StringView text, StringView title, build(); } -MessageBox::~MessageBox() -{ -} - RefPtr MessageBox::icon() const { switch (m_type) { diff --git a/Userland/Libraries/LibGUI/MessageBox.h b/Userland/Libraries/LibGUI/MessageBox.h index 98265ca8edd..12d8ae72e07 100644 --- a/Userland/Libraries/LibGUI/MessageBox.h +++ b/Userland/Libraries/LibGUI/MessageBox.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2018-2022, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -29,7 +30,7 @@ public: YesNoCancel, }; - virtual ~MessageBox() override; + virtual ~MessageBox() override = default; static int show(Window* parent_window, StringView text, StringView title, Type type = Type::None, InputType input_type = InputType::OK); static int show_error(Window* parent_window, StringView text); diff --git a/Userland/Libraries/LibGUI/Model.cpp b/Userland/Libraries/LibGUI/Model.cpp index 8989751144f..7ffa5c1fc43 100644 --- a/Userland/Libraries/LibGUI/Model.cpp +++ b/Userland/Libraries/LibGUI/Model.cpp @@ -1,6 +1,7 @@ /* * Copyright (c) 2018-2021, Andreas Kling * Copyright (c) 2021, sin-ack + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -11,13 +12,9 @@ namespace GUI { -Model::Model() -{ -} +Model::Model() = default; -Model::~Model() -{ -} +Model::~Model() = default; void Model::register_view(Badge, AbstractView& view) { diff --git a/Userland/Libraries/LibGUI/Model.h b/Userland/Libraries/LibGUI/Model.h index 498cea4dbe9..a710ff2c15d 100644 --- a/Userland/Libraries/LibGUI/Model.h +++ b/Userland/Libraries/LibGUI/Model.h @@ -1,6 +1,7 @@ /* * Copyright (c) 2018-2020, Andreas Kling * Copyright (c) 2021, sin-ack + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -33,7 +34,7 @@ enum class SortOrder { class ModelClient { public: - virtual ~ModelClient() { } + virtual ~ModelClient() = default; virtual void model_did_update(unsigned flags) = 0; diff --git a/Userland/Libraries/LibGUI/ModelEditingDelegate.h b/Userland/Libraries/LibGUI/ModelEditingDelegate.h index faf11d276a1..e02a61efaa7 100644 --- a/Userland/Libraries/LibGUI/ModelEditingDelegate.h +++ b/Userland/Libraries/LibGUI/ModelEditingDelegate.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2018-2020, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -19,7 +20,7 @@ public: SelectAll, }; - virtual ~ModelEditingDelegate() { } + virtual ~ModelEditingDelegate() = default; void bind(Model& model, const ModelIndex& index) { @@ -43,7 +44,7 @@ public: virtual void will_begin_editing() { } protected: - ModelEditingDelegate() { } + ModelEditingDelegate() = default; virtual RefPtr create_widget() = 0; void commit() @@ -72,8 +73,8 @@ private: class StringModelEditingDelegate : public ModelEditingDelegate { public: - StringModelEditingDelegate() { } - virtual ~StringModelEditingDelegate() override { } + StringModelEditingDelegate() = default; + virtual ~StringModelEditingDelegate() override = default; virtual RefPtr create_widget() override { diff --git a/Userland/Libraries/LibGUI/MultiView.cpp b/Userland/Libraries/LibGUI/MultiView.cpp index 86b1f32ef8a..fff6f0e135b 100644 --- a/Userland/Libraries/LibGUI/MultiView.cpp +++ b/Userland/Libraries/LibGUI/MultiView.cpp @@ -1,5 +1,6 @@ /* * Copyright (c) 2018-2020, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -49,10 +50,6 @@ MultiView::MultiView() set_view_mode(ViewMode::Icon); } -MultiView::~MultiView() -{ -} - void MultiView::set_view_mode(ViewMode mode) { if (m_view_mode == mode) diff --git a/Userland/Libraries/LibGUI/MultiView.h b/Userland/Libraries/LibGUI/MultiView.h index 3a0ba38a4f1..a4436fe08d6 100644 --- a/Userland/Libraries/LibGUI/MultiView.h +++ b/Userland/Libraries/LibGUI/MultiView.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2018-2020, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -17,7 +18,7 @@ namespace GUI { class MultiView final : public GUI::StackWidget { C_OBJECT(MultiView) public: - virtual ~MultiView() override; + virtual ~MultiView() override = default; void refresh(); diff --git a/Userland/Libraries/LibGUI/Notification.cpp b/Userland/Libraries/LibGUI/Notification.cpp index 3d15afbc3d8..04e4a5aed01 100644 --- a/Userland/Libraries/LibGUI/Notification.cpp +++ b/Userland/Libraries/LibGUI/Notification.cpp @@ -1,5 +1,6 @@ /* * Copyright (c) 2020, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -33,13 +34,8 @@ private: Notification* m_notification; }; -Notification::Notification() -{ -} - -Notification::~Notification() -{ -} +Notification::Notification() = default; +Notification::~Notification() = default; void Notification::show() { diff --git a/Userland/Libraries/LibGUI/OpacitySlider.cpp b/Userland/Libraries/LibGUI/OpacitySlider.cpp index be578c0f0e1..59cb22d2fa5 100644 --- a/Userland/Libraries/LibGUI/OpacitySlider.cpp +++ b/Userland/Libraries/LibGUI/OpacitySlider.cpp @@ -1,5 +1,6 @@ /* * Copyright (c) 2020, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -25,10 +26,6 @@ OpacitySlider::OpacitySlider(Gfx::Orientation orientation) set_fixed_height(20); } -OpacitySlider::~OpacitySlider() -{ -} - Gfx::IntRect OpacitySlider::frame_inner_rect() const { return rect().shrunken(4, 4); diff --git a/Userland/Libraries/LibGUI/OpacitySlider.h b/Userland/Libraries/LibGUI/OpacitySlider.h index 7bc5e9beee7..e4ab0560be3 100644 --- a/Userland/Libraries/LibGUI/OpacitySlider.h +++ b/Userland/Libraries/LibGUI/OpacitySlider.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2020, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -14,7 +15,7 @@ class OpacitySlider : public AbstractSlider { C_OBJECT(OpacitySlider); public: - virtual ~OpacitySlider() override; + virtual ~OpacitySlider() override = default; protected: virtual void paint_event(PaintEvent&) override; diff --git a/Userland/Libraries/LibGUI/PasswordInputDialog.cpp b/Userland/Libraries/LibGUI/PasswordInputDialog.cpp index 92b8b4249fd..37731d27bc8 100644 --- a/Userland/Libraries/LibGUI/PasswordInputDialog.cpp +++ b/Userland/Libraries/LibGUI/PasswordInputDialog.cpp @@ -1,5 +1,6 @@ /* * Copyright (c) 2021, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -59,10 +60,6 @@ PasswordInputDialog::PasswordInputDialog(Window* parent_window, String title, St password_box.set_focus(true); } -PasswordInputDialog::~PasswordInputDialog() -{ -} - int PasswordInputDialog::show(Window* parent_window, String& text_value, String title, String server, String username) { auto box = PasswordInputDialog::construct(parent_window, move(title), move(server), move(username)); diff --git a/Userland/Libraries/LibGUI/PasswordInputDialog.h b/Userland/Libraries/LibGUI/PasswordInputDialog.h index db0d05d936a..ee3200d792d 100644 --- a/Userland/Libraries/LibGUI/PasswordInputDialog.h +++ b/Userland/Libraries/LibGUI/PasswordInputDialog.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2021, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -14,7 +15,7 @@ class PasswordInputDialog : public Dialog { C_OBJECT(PasswordInputDialog); public: - virtual ~PasswordInputDialog() override; + virtual ~PasswordInputDialog() override = default; static int show(Window* parent_window, String& text_value, String title, String server, String username); diff --git a/Userland/Libraries/LibGUI/PersistentModelIndex.h b/Userland/Libraries/LibGUI/PersistentModelIndex.h index 4efa8826421..c3a56e77ba1 100644 --- a/Userland/Libraries/LibGUI/PersistentModelIndex.h +++ b/Userland/Libraries/LibGUI/PersistentModelIndex.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2021, sin-ack + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -30,7 +31,7 @@ class PersistentHandle : public Weakable { class PersistentModelIndex { public: - PersistentModelIndex() { } + PersistentModelIndex() = default; PersistentModelIndex(ModelIndex const&); PersistentModelIndex(PersistentModelIndex const&) = default; PersistentModelIndex(PersistentModelIndex&&) = default; diff --git a/Userland/Libraries/LibGUI/ProcessChooser.cpp b/Userland/Libraries/LibGUI/ProcessChooser.cpp index 35ef3a4e2ac..94c3e4781d2 100644 --- a/Userland/Libraries/LibGUI/ProcessChooser.cpp +++ b/Userland/Libraries/LibGUI/ProcessChooser.cpp @@ -1,5 +1,6 @@ /* * Copyright (c) 2020, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -104,8 +105,4 @@ void ProcessChooser::set_pid_from_index_and_close(const ModelIndex& index) done(ExecOK); } -ProcessChooser::~ProcessChooser() -{ -} - } diff --git a/Userland/Libraries/LibGUI/ProcessChooser.h b/Userland/Libraries/LibGUI/ProcessChooser.h index 983abb3f651..23e3363a0e1 100644 --- a/Userland/Libraries/LibGUI/ProcessChooser.h +++ b/Userland/Libraries/LibGUI/ProcessChooser.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2020, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -16,7 +17,7 @@ class ProcessChooser final : public GUI::Dialog { C_OBJECT(ProcessChooser); public: - virtual ~ProcessChooser() override; + virtual ~ProcessChooser() override = default; pid_t pid() const { return m_pid; } diff --git a/Userland/Libraries/LibGUI/Progressbar.cpp b/Userland/Libraries/LibGUI/Progressbar.cpp index dcdd4091422..f449487a4e9 100644 --- a/Userland/Libraries/LibGUI/Progressbar.cpp +++ b/Userland/Libraries/LibGUI/Progressbar.cpp @@ -1,5 +1,6 @@ /* * Copyright (c) 2018-2020, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -28,10 +29,6 @@ Progressbar::Progressbar(Orientation orientation) REGISTER_INT_PROPERTY("max", max, set_max); } -Progressbar::~Progressbar() -{ -} - void Progressbar::set_value(int value) { if (m_value == value) diff --git a/Userland/Libraries/LibGUI/Progressbar.h b/Userland/Libraries/LibGUI/Progressbar.h index 59da0b9ff1e..c3ff489f0fc 100644 --- a/Userland/Libraries/LibGUI/Progressbar.h +++ b/Userland/Libraries/LibGUI/Progressbar.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2018-2020, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -13,7 +14,7 @@ namespace GUI { class Progressbar : public Frame { C_OBJECT(Progressbar) public: - virtual ~Progressbar() override; + virtual ~Progressbar() override = default; void set_range(int min, int max); void set_min(int min) { set_range(min, max()); } @@ -56,7 +57,7 @@ class VerticalProgressbar final : public Progressbar { C_OBJECT(VerticalProgressbar); public: - virtual ~VerticalProgressbar() override { } + virtual ~VerticalProgressbar() override = default; private: VerticalProgressbar() @@ -69,7 +70,7 @@ class HorizontalProgressbar final : public Progressbar { C_OBJECT(HorizontalProgressbar); public: - virtual ~HorizontalProgressbar() override { } + virtual ~HorizontalProgressbar() override = default; private: HorizontalProgressbar() diff --git a/Userland/Libraries/LibGUI/RadioButton.cpp b/Userland/Libraries/LibGUI/RadioButton.cpp index 8784f9c3330..5c051e86d86 100644 --- a/Userland/Libraries/LibGUI/RadioButton.cpp +++ b/Userland/Libraries/LibGUI/RadioButton.cpp @@ -1,5 +1,6 @@ /* * Copyright (c) 2018-2020, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -24,10 +25,6 @@ RadioButton::RadioButton(String text) set_fixed_height(22); } -RadioButton::~RadioButton() -{ -} - Gfx::IntSize RadioButton::circle_size() { return { 12, 12 }; diff --git a/Userland/Libraries/LibGUI/RadioButton.h b/Userland/Libraries/LibGUI/RadioButton.h index 0294056c9bf..e2ef712bfdf 100644 --- a/Userland/Libraries/LibGUI/RadioButton.h +++ b/Userland/Libraries/LibGUI/RadioButton.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2018-2020, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -14,7 +15,7 @@ class RadioButton : public AbstractButton { C_OBJECT(RadioButton); public: - virtual ~RadioButton() override; + virtual ~RadioButton() override = default; virtual void click(unsigned modifiers = 0) override; diff --git a/Userland/Libraries/LibGUI/ResizeCorner.cpp b/Userland/Libraries/LibGUI/ResizeCorner.cpp index 82917c86bec..072b486cae4 100644 --- a/Userland/Libraries/LibGUI/ResizeCorner.cpp +++ b/Userland/Libraries/LibGUI/ResizeCorner.cpp @@ -61,10 +61,6 @@ ResizeCorner::ResizeCorner() set_fixed_size(16, 18); } -ResizeCorner::~ResizeCorner() -{ -} - void ResizeCorner::paint_event(PaintEvent& event) { Painter painter(*this); diff --git a/Userland/Libraries/LibGUI/ResizeCorner.h b/Userland/Libraries/LibGUI/ResizeCorner.h index 832774c243e..633d362f3ae 100644 --- a/Userland/Libraries/LibGUI/ResizeCorner.h +++ b/Userland/Libraries/LibGUI/ResizeCorner.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2018-2020, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -13,7 +14,7 @@ namespace GUI { class ResizeCorner : public Widget { C_OBJECT(ResizeCorner) public: - virtual ~ResizeCorner() override; + virtual ~ResizeCorner() override = default; protected: ResizeCorner(); diff --git a/Userland/Libraries/LibGUI/RunningProcessesModel.cpp b/Userland/Libraries/LibGUI/RunningProcessesModel.cpp index d05391acaa4..3869dd71c96 100644 --- a/Userland/Libraries/LibGUI/RunningProcessesModel.cpp +++ b/Userland/Libraries/LibGUI/RunningProcessesModel.cpp @@ -1,5 +1,6 @@ /* * Copyright (c) 2020, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -15,14 +16,6 @@ NonnullRefPtr RunningProcessesModel::create() return adopt_ref(*new RunningProcessesModel); } -RunningProcessesModel::RunningProcessesModel() -{ -} - -RunningProcessesModel::~RunningProcessesModel() -{ -} - void RunningProcessesModel::update() { m_processes.clear(); diff --git a/Userland/Libraries/LibGUI/RunningProcessesModel.h b/Userland/Libraries/LibGUI/RunningProcessesModel.h index f57017e8186..f8a347ca621 100644 --- a/Userland/Libraries/LibGUI/RunningProcessesModel.h +++ b/Userland/Libraries/LibGUI/RunningProcessesModel.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2020, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -14,7 +15,7 @@ namespace GUI { class RunningProcessesModel final : public GUI::Model { public: static NonnullRefPtr create(); - virtual ~RunningProcessesModel() override; + virtual ~RunningProcessesModel() override = default; enum Column { Icon, @@ -32,7 +33,7 @@ public: void update(); private: - RunningProcessesModel(); + RunningProcessesModel() = default; struct Process { pid_t pid; diff --git a/Userland/Libraries/LibGUI/ScrollableContainerWidget.cpp b/Userland/Libraries/LibGUI/ScrollableContainerWidget.cpp index e8020143d5f..214ffe0401b 100644 --- a/Userland/Libraries/LibGUI/ScrollableContainerWidget.cpp +++ b/Userland/Libraries/LibGUI/ScrollableContainerWidget.cpp @@ -1,5 +1,6 @@ /* * Copyright (c) 2021, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -18,10 +19,6 @@ ScrollableContainerWidget::ScrollableContainerWidget() REGISTER_BOOL_PROPERTY("should_hide_unnecessary_scrollbars", should_hide_unnecessary_scrollbars, set_should_hide_unnecessary_scrollbars); } -ScrollableContainerWidget::~ScrollableContainerWidget() -{ -} - void ScrollableContainerWidget::did_scroll() { AbstractScrollableWidget::did_scroll(); diff --git a/Userland/Libraries/LibGUI/ScrollableContainerWidget.h b/Userland/Libraries/LibGUI/ScrollableContainerWidget.h index 5fc3f8b0a53..36c2cd734c5 100644 --- a/Userland/Libraries/LibGUI/ScrollableContainerWidget.h +++ b/Userland/Libraries/LibGUI/ScrollableContainerWidget.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2021, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -14,7 +15,7 @@ class ScrollableContainerWidget : public GUI::AbstractScrollableWidget { C_OBJECT(ScrollableContainerWidget); public: - virtual ~ScrollableContainerWidget(); + virtual ~ScrollableContainerWidget() = default; void set_widget(GUI::Widget*); GUI::Widget* widget() { return m_widget; } diff --git a/Userland/Libraries/LibGUI/Scrollbar.cpp b/Userland/Libraries/LibGUI/Scrollbar.cpp index c6d67b10138..8de37ae6f85 100644 --- a/Userland/Libraries/LibGUI/Scrollbar.cpp +++ b/Userland/Libraries/LibGUI/Scrollbar.cpp @@ -88,10 +88,6 @@ Scrollbar::Scrollbar(Orientation orientation) }; } -Scrollbar::~Scrollbar() -{ -} - Gfx::IntRect Scrollbar::decrement_button_rect() const { return { 0, 0, button_width(), button_height() }; diff --git a/Userland/Libraries/LibGUI/Scrollbar.h b/Userland/Libraries/LibGUI/Scrollbar.h index c713314f6bf..8ebb65532b3 100644 --- a/Userland/Libraries/LibGUI/Scrollbar.h +++ b/Userland/Libraries/LibGUI/Scrollbar.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2018-2020, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -7,6 +8,7 @@ #pragma once #include +#include #include namespace GUI { @@ -15,7 +17,7 @@ class Scrollbar : public AbstractSlider { C_OBJECT(Scrollbar); public: - virtual ~Scrollbar() override; + virtual ~Scrollbar() override = default; bool is_scrollable() const { return max() != min(); } diff --git a/Userland/Libraries/LibGUI/SeparatorWidget.cpp b/Userland/Libraries/LibGUI/SeparatorWidget.cpp index 4e6a490acec..91bd6b137b6 100644 --- a/Userland/Libraries/LibGUI/SeparatorWidget.cpp +++ b/Userland/Libraries/LibGUI/SeparatorWidget.cpp @@ -1,5 +1,6 @@ /* * Copyright (c) 2020, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -22,10 +23,6 @@ SeparatorWidget::SeparatorWidget(Gfx::Orientation orientation) set_fixed_height(8); } -SeparatorWidget::~SeparatorWidget() -{ -} - void SeparatorWidget::paint_event(PaintEvent& event) { Painter painter(*this); diff --git a/Userland/Libraries/LibGUI/SeparatorWidget.h b/Userland/Libraries/LibGUI/SeparatorWidget.h index d5c58b6b65f..40fc9f62c53 100644 --- a/Userland/Libraries/LibGUI/SeparatorWidget.h +++ b/Userland/Libraries/LibGUI/SeparatorWidget.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2020, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -14,7 +15,7 @@ class SeparatorWidget : public Widget { C_OBJECT(SeparatorWidget); public: - virtual ~SeparatorWidget() override; + virtual ~SeparatorWidget() override = default; protected: explicit SeparatorWidget(Gfx::Orientation); @@ -28,7 +29,7 @@ private: class VerticalSeparator final : public SeparatorWidget { C_OBJECT(VerticalSeparator) public: - virtual ~VerticalSeparator() override { } + virtual ~VerticalSeparator() override = default; private: VerticalSeparator() @@ -40,7 +41,7 @@ private: class HorizontalSeparator final : public SeparatorWidget { C_OBJECT(HorizontalSeparator) public: - virtual ~HorizontalSeparator() override { } + virtual ~HorizontalSeparator() override = default; private: HorizontalSeparator() diff --git a/Userland/Libraries/LibGUI/SettingsWindow.cpp b/Userland/Libraries/LibGUI/SettingsWindow.cpp index d4c5d40a6a0..84d24bab398 100644 --- a/Userland/Libraries/LibGUI/SettingsWindow.cpp +++ b/Userland/Libraries/LibGUI/SettingsWindow.cpp @@ -1,6 +1,6 @@ /* * Copyright (c) 2020, Idan Horowitz - * Copyright (c) 2021, the SerenityOS developers. + * Copyright (c) 2021-2022, the SerenityOS developers. * Copyright (c) 2021, Andreas Kling * Copyright (c) 2021, Sam Atkins * @@ -76,12 +76,4 @@ ErrorOr> SettingsWindow::create(String title, Show return window; } -SettingsWindow::SettingsWindow() -{ -} - -SettingsWindow::~SettingsWindow() -{ -} - } diff --git a/Userland/Libraries/LibGUI/SettingsWindow.h b/Userland/Libraries/LibGUI/SettingsWindow.h index d7530b8df22..766ccdbdcdf 100644 --- a/Userland/Libraries/LibGUI/SettingsWindow.h +++ b/Userland/Libraries/LibGUI/SettingsWindow.h @@ -1,6 +1,6 @@ /* * Copyright (c) 2020, Idan Horowitz - * Copyright (c) 2021, the SerenityOS developers. + * Copyright (c) 2021-2022, the SerenityOS developers. * Copyright (c) 2021, Sam Atkins * * SPDX-License-Identifier: BSD-2-Clause @@ -31,7 +31,7 @@ public: static ErrorOr> create(String title, ShowDefaultsButton = ShowDefaultsButton::No); - virtual ~SettingsWindow() override; + virtual ~SettingsWindow() override = default; template ErrorOr> add_tab(String title, Args&&... args) @@ -42,7 +42,7 @@ public: } private: - SettingsWindow(); + SettingsWindow() = default; RefPtr m_tab_widget; NonnullRefPtrVector m_tabs; diff --git a/Userland/Libraries/LibGUI/Slider.cpp b/Userland/Libraries/LibGUI/Slider.cpp index 333a1941445..b090f63c90f 100644 --- a/Userland/Libraries/LibGUI/Slider.cpp +++ b/Userland/Libraries/LibGUI/Slider.cpp @@ -1,5 +1,6 @@ /* * Copyright (c) 2018-2020, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -24,10 +25,6 @@ Slider::Slider(Orientation orientation) { KnobSizeMode::Proportional, "Proportional" }); } -Slider::~Slider() -{ -} - void Slider::paint_event(PaintEvent& event) { Painter painter(*this); diff --git a/Userland/Libraries/LibGUI/Slider.h b/Userland/Libraries/LibGUI/Slider.h index 0eddc3c81ea..39cab99b29d 100644 --- a/Userland/Libraries/LibGUI/Slider.h +++ b/Userland/Libraries/LibGUI/Slider.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2018-2020, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -19,7 +20,7 @@ public: Proportional, }; - virtual ~Slider() override; + virtual ~Slider() override = default; void set_knob_size_mode(KnobSizeMode mode) { m_knob_size_mode = mode; } KnobSizeMode knob_size_mode() const { return m_knob_size_mode; } @@ -64,7 +65,7 @@ class VerticalSlider final : public Slider { C_OBJECT(VerticalSlider); public: - virtual ~VerticalSlider() override { } + virtual ~VerticalSlider() override = default; private: VerticalSlider() @@ -77,7 +78,7 @@ class HorizontalSlider final : public Slider { C_OBJECT(HorizontalSlider); public: - virtual ~HorizontalSlider() override { } + virtual ~HorizontalSlider() override = default; private: HorizontalSlider() diff --git a/Userland/Libraries/LibGUI/SpinBox.cpp b/Userland/Libraries/LibGUI/SpinBox.cpp index e46278376b7..59676e85873 100644 --- a/Userland/Libraries/LibGUI/SpinBox.cpp +++ b/Userland/Libraries/LibGUI/SpinBox.cpp @@ -1,5 +1,6 @@ /* * Copyright (c) 2018-2020, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -52,10 +53,6 @@ SpinBox::SpinBox() REGISTER_INT_PROPERTY("max", max, set_max); } -SpinBox::~SpinBox() -{ -} - void SpinBox::set_value(int value, AllowCallback allow_callback) { value = clamp(value, m_min, m_max); diff --git a/Userland/Libraries/LibGUI/SpinBox.h b/Userland/Libraries/LibGUI/SpinBox.h index b71b900dde6..cdd0849ec47 100644 --- a/Userland/Libraries/LibGUI/SpinBox.h +++ b/Userland/Libraries/LibGUI/SpinBox.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2018-2020, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -13,7 +14,7 @@ namespace GUI { class SpinBox : public Widget { C_OBJECT(SpinBox) public: - virtual ~SpinBox() override; + virtual ~SpinBox() override = default; int value() const { return m_value; } void set_value(int, AllowCallback = AllowCallback::Yes); diff --git a/Userland/Libraries/LibGUI/Splitter.cpp b/Userland/Libraries/LibGUI/Splitter.cpp index 0571b47d4c6..83ffdd4064a 100644 --- a/Userland/Libraries/LibGUI/Splitter.cpp +++ b/Userland/Libraries/LibGUI/Splitter.cpp @@ -1,5 +1,6 @@ /* * Copyright (c) 2018-2021, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -33,10 +34,6 @@ Splitter::Splitter(Orientation orientation) layout()->set_spacing(4); } -Splitter::~Splitter() -{ -} - void Splitter::paint_event(PaintEvent& event) { Painter painter(*this); diff --git a/Userland/Libraries/LibGUI/Splitter.h b/Userland/Libraries/LibGUI/Splitter.h index ad21a0747f1..c48e82e2c09 100644 --- a/Userland/Libraries/LibGUI/Splitter.h +++ b/Userland/Libraries/LibGUI/Splitter.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2018-2021, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -19,7 +20,7 @@ public: Second }; - virtual ~Splitter() override; + virtual ~Splitter() override = default; int first_resizee_minimum_size() { return m_first_resizee_minimum_size; } void set_first_resizee_minimum_size(int minimum_size) { m_first_resizee_minimum_size = minimum_size; } @@ -84,7 +85,7 @@ private: class VerticalSplitter final : public Splitter { C_OBJECT(VerticalSplitter) public: - virtual ~VerticalSplitter() override { } + virtual ~VerticalSplitter() override = default; private: VerticalSplitter() @@ -96,7 +97,7 @@ private: class HorizontalSplitter final : public Splitter { C_OBJECT(HorizontalSplitter) public: - virtual ~HorizontalSplitter() override { } + virtual ~HorizontalSplitter() override = default; private: HorizontalSplitter() diff --git a/Userland/Libraries/LibGUI/StackWidget.cpp b/Userland/Libraries/LibGUI/StackWidget.cpp index 1a618a51c66..a5b6aca5955 100644 --- a/Userland/Libraries/LibGUI/StackWidget.cpp +++ b/Userland/Libraries/LibGUI/StackWidget.cpp @@ -1,5 +1,6 @@ /* * Copyright (c) 2018-2020, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -12,14 +13,6 @@ REGISTER_WIDGET(GUI, StackWidget); namespace GUI { -StackWidget::StackWidget() -{ -} - -StackWidget::~StackWidget() -{ -} - void StackWidget::set_active_widget(Widget* widget) { if (widget == m_active_widget) diff --git a/Userland/Libraries/LibGUI/StackWidget.h b/Userland/Libraries/LibGUI/StackWidget.h index b2d95680230..0f9dc7170bb 100644 --- a/Userland/Libraries/LibGUI/StackWidget.h +++ b/Userland/Libraries/LibGUI/StackWidget.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2018-2020, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -13,7 +14,7 @@ namespace GUI { class StackWidget : public Widget { C_OBJECT(StackWidget) public: - virtual ~StackWidget() override; + virtual ~StackWidget() override = default; Widget* active_widget() { return m_active_widget.ptr(); } const Widget* active_widget() const { return m_active_widget.ptr(); } @@ -22,7 +23,7 @@ public: Function on_active_widget_change; protected: - StackWidget(); + StackWidget() = default; virtual void child_event(Core::ChildEvent&) override; virtual void resize_event(ResizeEvent&) override; diff --git a/Userland/Libraries/LibGUI/Statusbar.cpp b/Userland/Libraries/LibGUI/Statusbar.cpp index abce4af03cd..f19d9f5c030 100644 --- a/Userland/Libraries/LibGUI/Statusbar.cpp +++ b/Userland/Libraries/LibGUI/Statusbar.cpp @@ -1,5 +1,6 @@ /* * Copyright (c) 2018-2020, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -30,10 +31,6 @@ Statusbar::Statusbar(int count) REGISTER_INT_PROPERTY("segment_count", segment_count, set_segment_count); } -Statusbar::~Statusbar() -{ -} - NonnullRefPtr Statusbar::create_segment() { auto widget = Segment::construct(); diff --git a/Userland/Libraries/LibGUI/Statusbar.h b/Userland/Libraries/LibGUI/Statusbar.h index 818eb04037b..197e8f7ceb6 100644 --- a/Userland/Libraries/LibGUI/Statusbar.h +++ b/Userland/Libraries/LibGUI/Statusbar.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2018-2020, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -16,7 +17,7 @@ namespace GUI { class Statusbar : public Widget { C_OBJECT(Statusbar) public: - virtual ~Statusbar() override; + virtual ~Statusbar() override = default; String text(size_t index = 0) const; void set_text(String); diff --git a/Userland/Libraries/LibGUI/TabWidget.cpp b/Userland/Libraries/LibGUI/TabWidget.cpp index 76d6d577b01..f9f6e23aa9e 100644 --- a/Userland/Libraries/LibGUI/TabWidget.cpp +++ b/Userland/Libraries/LibGUI/TabWidget.cpp @@ -1,6 +1,7 @@ /* * Copyright (c) 2018-2021, Andreas Kling * Copyright (c) 2021, Peter Elliott + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -40,10 +41,6 @@ TabWidget::TabWidget() }); } -TabWidget::~TabWidget() -{ -} - ErrorOr TabWidget::try_add_widget(String title, Widget& widget) { m_tabs.append({ move(title), nullptr, &widget }); diff --git a/Userland/Libraries/LibGUI/TabWidget.h b/Userland/Libraries/LibGUI/TabWidget.h index d3d4977f6c5..c3a793374de 100644 --- a/Userland/Libraries/LibGUI/TabWidget.h +++ b/Userland/Libraries/LibGUI/TabWidget.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2018-2021, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -19,7 +20,7 @@ public: Bottom, }; - virtual ~TabWidget() override; + virtual ~TabWidget() override = default; TabPosition tab_position() const { return m_tab_position; } void set_tab_position(TabPosition); diff --git a/Userland/Libraries/LibGUI/TableView.cpp b/Userland/Libraries/LibGUI/TableView.cpp index a7c65689888..0820bb41725 100644 --- a/Userland/Libraries/LibGUI/TableView.cpp +++ b/Userland/Libraries/LibGUI/TableView.cpp @@ -1,6 +1,7 @@ /* * Copyright (c) 2018-2020, Andreas Kling * Copyright (c) 2022, Glenford Williams + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -27,10 +28,6 @@ TableView::TableView() set_foreground_role(ColorRole::BaseText); } -TableView::~TableView() -{ -} - void TableView::paint_event(PaintEvent& event) { Color widget_background_color = palette().color(background_role()); diff --git a/Userland/Libraries/LibGUI/TableView.h b/Userland/Libraries/LibGUI/TableView.h index f6736b34e29..94f7f13ae32 100644 --- a/Userland/Libraries/LibGUI/TableView.h +++ b/Userland/Libraries/LibGUI/TableView.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2018-2020, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -13,7 +14,7 @@ namespace GUI { class TableView : public AbstractTableView { C_OBJECT(TableView) public: - virtual ~TableView() override; + virtual ~TableView() override = default; enum class GridStyle { None, diff --git a/Userland/Libraries/LibGUI/TextBox.cpp b/Userland/Libraries/LibGUI/TextBox.cpp index 909cd9627a0..c70d2cd8625 100644 --- a/Userland/Libraries/LibGUI/TextBox.cpp +++ b/Userland/Libraries/LibGUI/TextBox.cpp @@ -1,5 +1,6 @@ /* * Copyright (c) 2018-2020, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -19,10 +20,6 @@ TextBox::TextBox() set_fixed_height(22); } -TextBox::~TextBox() -{ -} - void TextBox::keydown_event(GUI::KeyEvent& event) { TextEditor::keydown_event(event); @@ -87,10 +84,6 @@ UrlBox::UrlBox() set_auto_focusable(false); } -UrlBox::~UrlBox() -{ -} - void UrlBox::focusout_event(GUI::FocusEvent& event) { set_focus_transition(true); diff --git a/Userland/Libraries/LibGUI/TextBox.h b/Userland/Libraries/LibGUI/TextBox.h index ccc53722c16..fc73af4d740 100644 --- a/Userland/Libraries/LibGUI/TextBox.h +++ b/Userland/Libraries/LibGUI/TextBox.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2018-2020, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -14,7 +15,7 @@ namespace GUI { class TextBox : public TextEditor { C_OBJECT(TextBox) public: - virtual ~TextBox() override; + virtual ~TextBox() override = default; Function on_up_pressed; Function on_down_pressed; @@ -48,7 +49,7 @@ private: class UrlBox : public TextBox { C_OBJECT(UrlBox) public: - virtual ~UrlBox() override; + virtual ~UrlBox() override = default; void set_focus_transition(bool focus_transition) { m_focus_transition = focus_transition; } bool is_focus_transition() const { return m_focus_transition; } diff --git a/Userland/Libraries/LibGUI/TextDocument.cpp b/Userland/Libraries/LibGUI/TextDocument.cpp index e24b3a388f3..4cf24c83b64 100644 --- a/Userland/Libraries/LibGUI/TextDocument.cpp +++ b/Userland/Libraries/LibGUI/TextDocument.cpp @@ -1,5 +1,6 @@ /* * Copyright (c) 2018-2020, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -35,10 +36,6 @@ TextDocument::TextDocument(Client* client) }; } -TextDocument::~TextDocument() -{ -} - bool TextDocument::set_text(StringView text, AllowCallback allow_callback) { m_client_notifications_enabled = false; @@ -289,10 +286,6 @@ void TextDocument::remove_all_lines() } } -TextDocument::Client::~Client() -{ -} - void TextDocument::register_client(Client& client) { m_clients.set(&client); @@ -753,10 +746,6 @@ TextDocumentUndoCommand::TextDocumentUndoCommand(TextDocument& document) { } -TextDocumentUndoCommand::~TextDocumentUndoCommand() -{ -} - InsertTextCommand::InsertTextCommand(TextDocument& document, const String& text, const TextPosition& position) : TextDocumentUndoCommand(document) , m_text(text) diff --git a/Userland/Libraries/LibGUI/TextDocument.h b/Userland/Libraries/LibGUI/TextDocument.h index efe7a3e4e05..db611dda69c 100644 --- a/Userland/Libraries/LibGUI/TextDocument.h +++ b/Userland/Libraries/LibGUI/TextDocument.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2018-2021, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -40,7 +41,7 @@ public: class Client { public: - virtual ~Client(); + virtual ~Client() = default; virtual void document_did_append_line() = 0; virtual void document_did_insert_line(size_t) = 0; virtual void document_did_remove_line(size_t) = 0; @@ -55,7 +56,7 @@ public: }; static NonnullRefPtr create(Client* client = nullptr); - virtual ~TextDocument(); + virtual ~TextDocument() = default; size_t line_count() const { return m_lines.size(); } const TextDocumentLine& line(size_t line_index) const { return m_lines[line_index]; } @@ -187,7 +188,7 @@ private: class TextDocumentUndoCommand : public Command { public: TextDocumentUndoCommand(TextDocument&); - virtual ~TextDocumentUndoCommand(); + virtual ~TextDocumentUndoCommand() = default; virtual void perform_formatting(const TextDocument::Client&) { } void execute_from(const TextDocument::Client& client) diff --git a/Userland/Libraries/LibGUI/TextRange.h b/Userland/Libraries/LibGUI/TextRange.h index de9f13102cf..736e2baa3d9 100644 --- a/Userland/Libraries/LibGUI/TextRange.h +++ b/Userland/Libraries/LibGUI/TextRange.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2018-2020, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -12,7 +13,7 @@ namespace GUI { class TextRange { public: - TextRange() { } + TextRange() = default; TextRange(const TextPosition& start, const TextPosition& end) : m_start(start) , m_end(end) diff --git a/Userland/Libraries/LibGUI/Toolbar.cpp b/Userland/Libraries/LibGUI/Toolbar.cpp index b87d172a3d0..f42865341f2 100644 --- a/Userland/Libraries/LibGUI/Toolbar.cpp +++ b/Userland/Libraries/LibGUI/Toolbar.cpp @@ -1,5 +1,6 @@ /* * Copyright (c) 2018-2021, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -35,15 +36,11 @@ Toolbar::Toolbar(Orientation orientation, int button_size) layout()->set_margins({ 2, 2, 2, 2 }); } -Toolbar::~Toolbar() -{ -} - class ToolbarButton final : public Button { C_OBJECT(ToolbarButton); public: - virtual ~ToolbarButton() override { } + virtual ~ToolbarButton() override = default; private: explicit ToolbarButton(Action& action) diff --git a/Userland/Libraries/LibGUI/Toolbar.h b/Userland/Libraries/LibGUI/Toolbar.h index 8070867d2b6..0c51a82c6b1 100644 --- a/Userland/Libraries/LibGUI/Toolbar.h +++ b/Userland/Libraries/LibGUI/Toolbar.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2018-2020, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -15,7 +16,7 @@ namespace GUI { class Toolbar : public Widget { C_OBJECT(Toolbar) public: - virtual ~Toolbar() override; + virtual ~Toolbar() override = default; ErrorOr> try_add_action(GUI::Action&); ErrorOr try_add_separator(); diff --git a/Userland/Libraries/LibGUI/Tray.cpp b/Userland/Libraries/LibGUI/Tray.cpp index a15c095fce9..a2cea687e19 100644 --- a/Userland/Libraries/LibGUI/Tray.cpp +++ b/Userland/Libraries/LibGUI/Tray.cpp @@ -1,5 +1,6 @@ /* * Copyright (c) 2021, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -21,10 +22,6 @@ Tray::Tray() set_focus_policy(GUI::FocusPolicy::TabFocus); } -Tray::~Tray() -{ -} - Gfx::IntRect Tray::Item::rect(Tray const& tray) const { static constexpr int item_height = 22; diff --git a/Userland/Libraries/LibGUI/Tray.h b/Userland/Libraries/LibGUI/Tray.h index 57e019fe010..9ffe2282d06 100644 --- a/Userland/Libraries/LibGUI/Tray.h +++ b/Userland/Libraries/LibGUI/Tray.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2021, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -15,7 +16,7 @@ class Tray : public GUI::Frame { C_OBJECT(Tray); public: - virtual ~Tray() override; + virtual ~Tray() override = default; size_t add_item(String text, RefPtr, String custom_data); diff --git a/Userland/Libraries/LibGUI/TreeView.cpp b/Userland/Libraries/LibGUI/TreeView.cpp index c7f6d0f3903..50a20e9e94a 100644 --- a/Userland/Libraries/LibGUI/TreeView.cpp +++ b/Userland/Libraries/LibGUI/TreeView.cpp @@ -1,5 +1,6 @@ /* * Copyright (c) 2018-2020, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -43,10 +44,6 @@ TreeView::TreeView() m_collapse_bitmap = Gfx::Bitmap::try_load_from_file("/res/icons/serenity/treeview-collapse.png").release_value_but_fixme_should_propagate_errors(); } -TreeView::~TreeView() -{ -} - ModelIndex TreeView::index_at_event_position(const Gfx::IntPoint& a_position, bool& is_toggle) const { auto position = a_position.translated(0, -column_header().height()).translated(horizontal_scrollbar().value() - frame_thickness(), vertical_scrollbar().value() - frame_thickness()); diff --git a/Userland/Libraries/LibGUI/TreeView.h b/Userland/Libraries/LibGUI/TreeView.h index 6b91783af1f..abb9c40436c 100644 --- a/Userland/Libraries/LibGUI/TreeView.h +++ b/Userland/Libraries/LibGUI/TreeView.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2018-2020, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -14,7 +15,7 @@ namespace GUI { class TreeView : public AbstractTableView { C_OBJECT(TreeView) public: - virtual ~TreeView() override; + virtual ~TreeView() override = default; virtual void scroll_into_view(const ModelIndex&, bool scroll_horizontally, bool scroll_vertically) override; diff --git a/Userland/Libraries/LibGUI/UndoStack.cpp b/Userland/Libraries/LibGUI/UndoStack.cpp index 6c265672c43..6ac2205648a 100644 --- a/Userland/Libraries/LibGUI/UndoStack.cpp +++ b/Userland/Libraries/LibGUI/UndoStack.cpp @@ -1,5 +1,6 @@ /* * Copyright (c) 2018-2020, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -9,14 +10,6 @@ namespace GUI { -UndoStack::UndoStack() -{ -} - -UndoStack::~UndoStack() -{ -} - bool UndoStack::can_undo() const { return m_stack_index > 0; diff --git a/Userland/Libraries/LibGUI/UndoStack.h b/Userland/Libraries/LibGUI/UndoStack.h index cfc0b2c6ca0..ab58d140e5a 100644 --- a/Userland/Libraries/LibGUI/UndoStack.h +++ b/Userland/Libraries/LibGUI/UndoStack.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2018-2020, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -15,8 +16,8 @@ namespace GUI { class UndoStack { public: - UndoStack(); - ~UndoStack(); + UndoStack() = default; + ~UndoStack() = default; void push(NonnullOwnPtr); diff --git a/Userland/Libraries/LibGUI/ValueSlider.cpp b/Userland/Libraries/LibGUI/ValueSlider.cpp index 42e09f0be78..b7995fd0f81 100644 --- a/Userland/Libraries/LibGUI/ValueSlider.cpp +++ b/Userland/Libraries/LibGUI/ValueSlider.cpp @@ -1,5 +1,6 @@ /* * Copyright (c) 2021, Marcus Nilsson + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -67,10 +68,6 @@ ValueSlider::ValueSlider(Gfx::Orientation orientation, String suffix) }; } -ValueSlider::~ValueSlider() -{ -} - String ValueSlider::formatted_value() const { return String::formatted("{:2}{}", value(), m_suffix); diff --git a/Userland/Libraries/LibGUI/ValueSlider.h b/Userland/Libraries/LibGUI/ValueSlider.h index 8fa3e8c2cce..546917fbdd0 100644 --- a/Userland/Libraries/LibGUI/ValueSlider.h +++ b/Userland/Libraries/LibGUI/ValueSlider.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2021, Marcus Nilsson + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -19,7 +20,7 @@ public: Thin, }; - virtual ~ValueSlider() override; + virtual ~ValueSlider() override = default; void set_suffix(String suffix) { m_suffix = move(suffix); } void set_knob_style(KnobStyle knobstyle) { m_knob_style = knobstyle; } diff --git a/Userland/Libraries/LibGUI/Widget.cpp b/Userland/Libraries/LibGUI/Widget.cpp index 6f094a6d6c9..7686960b5ec 100644 --- a/Userland/Libraries/LibGUI/Widget.cpp +++ b/Userland/Libraries/LibGUI/Widget.cpp @@ -1,5 +1,6 @@ /* * Copyright (c) 2018-2020, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -188,9 +189,7 @@ Widget::Widget() }); } -Widget::~Widget() -{ -} +Widget::~Widget() = default; void Widget::child_event(Core::ChildEvent& event) { diff --git a/Userland/Libraries/LibGUI/Widget.h b/Userland/Libraries/LibGUI/Widget.h index c6e13912693..f6fb217c2e4 100644 --- a/Userland/Libraries/LibGUI/Widget.h +++ b/Userland/Libraries/LibGUI/Widget.h @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include diff --git a/Userland/Libraries/LibGUI/Wizards/AbstractWizardPage.cpp b/Userland/Libraries/LibGUI/Wizards/AbstractWizardPage.cpp index b52e90a5c41..b8ae89085df 100644 --- a/Userland/Libraries/LibGUI/Wizards/AbstractWizardPage.cpp +++ b/Userland/Libraries/LibGUI/Wizards/AbstractWizardPage.cpp @@ -1,5 +1,6 @@ /* * Copyright (c) 2021, Nick Vella + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -8,14 +9,6 @@ namespace GUI { -AbstractWizardPage::AbstractWizardPage() -{ -} - -AbstractWizardPage::~AbstractWizardPage() -{ -} - RefPtr AbstractWizardPage::next_page() { if (on_next_page) diff --git a/Userland/Libraries/LibGUI/Wizards/AbstractWizardPage.h b/Userland/Libraries/LibGUI/Wizards/AbstractWizardPage.h index a1d6d413169..8b518a4f3d4 100644 --- a/Userland/Libraries/LibGUI/Wizards/AbstractWizardPage.h +++ b/Userland/Libraries/LibGUI/Wizards/AbstractWizardPage.h @@ -15,7 +15,7 @@ class AbstractWizardPage : public Widget { C_OBJECT_ABSTRACT(AbstractWizardPage); public: - virtual ~AbstractWizardPage() override; + virtual ~AbstractWizardPage() override = default; Function()> on_next_page; virtual RefPtr next_page(); @@ -31,7 +31,7 @@ public: void set_is_final_page(bool val) { m_is_final_page = val; } protected: - AbstractWizardPage(); + AbstractWizardPage() = default; private: bool m_is_final_page { false }; diff --git a/Userland/Libraries/LibGUI/Wizards/WizardDialog.cpp b/Userland/Libraries/LibGUI/Wizards/WizardDialog.cpp index a1978fd5116..c1d3cad741c 100644 --- a/Userland/Libraries/LibGUI/Wizards/WizardDialog.cpp +++ b/Userland/Libraries/LibGUI/Wizards/WizardDialog.cpp @@ -1,5 +1,6 @@ /* * Copyright (c) 2021, Nick Vella + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -78,10 +79,6 @@ WizardDialog::WizardDialog(Window* parent_window) update_navigation(); } -WizardDialog::~WizardDialog() -{ -} - void WizardDialog::push_page(AbstractWizardPage& page) { if (!m_page_stack.is_empty()) diff --git a/Userland/Libraries/LibGUI/Wizards/WizardDialog.h b/Userland/Libraries/LibGUI/Wizards/WizardDialog.h index d87f43c097b..f8ce753025a 100644 --- a/Userland/Libraries/LibGUI/Wizards/WizardDialog.h +++ b/Userland/Libraries/LibGUI/Wizards/WizardDialog.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2021, Nick Vella + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -15,7 +16,7 @@ namespace GUI { class WizardDialog : public Dialog { C_OBJECT(WizardDialog) public: - virtual ~WizardDialog() override; + virtual ~WizardDialog() override = default; static void show(AbstractWizardPage& first_page, Window* parent_window = nullptr) {