From 0184fc5e43dd38c3afc119194ca1daf4fa6f9d73 Mon Sep 17 00:00:00 2001 From: Ben Wiederhake Date: Fri, 16 Jun 2023 16:16:16 +0200 Subject: [PATCH] Everywhere: Use AK_MAKE_DEFAULT_MOVABLE to avoid mistakes --- Userland/Libraries/LibDSP/Music.h | 4 +--- Userland/Libraries/LibSQL/Result.h | 8 +++----- .../Libraries/LibWeb/HTML/Parser/HTMLToken.h | 4 +--- Userland/Utilities/sed.cpp | 20 +++++++++---------- 4 files changed, 14 insertions(+), 22 deletions(-) diff --git a/Userland/Libraries/LibDSP/Music.h b/Userland/Libraries/LibDSP/Music.h index adcff712a0..8f443e39a8 100644 --- a/Userland/Libraries/LibDSP/Music.h +++ b/Userland/Libraries/LibDSP/Music.h @@ -202,11 +202,9 @@ constexpr double const middle_c = note_frequencies[36]; struct Signal : public Variant, RollNotes> { using Variant::Variant; AK_MAKE_NONCOPYABLE(Signal); + AK_MAKE_DEFAULT_MOVABLE(Signal); public: - Signal& operator=(Signal&&) = default; - Signal(Signal&&) = default; - ALWAYS_INLINE SignalType type() const { if (has>()) diff --git a/Userland/Libraries/LibSQL/Result.h b/Userland/Libraries/LibSQL/Result.h index 16e3222954..f6832b78dc 100644 --- a/Userland/Libraries/LibSQL/Result.h +++ b/Userland/Libraries/LibSQL/Result.h @@ -75,6 +75,9 @@ enum class SQLErrorCode { }; class [[nodiscard]] Result { + AK_MAKE_NONCOPYABLE(Result); + AK_MAKE_DEFAULT_MOVABLE(Result); + public: ALWAYS_INLINE Result(SQLCommand command) : m_command(command) @@ -100,9 +103,6 @@ public: { } - Result(Result&&) = default; - Result& operator=(Result&&) = default; - SQLCommand command() const { return m_command; } SQLErrorCode error() const { return m_error; } DeprecatedString error_string() const; @@ -120,8 +120,6 @@ public: } private: - AK_MAKE_NONCOPYABLE(Result); - SQLCommand m_command { SQLCommand::Unknown }; SQLErrorCode m_error { SQLErrorCode::NoError }; diff --git a/Userland/Libraries/LibWeb/HTML/Parser/HTMLToken.h b/Userland/Libraries/LibWeb/HTML/Parser/HTMLToken.h index bfc32c8c4a..07c1cb7511 100644 --- a/Userland/Libraries/LibWeb/HTML/Parser/HTMLToken.h +++ b/Userland/Libraries/LibWeb/HTML/Parser/HTMLToken.h @@ -21,6 +21,7 @@ class HTMLTokenizer; class HTMLToken { AK_MAKE_NONCOPYABLE(HTMLToken); + AK_MAKE_DEFAULT_MOVABLE(HTMLToken); public: enum class Type : u8 { @@ -95,9 +96,6 @@ public: } } - HTMLToken(HTMLToken&&) = default; - HTMLToken& operator=(HTMLToken&&) = default; - bool is_doctype() const { return m_type == Type::DOCTYPE; } bool is_start_tag() const { return m_type == Type::StartTag; } bool is_end_tag() const { return m_type == Type::EndTag; } diff --git a/Userland/Utilities/sed.cpp b/Userland/Utilities/sed.cpp index 9de2e59f62..b84d156289 100644 --- a/Userland/Utilities/sed.cpp +++ b/Userland/Utilities/sed.cpp @@ -612,14 +612,7 @@ enum class CycleDecision { // In most cases, just an input to sed. However, files are also written to when the -i option is used. class File { AK_MAKE_NONCOPYABLE(File); - - File(LexicalPath input_file_path, NonnullOwnPtr&& file, OwnPtr&& output, OwnPtr&& temp_file) - : m_input_file_path(move(input_file_path)) - , m_file(move(file)) - , m_output(move(output)) - , m_output_temp_file(move(temp_file)) - { - } + AK_MAKE_DEFAULT_MOVABLE(File); public: // Used for -i mode. @@ -656,9 +649,6 @@ public: }; } - File(File&&) = default; - File& operator=(File&&) = default; - ErrorOr has_next() const { return m_file->can_read_line(); @@ -696,6 +686,14 @@ public: } private: + File(LexicalPath input_file_path, NonnullOwnPtr&& file, OwnPtr&& output, OwnPtr&& temp_file) + : m_input_file_path(move(input_file_path)) + , m_file(move(file)) + , m_output(move(output)) + , m_output_temp_file(move(temp_file)) + { + } + LexicalPath m_input_file_path; NonnullOwnPtr m_file;