summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Userland/Applets/Audio/main.cpp3
-rw-r--r--Userland/Applets/ClipboardHistory/ClipboardHistoryModel.cpp5
-rw-r--r--Userland/Applets/ClipboardHistory/ClipboardHistoryModel.h3
-rw-r--r--Userland/Applets/Keymap/KeymapStatusWindow.cpp5
-rw-r--r--Userland/Applets/Keymap/KeymapStatusWindow.h3
-rw-r--r--Userland/Applets/WorkspacePicker/DesktopStatusWindow.cpp17
-rw-r--r--Userland/Applets/WorkspacePicker/DesktopStatusWindow.h3
7 files changed, 15 insertions, 24 deletions
diff --git a/Userland/Applets/Audio/main.cpp b/Userland/Applets/Audio/main.cpp
index f957b3ce6f..e72ebec726 100644
--- a/Userland/Applets/Audio/main.cpp
+++ b/Userland/Applets/Audio/main.cpp
@@ -2,6 +2,7 @@
* Copyright (c) 2018-2020, Andreas Kling <kling@serenityos.org>
* Copyright (c) 2021, kleines Filmröllchen <filmroellchen@serenityos.org>
* Copyright (c) 2021, David Isaksson <davidisaksson93@gmail.com>
+ * Copyright (c) 2022, the SerenityOS developers.
*
* SPDX-License-Identifier: BSD-2-Clause
*/
@@ -134,7 +135,7 @@ private:
};
public:
- virtual ~AudioWidget() override { }
+ virtual ~AudioWidget() override = default;
void set_audio_widget_size(bool show_percent)
{
diff --git a/Userland/Applets/ClipboardHistory/ClipboardHistoryModel.cpp b/Userland/Applets/ClipboardHistory/ClipboardHistoryModel.cpp
index 6873251c06..55654bb2ae 100644
--- a/Userland/Applets/ClipboardHistory/ClipboardHistoryModel.cpp
+++ b/Userland/Applets/ClipboardHistory/ClipboardHistoryModel.cpp
@@ -1,6 +1,7 @@
/*
* Copyright (c) 2019-2020, Sergey Bugaev <bugaevc@serenityos.org>
* Copyright (c) 2021, Mustafa Quraish <mustafa@cs.toronto.edu>
+ * Copyright (c) 2022, the SerenityOS developers.
*
* SPDX-License-Identifier: BSD-2-Clause
*/
@@ -20,10 +21,6 @@ ClipboardHistoryModel::ClipboardHistoryModel()
{
}
-ClipboardHistoryModel::~ClipboardHistoryModel()
-{
-}
-
String ClipboardHistoryModel::column_name(int column) const
{
switch (column) {
diff --git a/Userland/Applets/ClipboardHistory/ClipboardHistoryModel.h b/Userland/Applets/ClipboardHistory/ClipboardHistoryModel.h
index 06aba406b6..133abaf44b 100644
--- a/Userland/Applets/ClipboardHistory/ClipboardHistoryModel.h
+++ b/Userland/Applets/ClipboardHistory/ClipboardHistoryModel.h
@@ -1,6 +1,7 @@
/*
* Copyright (c) 2019-2020, Sergey Bugaev <bugaevc@serenityos.org>
* Copyright (c) 2021, Mustafa Quraish <mustafa@cs.toronto.edu>
+ * Copyright (c) 2022, the SerenityOS developers.
*
* SPDX-License-Identifier: BSD-2-Clause
*/
@@ -25,7 +26,7 @@ public:
__Count
};
- virtual ~ClipboardHistoryModel() override;
+ virtual ~ClipboardHistoryModel() override = default;
const GUI::Clipboard::DataAndType& item_at(int index) const { return m_history_items[index]; }
void remove_item(int index);
diff --git a/Userland/Applets/Keymap/KeymapStatusWindow.cpp b/Userland/Applets/Keymap/KeymapStatusWindow.cpp
index 16bb584721..d0b8c58900 100644
--- a/Userland/Applets/Keymap/KeymapStatusWindow.cpp
+++ b/Userland/Applets/Keymap/KeymapStatusWindow.cpp
@@ -1,5 +1,6 @@
/*
* Copyright (c) 2021, Timur Sultanov <SultanovTS@yandex.ru>
+ * Copyright (c) 2022, the SerenityOS developers.
*
* SPDX-License-Identifier: BSD-2-Clause
*/
@@ -30,10 +31,6 @@ KeymapStatusWindow::KeymapStatusWindow()
m_status_widget->set_text(current_keymap_name.substring(0, 2));
}
-KeymapStatusWindow::~KeymapStatusWindow()
-{
-}
-
void KeymapStatusWindow::wm_event(GUI::WMEvent& event)
{
if (event.type() == GUI::WMEvent::WM_KeymapChanged) {
diff --git a/Userland/Applets/Keymap/KeymapStatusWindow.h b/Userland/Applets/Keymap/KeymapStatusWindow.h
index fbd5caf9f6..4a2a5b1fdd 100644
--- a/Userland/Applets/Keymap/KeymapStatusWindow.h
+++ b/Userland/Applets/Keymap/KeymapStatusWindow.h
@@ -1,5 +1,6 @@
/*
* Copyright (c) 2021, Timur Sultanov <SultanovTS@yandex.ru>
+ * Copyright (c) 2022, the SerenityOS developers.
*
* SPDX-License-Identifier: BSD-2-Clause
*/
@@ -17,7 +18,7 @@ class KeymapStatusWidget : public GUI::Label {
class KeymapStatusWindow final : public GUI::Window {
C_OBJECT(KeymapStatusWindow)
public:
- virtual ~KeymapStatusWindow() override;
+ virtual ~KeymapStatusWindow() override = default;
private:
virtual void wm_event(GUI::WMEvent&) override;
diff --git a/Userland/Applets/WorkspacePicker/DesktopStatusWindow.cpp b/Userland/Applets/WorkspacePicker/DesktopStatusWindow.cpp
index 440e0f2157..5c8ce38c61 100644
--- a/Userland/Applets/WorkspacePicker/DesktopStatusWindow.cpp
+++ b/Userland/Applets/WorkspacePicker/DesktopStatusWindow.cpp
@@ -1,5 +1,6 @@
/*
* Copyright (c) 2021, Peter Elliott <pelliott@serenityos.org>
+ * Copyright (c) 2022, the SerenityOS developers.
*
* SPDX-License-Identifier: BSD-2-Clause
*/
@@ -15,9 +16,7 @@ class DesktopStatusWidget : public GUI::Widget {
C_OBJECT(DesktopStatusWidget);
public:
- virtual ~DesktopStatusWidget() override
- {
- }
+ virtual ~DesktopStatusWidget() override = default;
Gfx::IntRect rect_for_desktop(unsigned row, unsigned col) const
{
@@ -94,14 +93,12 @@ public:
unsigned gap() const { return m_gap; }
private:
- DesktopStatusWidget()
- {
- }
+ DesktopStatusWidget() = default;
unsigned m_gap { 1 };
- unsigned m_current_row;
- unsigned m_current_col;
+ unsigned m_current_row { 0 };
+ unsigned m_current_col { 0 };
};
DesktopStatusWindow::DesktopStatusWindow()
@@ -114,10 +111,6 @@ DesktopStatusWindow::DesktopStatusWindow()
m_widget = &set_main_widget<DesktopStatusWidget>();
}
-DesktopStatusWindow::~DesktopStatusWindow()
-{
-}
-
void DesktopStatusWindow::wm_event(GUI::WMEvent& event)
{
if (event.type() == GUI::Event::WM_WorkspaceChanged) {
diff --git a/Userland/Applets/WorkspacePicker/DesktopStatusWindow.h b/Userland/Applets/WorkspacePicker/DesktopStatusWindow.h
index 1a6e25da31..007e042ff9 100644
--- a/Userland/Applets/WorkspacePicker/DesktopStatusWindow.h
+++ b/Userland/Applets/WorkspacePicker/DesktopStatusWindow.h
@@ -1,5 +1,6 @@
/*
* Copyright (c) 2021, Peter Elliott <pelliott@serenityos.org>
+ * Copyright (c) 2022, the SerenityOS developers.
*
* SPDX-License-Identifier: BSD-2-Clause
*/
@@ -14,7 +15,7 @@ class DesktopStatusWindow : public GUI::Window {
C_OBJECT(DesktopStatusWindow);
public:
- virtual ~DesktopStatusWindow() override;
+ virtual ~DesktopStatusWindow() override = default;
virtual void wm_event(GUI::WMEvent&) override;