From 7abb7822061f9aa0eadf2cb82d9f29f7349b61f7 Mon Sep 17 00:00:00 2001 From: Lenny Maiorani Date: Fri, 4 Mar 2022 13:22:31 -0700 Subject: [PATCH] Libraries: Use default constructors/destructors in LibSQL 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/Libraries/LibSQL/AST/AST.h | 3 ++- Userland/Libraries/LibSQL/AST/SyntaxHighlighter.cpp | 5 +---- Userland/Libraries/LibSQL/AST/SyntaxHighlighter.h | 5 +++-- Userland/Libraries/LibSQL/SQLClient.cpp | 5 +---- Userland/Libraries/LibSQL/SQLClient.h | 3 ++- 5 files changed, 9 insertions(+), 12 deletions(-) diff --git a/Userland/Libraries/LibSQL/AST/AST.h b/Userland/Libraries/LibSQL/AST/AST.h index 092ecff1f8..cf58e78f13 100644 --- a/Userland/Libraries/LibSQL/AST/AST.h +++ b/Userland/Libraries/LibSQL/AST/AST.h @@ -1,6 +1,7 @@ /* * Copyright (c) 2021, Tim Flynn * Copyright (c) 2021, Mahmoud Mandour + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -29,7 +30,7 @@ create_ast_node(Args&&... args) class ASTNode : public RefCounted { public: - virtual ~ASTNode() { } + virtual ~ASTNode() = default; protected: ASTNode() = default; diff --git a/Userland/Libraries/LibSQL/AST/SyntaxHighlighter.cpp b/Userland/Libraries/LibSQL/AST/SyntaxHighlighter.cpp index d2f595ce14..a6f327981e 100644 --- a/Userland/Libraries/LibSQL/AST/SyntaxHighlighter.cpp +++ b/Userland/Libraries/LibSQL/AST/SyntaxHighlighter.cpp @@ -1,5 +1,6 @@ /* * Copyright (c) 2021, Dylan Katz + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -95,8 +96,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/LibSQL/AST/SyntaxHighlighter.h b/Userland/Libraries/LibSQL/AST/SyntaxHighlighter.h index 981b5b8091..7e6120b948 100644 --- a/Userland/Libraries/LibSQL/AST/SyntaxHighlighter.h +++ b/Userland/Libraries/LibSQL/AST/SyntaxHighlighter.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2021, Dylan Katz + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -12,8 +13,8 @@ namespace SQL::AST { 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/LibSQL/SQLClient.cpp b/Userland/Libraries/LibSQL/SQLClient.cpp index e5a61780e3..f60157256d 100644 --- a/Userland/Libraries/LibSQL/SQLClient.cpp +++ b/Userland/Libraries/LibSQL/SQLClient.cpp @@ -1,5 +1,6 @@ /* * Copyright (c) 2021, Jan de Visser + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -8,10 +9,6 @@ namespace SQL { -SQLClient::~SQLClient() -{ -} - void SQLClient::connected(int connection_id, String const& connected_to_database) { if (on_connected) diff --git a/Userland/Libraries/LibSQL/SQLClient.h b/Userland/Libraries/LibSQL/SQLClient.h index 38279992cf..83eaf1fd9c 100644 --- a/Userland/Libraries/LibSQL/SQLClient.h +++ b/Userland/Libraries/LibSQL/SQLClient.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2021, Jan de Visser + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -16,7 +17,7 @@ class SQLClient : public IPC::ConnectionToServer , public SQLClientEndpoint { IPC_CLIENT_CONNECTION(SQLClient, "/tmp/portal/sql") - virtual ~SQLClient(); + virtual ~SQLClient() = default; Function on_connected; Function on_disconnected;