From 0ec688f86eb01641ae8f867496df25ad22642f18 Mon Sep 17 00:00:00 2001 From: Lenny Maiorani Date: Tue, 15 Feb 2022 10:28:43 -0700 Subject: [PATCH] Demos: Use default constructors/destructors https://isocpp.github.io/CppCoreGuidelines/CppCoreGuidelines#cother-other-default-operation-rules "The compiler is more likely to get the default semantics right and you cannot implement these functions better than the compiler." --- Userland/Demos/Cube/Cube.cpp | 7 ++----- Userland/Demos/Eyes/EyesWidget.cpp | 5 +---- Userland/Demos/Eyes/EyesWidget.h | 3 ++- Userland/Demos/Fire/Fire.cpp | 7 ++----- Userland/Demos/LibGfxDemo/main.cpp | 7 ++----- Userland/Demos/LibGfxScaleDemo/main.cpp | 7 ++----- Userland/Demos/Screensaver/Screensaver.cpp | 8 ++------ Userland/Demos/Starfield/Starfield.cpp | 7 ++----- Userland/Demos/WidgetGallery/GalleryModels.h | 10 +++++----- Userland/Demos/WidgetGallery/GalleryWidget.cpp | 6 +----- Userland/Demos/WidgetGallery/GalleryWidget.h | 4 ++-- 11 files changed, 23 insertions(+), 48 deletions(-) diff --git a/Userland/Demos/Cube/Cube.cpp b/Userland/Demos/Cube/Cube.cpp index 21d6189301..224958d7c4 100644 --- a/Userland/Demos/Cube/Cube.cpp +++ b/Userland/Demos/Cube/Cube.cpp @@ -1,5 +1,6 @@ /* * Copyright (c) 2020, Stephan Unverwerth + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -31,7 +32,7 @@ static bool flag_hide_window_frame = false; class Cube final : public GUI::Widget { C_OBJECT(Cube) public: - virtual ~Cube() override; + virtual ~Cube() override = default; void set_stat_label(RefPtr l) { m_stats = l; }; void set_show_window_frame(bool); bool show_window_frame() const { return m_show_window_frame; } @@ -72,10 +73,6 @@ Cube::Cube() start_timer(20); } -Cube::~Cube() -{ -} - void Cube::paint_event(GUI::PaintEvent& event) { GUI::Painter painter(*this); diff --git a/Userland/Demos/Eyes/EyesWidget.cpp b/Userland/Demos/Eyes/EyesWidget.cpp index 39bf2980dd..902187386f 100644 --- a/Userland/Demos/Eyes/EyesWidget.cpp +++ b/Userland/Demos/Eyes/EyesWidget.cpp @@ -1,5 +1,6 @@ /* * Copyright (c) 2020, Sergey Bugaev + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -10,10 +11,6 @@ #include #include -EyesWidget::~EyesWidget() -{ -} - void EyesWidget::track_mouse_move(Gfx::IntPoint const& point) { m_mouse_position = point - window()->position(); diff --git a/Userland/Demos/Eyes/EyesWidget.h b/Userland/Demos/Eyes/EyesWidget.h index dea25eaea5..3fb6d26f43 100644 --- a/Userland/Demos/Eyes/EyesWidget.h +++ b/Userland/Demos/Eyes/EyesWidget.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2020, Sergey Bugaev + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -14,7 +15,7 @@ class EyesWidget final : public GUI::Widget C_OBJECT(EyesWidget) public: - virtual ~EyesWidget(); + virtual ~EyesWidget() override = default; private: EyesWidget(int num_eyes, int full_rows, int extra) diff --git a/Userland/Demos/Fire/Fire.cpp b/Userland/Demos/Fire/Fire.cpp index 6a1b9bf440..e00d10423e 100644 --- a/Userland/Demos/Fire/Fire.cpp +++ b/Userland/Demos/Fire/Fire.cpp @@ -1,5 +1,6 @@ /* * Copyright (c) 2018-2021, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -61,7 +62,7 @@ class Fire : public GUI::Frame { C_OBJECT(Fire); public: - virtual ~Fire() override; + virtual ~Fire() override = default; void set_stat_label(RefPtr l) { stats = l; }; private: @@ -110,10 +111,6 @@ Fire::Fire() // update(); } -Fire::~Fire() -{ -} - void Fire::paint_event(GUI::PaintEvent& event) { GUI::Frame::paint_event(event); diff --git a/Userland/Demos/LibGfxDemo/main.cpp b/Userland/Demos/LibGfxDemo/main.cpp index 74ed547fa6..81e23375fe 100644 --- a/Userland/Demos/LibGfxDemo/main.cpp +++ b/Userland/Demos/LibGfxDemo/main.cpp @@ -1,5 +1,6 @@ /* * Copyright (c) 2020, Linus Groh + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -26,7 +27,7 @@ const int HEIGHT = 600; class Canvas final : public GUI::Widget { C_OBJECT(Canvas) public: - virtual ~Canvas() override; + virtual ~Canvas() override = default; private: Canvas(); @@ -42,10 +43,6 @@ Canvas::Canvas() draw(); } -Canvas::~Canvas() -{ -} - void Canvas::paint_event(GUI::PaintEvent& event) { GUI::Painter painter(*this); diff --git a/Userland/Demos/LibGfxScaleDemo/main.cpp b/Userland/Demos/LibGfxScaleDemo/main.cpp index 8a6f1fe948..3e979d65d2 100644 --- a/Userland/Demos/LibGfxScaleDemo/main.cpp +++ b/Userland/Demos/LibGfxScaleDemo/main.cpp @@ -1,5 +1,6 @@ /* * Copyright (c) 2020, Nico Weber + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -29,7 +30,7 @@ const int HEIGHT = 200; class Canvas final : public GUI::Widget { C_OBJECT(Canvas) public: - virtual ~Canvas() override; + virtual ~Canvas() override = default; private: Canvas(); @@ -62,10 +63,6 @@ Canvas::Canvas() update(); } -Canvas::~Canvas() -{ -} - void Canvas::paint_event(GUI::PaintEvent& event) { GUI::Painter painter(*this); diff --git a/Userland/Demos/Screensaver/Screensaver.cpp b/Userland/Demos/Screensaver/Screensaver.cpp index 2be7c58ca9..f6ac5149c5 100644 --- a/Userland/Demos/Screensaver/Screensaver.cpp +++ b/Userland/Demos/Screensaver/Screensaver.cpp @@ -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 Screensaver final : public GUI::Widget { C_OBJECT(Screensaver) public: - virtual ~Screensaver() override; + virtual ~Screensaver() override = default; private: Screensaver(int width = 64, int height = 48, int interval = 10000); @@ -44,10 +44,6 @@ Screensaver::Screensaver(int width, int height, int interval) draw(); } -Screensaver::~Screensaver() -{ -} - void Screensaver::mousemove_event(GUI::MouseEvent& event) { constexpr float max_distance_move = 10; diff --git a/Userland/Demos/Starfield/Starfield.cpp b/Userland/Demos/Starfield/Starfield.cpp index d1c3ec6fb9..8dc4f0a3f3 100644 --- a/Userland/Demos/Starfield/Starfield.cpp +++ b/Userland/Demos/Starfield/Starfield.cpp @@ -1,5 +1,6 @@ /* * Copyright (c) 2021, Jagger De Leo + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -32,7 +33,7 @@ struct Coordinate { class Starfield final : public GUI::Widget { C_OBJECT(Starfield) public: - virtual ~Starfield() override; + virtual ~Starfield() override = default; ErrorOr create_stars(int, int, int); void set_speed(unsigned speed) { m_speed = speed; } @@ -74,10 +75,6 @@ ErrorOr Starfield::create_stars(int width, int height, int stars) return {}; } -Starfield::~Starfield() -{ -} - void Starfield::mousemove_event(GUI::MouseEvent&) { } diff --git a/Userland/Demos/WidgetGallery/GalleryModels.h b/Userland/Demos/WidgetGallery/GalleryModels.h index 4041b53e87..8f0f61a303 100644 --- a/Userland/Demos/WidgetGallery/GalleryModels.h +++ b/Userland/Demos/WidgetGallery/GalleryModels.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, the SerenityOS developers. + * Copyright (c) 2021-2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -17,7 +17,7 @@ class MouseCursorModel final : public GUI::Model { public: static NonnullRefPtr create() { return adopt_ref(*new MouseCursorModel); } - virtual ~MouseCursorModel() override { } + virtual ~MouseCursorModel() override = default; enum Column { Bitmap, @@ -86,7 +86,7 @@ public: } private: - MouseCursorModel() { } + MouseCursorModel() = default; struct Cursor { RefPtr bitmap; @@ -101,7 +101,7 @@ private: class FileIconsModel final : public GUI::Model { public: static NonnullRefPtr create() { return adopt_ref(*new FileIconsModel); } - virtual ~FileIconsModel() override { } + virtual ~FileIconsModel() override = default; enum Column { BigIcon, @@ -189,7 +189,7 @@ public: } private: - FileIconsModel() { } + FileIconsModel() = default; struct IconSet { RefPtr big_icon; diff --git a/Userland/Demos/WidgetGallery/GalleryWidget.cpp b/Userland/Demos/WidgetGallery/GalleryWidget.cpp index 29bafb120b..71e03944e6 100644 --- a/Userland/Demos/WidgetGallery/GalleryWidget.cpp +++ b/Userland/Demos/WidgetGallery/GalleryWidget.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, the SerenityOS developers. + * Copyright (c) 2021-2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -328,7 +328,3 @@ GalleryWidget::GalleryWidget() m_icons_tableview->set_column_width(0, 36); m_icons_tableview->set_column_width(1, 20); } - -GalleryWidget::~GalleryWidget() -{ -} diff --git a/Userland/Demos/WidgetGallery/GalleryWidget.h b/Userland/Demos/WidgetGallery/GalleryWidget.h index 42b4c52d9c..056ff25f6e 100644 --- a/Userland/Demos/WidgetGallery/GalleryWidget.h +++ b/Userland/Demos/WidgetGallery/GalleryWidget.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, the SerenityOS developers. + * Copyright (c) 2021-2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -19,7 +19,7 @@ class GalleryWidget final : public GUI::Widget { C_OBJECT(GalleryWidget) public: - virtual ~GalleryWidget() override; + virtual ~GalleryWidget() override = default; private: GalleryWidget();