From dcdc62323dc0d17f5b6959bfeb78645e0e35840c Mon Sep 17 00:00:00 2001 From: Lenny Maiorani Date: Thu, 3 Mar 2022 11:37:49 -0700 Subject: [PATCH] Libraries: Use default constructors/destructors in LibIPC 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/LibIPC/CMakeLists.txt | 2 -- Userland/Libraries/LibIPC/Connection.cpp | 5 +---- Userland/Libraries/LibIPC/Connection.h | 3 ++- .../Libraries/LibIPC/ConnectionFromClient.h | 6 +++--- Userland/Libraries/LibIPC/Dictionary.h | 3 ++- Userland/Libraries/LibIPC/Message.cpp | 19 ------------------- Userland/Libraries/LibIPC/Message.h | 5 +++-- Userland/Libraries/LibIPC/Stub.cpp | 19 ------------------- Userland/Libraries/LibIPC/Stub.h | 5 +++-- 9 files changed, 14 insertions(+), 53 deletions(-) delete mode 100644 Userland/Libraries/LibIPC/Message.cpp delete mode 100644 Userland/Libraries/LibIPC/Stub.cpp diff --git a/Userland/Libraries/LibIPC/CMakeLists.txt b/Userland/Libraries/LibIPC/CMakeLists.txt index 9b41b56af7..9b23d388c7 100644 --- a/Userland/Libraries/LibIPC/CMakeLists.txt +++ b/Userland/Libraries/LibIPC/CMakeLists.txt @@ -2,8 +2,6 @@ set(SOURCES Connection.cpp Decoder.cpp Encoder.cpp - Message.cpp - Stub.cpp ) serenity_lib(LibIPC ipc) diff --git a/Userland/Libraries/LibIPC/Connection.cpp b/Userland/Libraries/LibIPC/Connection.cpp index e61b9dc801..111df5686c 100644 --- a/Userland/Libraries/LibIPC/Connection.cpp +++ b/Userland/Libraries/LibIPC/Connection.cpp @@ -1,5 +1,6 @@ /* * Copyright (c) 2021, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -19,10 +20,6 @@ ConnectionBase::ConnectionBase(IPC::Stub& local_stub, NonnullOwnPtr ConnectionBase::post_message(Message const& message) { return post_message(message.encode()); diff --git a/Userland/Libraries/LibIPC/Connection.h b/Userland/Libraries/LibIPC/Connection.h index f6831f8619..dd3e1a4822 100644 --- a/Userland/Libraries/LibIPC/Connection.h +++ b/Userland/Libraries/LibIPC/Connection.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2018-2020, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -30,7 +31,7 @@ class ConnectionBase : public Core::Object { C_OBJECT_ABSTRACT(ConnectionBase); public: - virtual ~ConnectionBase() override; + virtual ~ConnectionBase() override = default; bool is_open() const { return m_socket->is_open(); } ErrorOr post_message(Message const&); diff --git a/Userland/Libraries/LibIPC/ConnectionFromClient.h b/Userland/Libraries/LibIPC/ConnectionFromClient.h index a57b243c4b..e18a7bea2e 100644 --- a/Userland/Libraries/LibIPC/ConnectionFromClient.h +++ b/Userland/Libraries/LibIPC/ConnectionFromClient.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2018-2020, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -7,6 +8,7 @@ #pragma once #include +#include namespace IPC { @@ -36,9 +38,7 @@ public: }; } - virtual ~ConnectionFromClient() override - { - } + virtual ~ConnectionFromClient() override = default; void did_misbehave() { diff --git a/Userland/Libraries/LibIPC/Dictionary.h b/Userland/Libraries/LibIPC/Dictionary.h index d9df9dab21..97a5eed718 100644 --- a/Userland/Libraries/LibIPC/Dictionary.h +++ b/Userland/Libraries/LibIPC/Dictionary.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2020, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -13,7 +14,7 @@ namespace IPC { class Dictionary { public: - Dictionary() { } + Dictionary() = default; Dictionary(const HashMap& initial_entries) : m_entries(initial_entries) diff --git a/Userland/Libraries/LibIPC/Message.cpp b/Userland/Libraries/LibIPC/Message.cpp deleted file mode 100644 index 8a288fea0c..0000000000 --- a/Userland/Libraries/LibIPC/Message.cpp +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (c) 2018-2020, Andreas Kling - * - * SPDX-License-Identifier: BSD-2-Clause - */ - -#include - -namespace IPC { - -Message::Message() -{ -} - -Message::~Message() -{ -} - -} diff --git a/Userland/Libraries/LibIPC/Message.h b/Userland/Libraries/LibIPC/Message.h index 8590e28808..f04916a152 100644 --- a/Userland/Libraries/LibIPC/Message.h +++ b/Userland/Libraries/LibIPC/Message.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2018-2020, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -43,7 +44,7 @@ enum class ErrorCode : u32 { class Message { public: - virtual ~Message(); + virtual ~Message() = default; virtual u32 endpoint_magic() const = 0; virtual int message_id() const = 0; @@ -52,7 +53,7 @@ public: virtual MessageBuffer encode() const = 0; protected: - Message(); + Message() = default; }; } diff --git a/Userland/Libraries/LibIPC/Stub.cpp b/Userland/Libraries/LibIPC/Stub.cpp deleted file mode 100644 index 4eca25a720..0000000000 --- a/Userland/Libraries/LibIPC/Stub.cpp +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (c) 2018-2020, Andreas Kling - * - * SPDX-License-Identifier: BSD-2-Clause - */ - -#include - -namespace IPC { - -Stub::Stub() -{ -} - -Stub::~Stub() -{ -} - -} diff --git a/Userland/Libraries/LibIPC/Stub.h b/Userland/Libraries/LibIPC/Stub.h index a4a02808dc..49ec6de666 100644 --- a/Userland/Libraries/LibIPC/Stub.h +++ b/Userland/Libraries/LibIPC/Stub.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2018-2020, Andreas Kling + * Copyright (c) 2022, the SerenityOS developers. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -20,14 +21,14 @@ struct MessageBuffer; class Stub { public: - virtual ~Stub(); + virtual ~Stub() = default; virtual u32 magic() const = 0; virtual String name() const = 0; virtual OwnPtr handle(const Message&) = 0; protected: - Stub(); + Stub() = default; private: String m_name;