diff --git a/Userland/Services/AudioServer/ConnectionFromClient.cpp b/Userland/Services/AudioServer/ConnectionFromClient.cpp index 1433b09bdb..d8f97f4bf6 100644 --- a/Userland/Services/AudioServer/ConnectionFromClient.cpp +++ b/Userland/Services/AudioServer/ConnectionFromClient.cpp @@ -29,10 +29,6 @@ ConnectionFromClient::ConnectionFromClient(NonnullOwnPtr { C_OBJECT(ConnectionFromClient) public: - ~ConnectionFromClient() override; + ~ConnectionFromClient() override = default; void did_finish_playing_buffer(Badge, int buffer_id); void did_change_client_volume(Badge, double volume); diff --git a/Userland/Services/AudioServer/Mixer.cpp b/Userland/Services/AudioServer/Mixer.cpp index 2f29317661..98525d60ec 100644 --- a/Userland/Services/AudioServer/Mixer.cpp +++ b/Userland/Services/AudioServer/Mixer.cpp @@ -44,10 +44,6 @@ Mixer::Mixer(NonnullRefPtr config) m_sound_thread->start(); } -Mixer::~Mixer() -{ -} - NonnullRefPtr Mixer::create_queue(ConnectionFromClient& client) { auto queue = adopt_ref(*new ClientAudioStream(client)); diff --git a/Userland/Services/AudioServer/Mixer.h b/Userland/Services/AudioServer/Mixer.h index 4574bd8480..c207f687d5 100644 --- a/Userland/Services/AudioServer/Mixer.h +++ b/Userland/Services/AudioServer/Mixer.h @@ -35,7 +35,7 @@ class ConnectionFromClient; class ClientAudioStream : public RefCounted { public: explicit ClientAudioStream(ConnectionFromClient&); - ~ClientAudioStream() { } + ~ClientAudioStream() = default; bool is_full() const { return m_queue.size() >= 3; } void enqueue(NonnullRefPtr&&); @@ -112,7 +112,7 @@ private: class Mixer : public Core::Object { C_OBJECT(Mixer) public: - virtual ~Mixer() override; + virtual ~Mixer() override = default; NonnullRefPtr create_queue(ConnectionFromClient&); diff --git a/Userland/Services/ChessEngine/ChessEngine.h b/Userland/Services/ChessEngine/ChessEngine.h index c2c63e3577..766a39aa3b 100644 --- a/Userland/Services/ChessEngine/ChessEngine.h +++ b/Userland/Services/ChessEngine/ChessEngine.h @@ -12,14 +12,14 @@ class ChessEngine : public Chess::UCI::Endpoint { C_OBJECT(ChessEngine) public: - virtual ~ChessEngine() override { } + virtual ~ChessEngine() override = default; virtual void handle_uci() override; virtual void handle_position(const Chess::UCI::PositionCommand&) override; virtual void handle_go(const Chess::UCI::GoCommand&) override; private: - ChessEngine() { } + ChessEngine() = default; ChessEngine(NonnullRefPtr in, NonnullRefPtr out) : Endpoint(in, out) { diff --git a/Userland/Services/Clipboard/ConnectionFromClient.cpp b/Userland/Services/Clipboard/ConnectionFromClient.cpp index 9a26642357..f152b609b0 100644 --- a/Userland/Services/Clipboard/ConnectionFromClient.cpp +++ b/Userland/Services/Clipboard/ConnectionFromClient.cpp @@ -25,10 +25,6 @@ ConnectionFromClient::ConnectionFromClient(NonnullOwnPtr& metadata) { m_buffer = move(data); diff --git a/Userland/Services/Clipboard/Storage.h b/Userland/Services/Clipboard/Storage.h index 204fac61c9..07cfb46bf4 100644 --- a/Userland/Services/Clipboard/Storage.h +++ b/Userland/Services/Clipboard/Storage.h @@ -16,7 +16,7 @@ namespace Clipboard { class Storage { public: static Storage& the(); - ~Storage(); + ~Storage() = default; bool has_data() const { return m_buffer.is_valid(); } @@ -44,7 +44,7 @@ public: const Core::AnonymousBuffer& buffer() const { return m_buffer; } private: - Storage(); + Storage() = default; String m_mime_type; Core::AnonymousBuffer m_buffer; diff --git a/Userland/Services/ConfigServer/ConnectionFromClient.cpp b/Userland/Services/ConfigServer/ConnectionFromClient.cpp index ff5f29371b..fbf86aae33 100644 --- a/Userland/Services/ConfigServer/ConnectionFromClient.cpp +++ b/Userland/Services/ConfigServer/ConnectionFromClient.cpp @@ -81,10 +81,6 @@ ConnectionFromClient::ConnectionFromClient(NonnullOwnPtr { C_OBJECT(ConnectionFromClient) public: - ~ConnectionFromClient() override; + ~ConnectionFromClient() override = default; virtual void die() override; diff --git a/Userland/Services/DHCPClient/DHCPv4Client.cpp b/Userland/Services/DHCPClient/DHCPv4Client.cpp index 7de5097336..b9a4a0a2f8 100644 --- a/Userland/Services/DHCPClient/DHCPv4Client.cpp +++ b/Userland/Services/DHCPClient/DHCPv4Client.cpp @@ -201,10 +201,6 @@ ErrorOr DHCPv4Client::get_discoverable_interfaces() }; } -DHCPv4Client::~DHCPv4Client() -{ -} - void DHCPv4Client::handle_offer(const DHCPv4Packet& packet, const ParsedDHCPv4Options& options) { dbgln("We were offered {} for {}", packet.yiaddr().to_string(), options.get(DHCPOption::IPAddressLeaseTime).value_or(0)); diff --git a/Userland/Services/DHCPClient/DHCPv4Client.h b/Userland/Services/DHCPClient/DHCPv4Client.h index 0664b94837..ba2498e483 100644 --- a/Userland/Services/DHCPClient/DHCPv4Client.h +++ b/Userland/Services/DHCPClient/DHCPv4Client.h @@ -40,7 +40,7 @@ class DHCPv4Client final : public Core::Object { C_OBJECT(DHCPv4Client) public: - virtual ~DHCPv4Client() override; + virtual ~DHCPv4Client() override = default; void dhcp_discover(const InterfaceDescriptor& ifname); void dhcp_request(DHCPv4Transaction& transaction, const DHCPv4Packet& packet); diff --git a/Userland/Services/FileSystemAccessServer/ConnectionFromClient.cpp b/Userland/Services/FileSystemAccessServer/ConnectionFromClient.cpp index d385279178..67a4257b03 100644 --- a/Userland/Services/FileSystemAccessServer/ConnectionFromClient.cpp +++ b/Userland/Services/FileSystemAccessServer/ConnectionFromClient.cpp @@ -26,10 +26,6 @@ ConnectionFromClient::ConnectionFromClient(NonnullOwnPtris_eof()) { diff --git a/Userland/Services/InspectorServer/InspectableProcess.h b/Userland/Services/InspectorServer/InspectableProcess.h index ed1547cce0..bdd61e712a 100644 --- a/Userland/Services/InspectorServer/InspectableProcess.h +++ b/Userland/Services/InspectorServer/InspectableProcess.h @@ -13,7 +13,7 @@ namespace InspectorServer { class InspectableProcess { public: InspectableProcess(pid_t, NonnullOwnPtr); - ~InspectableProcess(); + ~InspectableProcess() = default; void send_request(JsonObject const& request); String wait_for_response(); diff --git a/Userland/Services/LaunchServer/ConnectionFromClient.cpp b/Userland/Services/LaunchServer/ConnectionFromClient.cpp index 1d515b0dbf..2140193a7a 100644 --- a/Userland/Services/LaunchServer/ConnectionFromClient.cpp +++ b/Userland/Services/LaunchServer/ConnectionFromClient.cpp @@ -19,10 +19,6 @@ ConnectionFromClient::ConnectionFromClient(NonnullOwnPtr { C_OBJECT(ConnectionFromClient) public: - ~ConnectionFromClient() override; + ~ConnectionFromClient() override = default; virtual void die() override; diff --git a/Userland/Services/LoginServer/LoginWindow.h b/Userland/Services/LoginServer/LoginWindow.h index 9df29d08b0..6b978928d8 100644 --- a/Userland/Services/LoginServer/LoginWindow.h +++ b/Userland/Services/LoginServer/LoginWindow.h @@ -16,7 +16,7 @@ class LoginWindow final : public GUI::Window { C_OBJECT(LoginWindow); public: - virtual ~LoginWindow() override { } + virtual ~LoginWindow() override = default; Function on_submit; diff --git a/Userland/Services/LookupServer/ConnectionFromClient.cpp b/Userland/Services/LookupServer/ConnectionFromClient.cpp index 09a5e6771a..d98c7c2852 100644 --- a/Userland/Services/LookupServer/ConnectionFromClient.cpp +++ b/Userland/Services/LookupServer/ConnectionFromClient.cpp @@ -19,10 +19,6 @@ ConnectionFromClient::ConnectionFromClient(NonnullOwnPtr from_raw_packet(const u8*, size_t); ByteBuffer to_byte_buffer() const; diff --git a/Userland/Services/NotificationServer/ConnectionFromClient.cpp b/Userland/Services/NotificationServer/ConnectionFromClient.cpp index 5b779b4463..3be8a3708f 100644 --- a/Userland/Services/NotificationServer/ConnectionFromClient.cpp +++ b/Userland/Services/NotificationServer/ConnectionFromClient.cpp @@ -19,10 +19,6 @@ ConnectionFromClient::ConnectionFromClient(NonnullOwnPtr { C_OBJECT(ConnectionFromClient) public: - ~ConnectionFromClient() override; + ~ConnectionFromClient() override = default; virtual void die() override; diff --git a/Userland/Services/NotificationServer/NotificationWindow.cpp b/Userland/Services/NotificationServer/NotificationWindow.cpp index bea860aa35..0c87849ce8 100644 --- a/Userland/Services/NotificationServer/NotificationWindow.cpp +++ b/Userland/Services/NotificationServer/NotificationWindow.cpp @@ -98,10 +98,6 @@ NotificationWindow::NotificationWindow(i32 client_id, const String& text, const }; } -NotificationWindow::~NotificationWindow() -{ -} - RefPtr NotificationWindow::get_window_by_id(i32 id) { auto window = s_windows.get(id); diff --git a/Userland/Services/NotificationServer/NotificationWindow.h b/Userland/Services/NotificationServer/NotificationWindow.h index 8fc47e78a7..a6ca12686b 100644 --- a/Userland/Services/NotificationServer/NotificationWindow.h +++ b/Userland/Services/NotificationServer/NotificationWindow.h @@ -15,7 +15,7 @@ class NotificationWindow final : public GUI::Window { C_OBJECT(NotificationWindow); public: - virtual ~NotificationWindow() override; + virtual ~NotificationWindow() override = default; void set_original_rect(Gfx::IntRect original_rect) { m_original_rect = original_rect; }; void set_text(const String&); diff --git a/Userland/Services/RequestServer/ConnectionFromClient.cpp b/Userland/Services/RequestServer/ConnectionFromClient.cpp index 2e0e607e30..dd2937e61d 100644 --- a/Userland/Services/RequestServer/ConnectionFromClient.cpp +++ b/Userland/Services/RequestServer/ConnectionFromClient.cpp @@ -22,10 +22,6 @@ ConnectionFromClient::ConnectionFromClient(NonnullOwnPtr GeminiProtocol::start_request(ConnectionFromClient& client, const String&, const URL& url, const HashMap&, ReadonlyBytes) { Gemini::GeminiRequest request; diff --git a/Userland/Services/RequestServer/GeminiProtocol.h b/Userland/Services/RequestServer/GeminiProtocol.h index 7577bf1c6f..37d0e35091 100644 --- a/Userland/Services/RequestServer/GeminiProtocol.h +++ b/Userland/Services/RequestServer/GeminiProtocol.h @@ -13,7 +13,7 @@ namespace RequestServer { class GeminiProtocol final : public Protocol { public: GeminiProtocol(); - virtual ~GeminiProtocol() override; + virtual ~GeminiProtocol() override = default; virtual OwnPtr start_request(ConnectionFromClient&, const String& method, const URL&, const HashMap&, ReadonlyBytes body) override; }; diff --git a/Userland/Services/RequestServer/Request.cpp b/Userland/Services/RequestServer/Request.cpp index 06c6e2f593..f733115ee1 100644 --- a/Userland/Services/RequestServer/Request.cpp +++ b/Userland/Services/RequestServer/Request.cpp @@ -19,10 +19,6 @@ Request::Request(ConnectionFromClient& client, NonnullOwnPtr { } -Request::~Request() -{ -} - void Request::stop() { m_client.did_finish_request({}, *this, false); diff --git a/Userland/Services/RequestServer/Request.h b/Userland/Services/RequestServer/Request.h index 9956a7f9c3..8c16399463 100644 --- a/Userland/Services/RequestServer/Request.h +++ b/Userland/Services/RequestServer/Request.h @@ -18,7 +18,7 @@ namespace RequestServer { class Request { public: - virtual ~Request(); + virtual ~Request() = default; i32 id() const { return m_id; } virtual URL url() const = 0; diff --git a/Userland/Services/SQLServer/ConnectionFromClient.cpp b/Userland/Services/SQLServer/ConnectionFromClient.cpp index b6f0cece84..97ac76d324 100644 --- a/Userland/Services/SQLServer/ConnectionFromClient.cpp +++ b/Userland/Services/SQLServer/ConnectionFromClient.cpp @@ -29,10 +29,6 @@ ConnectionFromClient::ConnectionFromClient(NonnullOwnPtr QuickLaunchEntry::create_from_config_value(StringView value) { if (!value.starts_with("/") && value.ends_with(".af")) { diff --git a/Userland/Services/Taskbar/QuickLaunchWidget.h b/Userland/Services/Taskbar/QuickLaunchWidget.h index 5896d97aae..8d1b9e7b7f 100644 --- a/Userland/Services/Taskbar/QuickLaunchWidget.h +++ b/Userland/Services/Taskbar/QuickLaunchWidget.h @@ -78,7 +78,7 @@ class QuickLaunchWidget : public GUI::Frame C_OBJECT(QuickLaunchWidget); public: - virtual ~QuickLaunchWidget() override; + virtual ~QuickLaunchWidget() override = default; virtual void config_key_was_removed(String const&, String const&, String const&) override; virtual void config_string_did_change(String const&, String const&, String const&, String const&) override; diff --git a/Userland/Services/Taskbar/ShutdownDialog.cpp b/Userland/Services/Taskbar/ShutdownDialog.cpp index afd3367128..1a11985198 100644 --- a/Userland/Services/Taskbar/ShutdownDialog.cpp +++ b/Userland/Services/Taskbar/ShutdownDialog.cpp @@ -117,7 +117,3 @@ ShutdownDialog::ShutdownDialog() // Request WindowServer to re-update us on the current theme as we might've not been alive for the last notification. refresh_system_theme(); } - -ShutdownDialog::~ShutdownDialog() -{ -} diff --git a/Userland/Services/Taskbar/ShutdownDialog.h b/Userland/Services/Taskbar/ShutdownDialog.h index fe1eb8ec4a..8a7fe14019 100644 --- a/Userland/Services/Taskbar/ShutdownDialog.h +++ b/Userland/Services/Taskbar/ShutdownDialog.h @@ -17,7 +17,7 @@ public: private: ShutdownDialog(); - virtual ~ShutdownDialog() override; + virtual ~ShutdownDialog() override = default; int m_selected_option { -1 }; }; diff --git a/Userland/Services/Taskbar/TaskbarButton.cpp b/Userland/Services/Taskbar/TaskbarButton.cpp index b6cef3e1fb..94a01ed82a 100644 --- a/Userland/Services/Taskbar/TaskbarButton.cpp +++ b/Userland/Services/Taskbar/TaskbarButton.cpp @@ -19,10 +19,6 @@ TaskbarButton::TaskbarButton(const WindowIdentifier& identifier) { } -TaskbarButton::~TaskbarButton() -{ -} - void TaskbarButton::context_menu_event(GUI::ContextMenuEvent&) { GUI::ConnectionToWindowMangerServer::the().async_popup_window_menu( diff --git a/Userland/Services/Taskbar/TaskbarButton.h b/Userland/Services/Taskbar/TaskbarButton.h index cc2ab900d3..1947a92bd8 100644 --- a/Userland/Services/Taskbar/TaskbarButton.h +++ b/Userland/Services/Taskbar/TaskbarButton.h @@ -12,7 +12,7 @@ class TaskbarButton final : public GUI::Button { C_OBJECT(TaskbarButton) public: - virtual ~TaskbarButton() override; + virtual ~TaskbarButton() override = default; void update_taskbar_rect(); void clear_taskbar_rect(); diff --git a/Userland/Services/Taskbar/TaskbarWindow.cpp b/Userland/Services/Taskbar/TaskbarWindow.cpp index 80c8b10603..a66c72ec00 100644 --- a/Userland/Services/Taskbar/TaskbarWindow.cpp +++ b/Userland/Services/Taskbar/TaskbarWindow.cpp @@ -30,10 +30,10 @@ class TaskbarWidget final : public GUI::Widget { C_OBJECT(TaskbarWidget); public: - virtual ~TaskbarWidget() override { } + virtual ~TaskbarWidget() override = default; private: - TaskbarWidget() { } + TaskbarWidget() = default; virtual void paint_event(GUI::PaintEvent& event) override { @@ -99,10 +99,6 @@ TaskbarWindow::TaskbarWindow(NonnullRefPtr start_menu) m_assistant_app_file = Desktop::AppFile::open(af_path); } -TaskbarWindow::~TaskbarWindow() -{ -} - void TaskbarWindow::show_desktop_button_clicked(unsigned) { GUI::ConnectionToWindowMangerServer::the().async_toggle_show_desktop(); diff --git a/Userland/Services/Taskbar/TaskbarWindow.h b/Userland/Services/Taskbar/TaskbarWindow.h index 4def879275..813a0c61e4 100644 --- a/Userland/Services/Taskbar/TaskbarWindow.h +++ b/Userland/Services/Taskbar/TaskbarWindow.h @@ -18,7 +18,7 @@ class TaskbarWindow final : public GUI::Window { C_OBJECT(TaskbarWindow); public: - virtual ~TaskbarWindow() override; + virtual ~TaskbarWindow() override = default; static int taskbar_height() { return 27; } static int taskbar_icon_size() { return 16; } diff --git a/Userland/Services/WebContent/ConnectionFromClient.cpp b/Userland/Services/WebContent/ConnectionFromClient.cpp index 0f4fc133bc..b7605e33c0 100644 --- a/Userland/Services/WebContent/ConnectionFromClient.cpp +++ b/Userland/Services/WebContent/ConnectionFromClient.cpp @@ -41,10 +41,6 @@ ConnectionFromClient::ConnectionFromClient(NonnullOwnPtr internal_get_prototype_of() const override; virtual JS::ThrowCompletionOr internal_set_prototype_of(Object* prototype) override; diff --git a/Userland/Services/WebContent/PageHost.cpp b/Userland/Services/WebContent/PageHost.cpp index b5d22f0418..5a23732afc 100644 --- a/Userland/Services/WebContent/PageHost.cpp +++ b/Userland/Services/WebContent/PageHost.cpp @@ -28,10 +28,6 @@ PageHost::PageHost(ConnectionFromClient& client) }); } -PageHost::~PageHost() -{ -} - void PageHost::set_has_focus(bool has_focus) { m_has_focus = has_focus; diff --git a/Userland/Services/WebContent/PageHost.h b/Userland/Services/WebContent/PageHost.h index abaef859d3..4aeded7d50 100644 --- a/Userland/Services/WebContent/PageHost.h +++ b/Userland/Services/WebContent/PageHost.h @@ -19,7 +19,7 @@ class PageHost final : public Web::PageClient { public: static NonnullOwnPtr create(ConnectionFromClient& client) { return adopt_own(*new PageHost(client)); } - virtual ~PageHost(); + virtual ~PageHost() = default; Web::Page& page() { return *m_page; } const Web::Page& page() const { return *m_page; } diff --git a/Userland/Services/WebSocket/ConnectionFromClient.cpp b/Userland/Services/WebSocket/ConnectionFromClient.cpp index 52ee645895..17cd938fea 100644 --- a/Userland/Services/WebSocket/ConnectionFromClient.cpp +++ b/Userland/Services/WebSocket/ConnectionFromClient.cpp @@ -19,10 +19,6 @@ ConnectionFromClient::ConnectionFromClient(NonnullOwnPtr&& on_click_handler) { } -Button::~Button() -{ -} +Button::~Button() = default; void Button::paint(Screen& screen, Gfx::Painter& painter) { diff --git a/Userland/Services/WindowServer/Cursor.h b/Userland/Services/WindowServer/Cursor.h index 5a414029d6..8991432dce 100644 --- a/Userland/Services/WindowServer/Cursor.h +++ b/Userland/Services/WindowServer/Cursor.h @@ -46,7 +46,7 @@ public: Gfx::IntSize size() const { return m_rect.size(); } private: - Cursor() { } + Cursor() = default; Cursor(NonnullRefPtr&&, int, const Gfx::CursorParams&); bool load(StringView, StringView); diff --git a/Userland/Services/WindowServer/Event.h b/Userland/Services/WindowServer/Event.h index 18aaf0af5d..ff2a95f697 100644 --- a/Userland/Services/WindowServer/Event.h +++ b/Userland/Services/WindowServer/Event.h @@ -37,12 +37,12 @@ public: WindowResized, }; - Event() { } + Event() = default; explicit Event(Type type) : Core::Event(type) { } - virtual ~Event() { } + virtual ~Event() = default; bool is_mouse_event() const { return type() == MouseMove || type() == MouseDown || type() == MouseDoubleClick || type() == MouseUp || type() == MouseWheel; } bool is_key_event() const { return type() == KeyUp || type() == KeyDown; } diff --git a/Userland/Services/WindowServer/EventLoop.cpp b/Userland/Services/WindowServer/EventLoop.cpp index d7621fc241..1da51d8558 100644 --- a/Userland/Services/WindowServer/EventLoop.cpp +++ b/Userland/Services/WindowServer/EventLoop.cpp @@ -41,10 +41,6 @@ EventLoop::EventLoop() } } -EventLoop::~EventLoop() -{ -} - void EventLoop::drain_mouse() { auto& screen_input = ScreenInput::the(); diff --git a/Userland/Services/WindowServer/EventLoop.h b/Userland/Services/WindowServer/EventLoop.h index 8d9b1b6394..f0125bc119 100644 --- a/Userland/Services/WindowServer/EventLoop.h +++ b/Userland/Services/WindowServer/EventLoop.h @@ -20,7 +20,7 @@ class ConnectionFromClient; class EventLoop { public: EventLoop(); - virtual ~EventLoop(); + virtual ~EventLoop() = default; int exec() { return m_event_loop.exec(); } diff --git a/Userland/Services/WindowServer/KeymapSwitcher.cpp b/Userland/Services/WindowServer/KeymapSwitcher.cpp index ac47e2473b..2781dd7145 100644 --- a/Userland/Services/WindowServer/KeymapSwitcher.cpp +++ b/Userland/Services/WindowServer/KeymapSwitcher.cpp @@ -26,10 +26,6 @@ KeymapSwitcher::KeymapSwitcher() refresh(); } -KeymapSwitcher::~KeymapSwitcher() -{ -} - void KeymapSwitcher::refresh() { m_keymaps.clear(); diff --git a/Userland/Services/WindowServer/KeymapSwitcher.h b/Userland/Services/WindowServer/KeymapSwitcher.h index a2d0ddf235..bbae14c1a3 100644 --- a/Userland/Services/WindowServer/KeymapSwitcher.h +++ b/Userland/Services/WindowServer/KeymapSwitcher.h @@ -19,7 +19,7 @@ namespace WindowServer { class KeymapSwitcher final : public Core::Object { C_OBJECT(KeymapSwitcher) public: - virtual ~KeymapSwitcher() override; + virtual ~KeymapSwitcher() override = default; void next_keymap(); diff --git a/Userland/Services/WindowServer/Menu.cpp b/Userland/Services/WindowServer/Menu.cpp index 7112cb0808..98e77aaa8e 100644 --- a/Userland/Services/WindowServer/Menu.cpp +++ b/Userland/Services/WindowServer/Menu.cpp @@ -47,10 +47,6 @@ Menu::Menu(ConnectionFromClient* client, int menu_id, String name) m_alt_shortcut_character = find_ampersand_shortcut_character(m_name); } -Menu::~Menu() -{ -} - const Gfx::Font& Menu::font() const { return Gfx::FontDatabase::default_font(); diff --git a/Userland/Services/WindowServer/Menu.h b/Userland/Services/WindowServer/Menu.h index 348b58436e..8b1b40abf6 100644 --- a/Userland/Services/WindowServer/Menu.h +++ b/Userland/Services/WindowServer/Menu.h @@ -28,7 +28,7 @@ class Menu final : public Core::Object { C_OBJECT(Menu); public: - virtual ~Menu() override; + virtual ~Menu() override = default; ConnectionFromClient* client() { return m_client; } const ConnectionFromClient* client() const { return m_client; } diff --git a/Userland/Services/WindowServer/MenuItem.cpp b/Userland/Services/WindowServer/MenuItem.cpp index 14dde1545d..707a365327 100644 --- a/Userland/Services/WindowServer/MenuItem.cpp +++ b/Userland/Services/WindowServer/MenuItem.cpp @@ -31,10 +31,6 @@ MenuItem::MenuItem(Menu& menu, Type type) { } -MenuItem::~MenuItem() -{ -} - void MenuItem::set_enabled(bool enabled) { if (m_enabled == enabled) diff --git a/Userland/Services/WindowServer/MenuItem.h b/Userland/Services/WindowServer/MenuItem.h index 310e574274..cb9d640dff 100644 --- a/Userland/Services/WindowServer/MenuItem.h +++ b/Userland/Services/WindowServer/MenuItem.h @@ -25,7 +25,7 @@ public: MenuItem(Menu&, unsigned identifier, const String& text, const String& shortcut_text = {}, bool enabled = true, bool checkable = false, bool checked = false, const Gfx::Bitmap* icon = nullptr); MenuItem(Menu&, Type); - ~MenuItem(); + ~MenuItem() = default; Type type() const { return m_type; } diff --git a/Userland/Services/WindowServer/MenuManager.cpp b/Userland/Services/WindowServer/MenuManager.cpp index 3b0e631b30..e511befaf4 100644 --- a/Userland/Services/WindowServer/MenuManager.cpp +++ b/Userland/Services/WindowServer/MenuManager.cpp @@ -26,10 +26,6 @@ MenuManager::MenuManager() s_the = this; } -MenuManager::~MenuManager() -{ -} - bool MenuManager::is_open(const Menu& menu) const { for (size_t i = 0; i < m_open_menu_stack.size(); ++i) { diff --git a/Userland/Services/WindowServer/MenuManager.h b/Userland/Services/WindowServer/MenuManager.h index e9aa03a44f..c5177073f7 100644 --- a/Userland/Services/WindowServer/MenuManager.h +++ b/Userland/Services/WindowServer/MenuManager.h @@ -20,7 +20,7 @@ class MenuManager final : public Core::Object { public: static MenuManager& the(); - virtual ~MenuManager() override; + virtual ~MenuManager() override = default; bool is_open(const Menu&) const; bool has_open_menu() const { return !m_open_menu_stack.is_empty(); } diff --git a/Userland/Services/WindowServer/WindowFrame.cpp b/Userland/Services/WindowServer/WindowFrame.cpp index 97c7b44cc4..7c44578d27 100644 --- a/Userland/Services/WindowServer/WindowFrame.cpp +++ b/Userland/Services/WindowServer/WindowFrame.cpp @@ -112,9 +112,7 @@ void WindowFrame::window_was_constructed(Badge) m_has_alpha_channel = Gfx::WindowTheme::current().frame_uses_alpha(window_state_for_theme(), WindowManager::the().palette()); } -WindowFrame::~WindowFrame() -{ -} +WindowFrame::~WindowFrame() = default; void WindowFrame::set_button_icons() { diff --git a/Userland/Services/WindowServer/WindowManager.cpp b/Userland/Services/WindowServer/WindowManager.cpp index 152d023108..31dc9d56d2 100644 --- a/Userland/Services/WindowServer/WindowManager.cpp +++ b/Userland/Services/WindowServer/WindowManager.cpp @@ -68,10 +68,6 @@ WindowManager::WindowManager(Gfx::PaletteImpl const& palette) Compositor::the().did_construct_window_manager({}); } -WindowManager::~WindowManager() -{ -} - void WindowManager::reload_config() { m_config = Core::ConfigFile::open("/etc/WindowServer.ini", Core::ConfigFile::AllowWriting::Yes).release_value_but_fixme_should_propagate_errors(); diff --git a/Userland/Services/WindowServer/WindowManager.h b/Userland/Services/WindowServer/WindowManager.h index b6ec0885f8..ece88429df 100644 --- a/Userland/Services/WindowServer/WindowManager.h +++ b/Userland/Services/WindowServer/WindowManager.h @@ -69,7 +69,7 @@ public: static WindowManager& the(); - virtual ~WindowManager() override; + virtual ~WindowManager() override = default; Palette palette() const { return Palette(*m_palette); } diff --git a/Userland/Services/WindowServer/WindowStack.cpp b/Userland/Services/WindowServer/WindowStack.cpp index 7f307428e5..22f5233d05 100644 --- a/Userland/Services/WindowServer/WindowStack.cpp +++ b/Userland/Services/WindowServer/WindowStack.cpp @@ -15,10 +15,6 @@ WindowStack::WindowStack(unsigned row, unsigned column) { } -WindowStack::~WindowStack() -{ -} - void WindowStack::add(Window& window) { VERIFY(!window.is_on_any_window_stack({})); diff --git a/Userland/Services/WindowServer/WindowStack.h b/Userland/Services/WindowServer/WindowStack.h index 1fba705456..b95fc46a74 100644 --- a/Userland/Services/WindowServer/WindowStack.h +++ b/Userland/Services/WindowServer/WindowStack.h @@ -16,7 +16,7 @@ class Compositor; class WindowStack { public: WindowStack(unsigned row, unsigned column); - ~WindowStack(); + ~WindowStack() = default; bool is_empty() const { return m_windows.is_empty(); } void add(Window&); diff --git a/Userland/Services/WindowServer/WindowSwitcher.cpp b/Userland/Services/WindowServer/WindowSwitcher.cpp index f5b41727be..f359ffb998 100644 --- a/Userland/Services/WindowServer/WindowSwitcher.cpp +++ b/Userland/Services/WindowServer/WindowSwitcher.cpp @@ -28,10 +28,6 @@ WindowSwitcher::WindowSwitcher() s_the = this; } -WindowSwitcher::~WindowSwitcher() -{ -} - void WindowSwitcher::set_visible(bool visible) { if (m_visible == visible) diff --git a/Userland/Services/WindowServer/WindowSwitcher.h b/Userland/Services/WindowServer/WindowSwitcher.h index 0a5142087a..40ee72af9f 100644 --- a/Userland/Services/WindowServer/WindowSwitcher.h +++ b/Userland/Services/WindowServer/WindowSwitcher.h @@ -26,7 +26,7 @@ public: }; static WindowSwitcher& the(); - virtual ~WindowSwitcher() override; + virtual ~WindowSwitcher() override = default; bool is_visible() const { return m_visible; } void set_visible(bool);