diff options
author | Andreas Kling <kling@serenityos.org> | 2021-05-23 09:46:05 +0200 |
---|---|---|
committer | Andreas Kling <kling@serenityos.org> | 2021-05-23 09:53:55 +0200 |
commit | c1c252ddb2316cd2e82e3599d1a067c68ea9d099 (patch) | |
tree | fa503862181059788aade55bc40a874c7dad85f8 /Userland | |
parent | 2eceabdcfd0ad20ace98d723ec3fcaac801ade32 (diff) | |
download | serenity-c1c252ddb2316cd2e82e3599d1a067c68ea9d099.zip |
LibIPC: Remove unnecessary IPC::ServerConnection::handshake()
This is no longer used by any of our IPC pairs.
Diffstat (limited to 'Userland')
25 files changed, 1 insertions, 71 deletions
diff --git a/Userland/Applications/Piano/main.cpp b/Userland/Applications/Piano/main.cpp index 7983b040d3..f31540579a 100644 --- a/Userland/Applications/Piano/main.cpp +++ b/Userland/Applications/Piano/main.cpp @@ -33,7 +33,6 @@ int main(int argc, char** argv) auto app = GUI::Application::construct(argc, argv); auto audio_client = Audio::ClientConnection::construct(); - audio_client->handshake(); TrackManager track_manager; diff --git a/Userland/Applications/SoundPlayer/main.cpp b/Userland/Applications/SoundPlayer/main.cpp index 7f257b70c9..6b52e0e0c8 100644 --- a/Userland/Applications/SoundPlayer/main.cpp +++ b/Userland/Applications/SoundPlayer/main.cpp @@ -27,7 +27,6 @@ int main(int argc, char** argv) auto app = GUI::Application::construct(argc, argv); auto audio_client = Audio::ClientConnection::construct(); - audio_client->handshake(); if (pledge("stdio recvfd sendfd rpath thread", nullptr) < 0) { perror("pledge"); diff --git a/Userland/DevTools/HackStudio/LanguageClient.cpp b/Userland/DevTools/HackStudio/LanguageClient.cpp index cb03e18cc8..e0bae003e5 100644 --- a/Userland/DevTools/HackStudio/LanguageClient.cpp +++ b/Userland/DevTools/HackStudio/LanguageClient.cpp @@ -178,7 +178,6 @@ void ServerConnectionWrapper::create_connection() VERIFY(m_connection.is_null()); m_connection = m_connection_creator(); m_connection->set_wrapper(*this); - m_connection->handshake(); } ServerConnection* ServerConnectionWrapper::connection() diff --git a/Userland/DevTools/HackStudio/LanguageClient.h b/Userland/DevTools/HackStudio/LanguageClient.h index 76f13e8d1f..02deed9385 100644 --- a/Userland/DevTools/HackStudio/LanguageClient.h +++ b/Userland/DevTools/HackStudio/LanguageClient.h @@ -37,10 +37,6 @@ public: async_greet(m_project_path); } - virtual void handshake() override - { - } - WeakPtr<LanguageClient> language_client() { return m_current_language_client; } const String& project_path() const { return m_project_path; } diff --git a/Userland/DevTools/Inspector/InspectorServerClient.h b/Userland/DevTools/Inspector/InspectorServerClient.h index a63f174b16..b694acef2f 100644 --- a/Userland/DevTools/Inspector/InspectorServerClient.h +++ b/Userland/DevTools/Inspector/InspectorServerClient.h @@ -18,17 +18,12 @@ class InspectorServerClient final C_OBJECT(InspectorServerClient); public: - virtual void handshake() override - { - } - virtual ~InspectorServerClient() override = default; private: InspectorServerClient() : IPC::ServerConnection<InspectorClientEndpoint, InspectorServerEndpoint>(*this, "/tmp/portal/inspector") { - handshake(); } virtual void dummy() override { } diff --git a/Userland/Libraries/LibAudio/ClientConnection.cpp b/Userland/Libraries/LibAudio/ClientConnection.cpp index d38fb532be..0165b63c1e 100644 --- a/Userland/Libraries/LibAudio/ClientConnection.cpp +++ b/Userland/Libraries/LibAudio/ClientConnection.cpp @@ -14,10 +14,6 @@ ClientConnection::ClientConnection() { } -void ClientConnection::handshake() -{ -} - void ClientConnection::enqueue(const Buffer& buffer) { for (;;) { diff --git a/Userland/Libraries/LibAudio/ClientConnection.h b/Userland/Libraries/LibAudio/ClientConnection.h index 2d5b326d8a..7fe5e58af7 100644 --- a/Userland/Libraries/LibAudio/ClientConnection.h +++ b/Userland/Libraries/LibAudio/ClientConnection.h @@ -20,7 +20,6 @@ class ClientConnection : public IPC::ServerConnection<AudioClientEndpoint, Audio public: ClientConnection(); - virtual void handshake() override; void enqueue(const Buffer&); bool try_enqueue(const Buffer&); diff --git a/Userland/Libraries/LibDesktop/Launcher.cpp b/Userland/Libraries/LibDesktop/Launcher.cpp index e90a8300e2..3186cdb013 100644 --- a/Userland/Libraries/LibDesktop/Launcher.cpp +++ b/Userland/Libraries/LibDesktop/Launcher.cpp @@ -37,11 +37,6 @@ auto Launcher::Details::from_details_str(const String& details_str) -> NonnullRe class LaunchServerConnection : public IPC::ServerConnection<LaunchClientEndpoint, LaunchServerEndpoint> , public LaunchClientEndpoint { C_OBJECT(LaunchServerConnection) -public: - virtual void handshake() override - { - } - private: LaunchServerConnection() : IPC::ServerConnection<LaunchClientEndpoint, LaunchServerEndpoint>(*this, "/tmp/portal/launch") diff --git a/Userland/Libraries/LibGUI/Clipboard.cpp b/Userland/Libraries/LibGUI/Clipboard.cpp index 834e836bc8..5b44a1cd33 100644 --- a/Userland/Libraries/LibGUI/Clipboard.cpp +++ b/Userland/Libraries/LibGUI/Clipboard.cpp @@ -16,11 +16,6 @@ class ClipboardServerConnection : public IPC::ServerConnection<ClipboardClientEn , public ClipboardClientEndpoint { C_OBJECT(ClipboardServerConnection); -public: - virtual void handshake() override - { - } - private: ClipboardServerConnection() : IPC::ServerConnection<ClipboardClientEndpoint, ClipboardServerEndpoint>(*this, "/tmp/portal/clipboard") diff --git a/Userland/Libraries/LibGUI/Notification.cpp b/Userland/Libraries/LibGUI/Notification.cpp index ac92619eca..445237768f 100644 --- a/Userland/Libraries/LibGUI/Notification.cpp +++ b/Userland/Libraries/LibGUI/Notification.cpp @@ -18,10 +18,6 @@ class NotificationServerConnection : public IPC::ServerConnection<NotificationCl friend class Notification; public: - virtual void handshake() override - { - } - virtual void die() override { m_notification->connection_closed(); diff --git a/Userland/Libraries/LibGUI/WindowManagerServerConnection.cpp b/Userland/Libraries/LibGUI/WindowManagerServerConnection.cpp index b722f94048..681e52489e 100644 --- a/Userland/Libraries/LibGUI/WindowManagerServerConnection.cpp +++ b/Userland/Libraries/LibGUI/WindowManagerServerConnection.cpp @@ -19,11 +19,6 @@ WindowManagerServerConnection& WindowManagerServerConnection::the() return *s_connection; } -void WindowManagerServerConnection::handshake() -{ - // :^) -} - void WindowManagerServerConnection::window_state_changed(i32 wm_id, i32 client_id, i32 window_id, i32 parent_client_id, i32 parent_window_id, bool is_active, bool is_minimized, bool is_modal, bool is_frameless, i32 window_type, String const& title, Gfx::IntRect const& rect, Optional<i32> const& progress) diff --git a/Userland/Libraries/LibGUI/WindowManagerServerConnection.h b/Userland/Libraries/LibGUI/WindowManagerServerConnection.h index 6cba68bf2c..8efd922503 100644 --- a/Userland/Libraries/LibGUI/WindowManagerServerConnection.h +++ b/Userland/Libraries/LibGUI/WindowManagerServerConnection.h @@ -20,10 +20,8 @@ public: WindowManagerServerConnection() : IPC::ServerConnection<WindowManagerClientEndpoint, WindowManagerServerEndpoint>(*this, "/tmp/portal/wm") { - handshake(); } - virtual void handshake() override; static WindowManagerServerConnection& the(); private: diff --git a/Userland/Libraries/LibGUI/WindowServerConnection.cpp b/Userland/Libraries/LibGUI/WindowServerConnection.cpp index b61ffaca8c..b819b3e97c 100644 --- a/Userland/Libraries/LibGUI/WindowServerConnection.cpp +++ b/Userland/Libraries/LibGUI/WindowServerConnection.cpp @@ -55,7 +55,7 @@ WindowServerConnection::WindowServerConnection() void WindowServerConnection::fast_greet(Gfx::IntRect const&, Core::AnonymousBuffer const&, String const&, String const&) { - // NOTE: This message is handled in handshake(). + // NOTE: This message is handled in the constructor. } void WindowServerConnection::update_system_theme(Core::AnonymousBuffer const& theme_buffer) diff --git a/Userland/Libraries/LibGUI/WindowServerConnection.h b/Userland/Libraries/LibGUI/WindowServerConnection.h index 7faba6c266..d5aef15cc6 100644 --- a/Userland/Libraries/LibGUI/WindowServerConnection.h +++ b/Userland/Libraries/LibGUI/WindowServerConnection.h @@ -17,7 +17,6 @@ class WindowServerConnection , public WindowClientEndpoint { C_OBJECT(WindowServerConnection) public: - virtual void handshake() override { } static WindowServerConnection& the(); private: diff --git a/Userland/Libraries/LibIPC/ServerConnection.h b/Userland/Libraries/LibIPC/ServerConnection.h index 8c181d2b25..9cfa75523b 100644 --- a/Userland/Libraries/LibIPC/ServerConnection.h +++ b/Userland/Libraries/LibIPC/ServerConnection.h @@ -33,8 +33,6 @@ public: VERIFY(this->socket().is_connected()); } - virtual void handshake() = 0; - virtual void die() override { // Override this function if you don't want your app to exit if it loses the connection. diff --git a/Userland/Libraries/LibImageDecoderClient/Client.cpp b/Userland/Libraries/LibImageDecoderClient/Client.cpp index 11075fab9d..4d8983955e 100644 --- a/Userland/Libraries/LibImageDecoderClient/Client.cpp +++ b/Userland/Libraries/LibImageDecoderClient/Client.cpp @@ -20,10 +20,6 @@ void Client::die() on_death(); } -void Client::handshake() -{ -} - void Client::dummy() { } diff --git a/Userland/Libraries/LibImageDecoderClient/Client.h b/Userland/Libraries/LibImageDecoderClient/Client.h index a20dce6e5d..40e588d3ea 100644 --- a/Userland/Libraries/LibImageDecoderClient/Client.h +++ b/Userland/Libraries/LibImageDecoderClient/Client.h @@ -30,8 +30,6 @@ class Client final C_OBJECT(Client); public: - virtual void handshake() override; - Optional<DecodedImage> decode_image(const ByteBuffer&); Function<void()> on_death; diff --git a/Userland/Libraries/LibProtocol/RequestClient.cpp b/Userland/Libraries/LibProtocol/RequestClient.cpp index c7d2afe90c..00d4e32294 100644 --- a/Userland/Libraries/LibProtocol/RequestClient.cpp +++ b/Userland/Libraries/LibProtocol/RequestClient.cpp @@ -13,11 +13,6 @@ namespace Protocol { RequestClient::RequestClient() : IPC::ServerConnection<RequestClientEndpoint, RequestServerEndpoint>(*this, "/tmp/portal/request") { - handshake(); -} - -void RequestClient::handshake() -{ } template<typename RequestHashMapTraits> diff --git a/Userland/Libraries/LibProtocol/RequestClient.h b/Userland/Libraries/LibProtocol/RequestClient.h index a07a5d0f6b..d9b31787a0 100644 --- a/Userland/Libraries/LibProtocol/RequestClient.h +++ b/Userland/Libraries/LibProtocol/RequestClient.h @@ -21,8 +21,6 @@ class RequestClient C_OBJECT(RequestClient); public: - virtual void handshake() override; - template<typename RequestHashMapTraits = Traits<String>> RefPtr<Request> start_request(const String& method, const String& url, const HashMap<String, String, RequestHashMapTraits>& request_headers = {}, ReadonlyBytes request_body = {}); diff --git a/Userland/Libraries/LibProtocol/WebSocketClient.cpp b/Userland/Libraries/LibProtocol/WebSocketClient.cpp index 3b28487533..da1b4318a4 100644 --- a/Userland/Libraries/LibProtocol/WebSocketClient.cpp +++ b/Userland/Libraries/LibProtocol/WebSocketClient.cpp @@ -12,11 +12,6 @@ namespace Protocol { WebSocketClient::WebSocketClient() : IPC::ServerConnection<WebSocketClientEndpoint, WebSocketServerEndpoint>(*this, "/tmp/portal/websocket") { - handshake(); -} - -void WebSocketClient::handshake() -{ } RefPtr<WebSocket> WebSocketClient::connect(const URL& url, const String& origin, const Vector<String>& protocols, const Vector<String>& extensions, const HashMap<String, String>& request_headers) diff --git a/Userland/Libraries/LibProtocol/WebSocketClient.h b/Userland/Libraries/LibProtocol/WebSocketClient.h index 90df880550..ac6a2d0a98 100644 --- a/Userland/Libraries/LibProtocol/WebSocketClient.h +++ b/Userland/Libraries/LibProtocol/WebSocketClient.h @@ -21,8 +21,6 @@ class WebSocketClient C_OBJECT(WebSocketClient); public: - virtual void handshake() override; - RefPtr<WebSocket> connect(const URL&, const String& origin = {}, const Vector<String>& protocols = {}, const Vector<String>& extensions = {}, const HashMap<String, String>& request_headers = {}); u32 ready_state(Badge<WebSocket>, WebSocket&); diff --git a/Userland/Libraries/LibWeb/WebContentClient.cpp b/Userland/Libraries/LibWeb/WebContentClient.cpp index f139dc599b..34904b9f75 100644 --- a/Userland/Libraries/LibWeb/WebContentClient.cpp +++ b/Userland/Libraries/LibWeb/WebContentClient.cpp @@ -15,7 +15,6 @@ WebContentClient::WebContentClient(OutOfProcessWebView& view) : IPC::ServerConnection<WebContentClientEndpoint, WebContentServerEndpoint>(*this, "/tmp/portal/webcontent") , m_view(view) { - handshake(); } void WebContentClient::die() @@ -24,10 +23,6 @@ void WebContentClient::die() on_web_content_process_crash(); } -void WebContentClient::handshake() -{ -} - void WebContentClient::did_paint(const Gfx::IntRect&, i32 bitmap_id) { m_view.notify_server_did_paint({}, bitmap_id); diff --git a/Userland/Libraries/LibWeb/WebContentClient.h b/Userland/Libraries/LibWeb/WebContentClient.h index 493d0d1de0..15664fb819 100644 --- a/Userland/Libraries/LibWeb/WebContentClient.h +++ b/Userland/Libraries/LibWeb/WebContentClient.h @@ -22,8 +22,6 @@ class WebContentClient final C_OBJECT(WebContentClient); public: - virtual void handshake() override; - Function<void()> on_web_content_process_crash; private: diff --git a/Userland/Utilities/aplay.cpp b/Userland/Utilities/aplay.cpp index 6fd6a4848a..e550b4e324 100644 --- a/Userland/Utilities/aplay.cpp +++ b/Userland/Utilities/aplay.cpp @@ -24,7 +24,6 @@ int main(int argc, char** argv) Core::EventLoop loop; auto audio_client = Audio::ClientConnection::construct(); - audio_client->handshake(); NonnullRefPtr<Audio::Loader> loader = Audio::Loader::create(path); if (loader->has_error()) { fprintf(stderr, "Failed to load audio file: %s\n", loader->error_string()); diff --git a/Userland/Utilities/avol.cpp b/Userland/Utilities/avol.cpp index 2ec64999d2..10dd8627c1 100644 --- a/Userland/Utilities/avol.cpp +++ b/Userland/Utilities/avol.cpp @@ -14,7 +14,6 @@ int main(int argc, char** argv) { Core::EventLoop loop; auto audio_client = Audio::ClientConnection::construct(); - audio_client->handshake(); bool mute = false; bool unmute = false; |