From 944e5cfb350ec1117ae2923dffb094b68588b8e9 Mon Sep 17 00:00:00 2001 From: Timothy Date: Fri, 2 Jul 2021 21:40:44 -0700 Subject: [PATCH] Everywhere: Use IPC include syntax Remove superfluous includes from IPCCompiler's generated output and add include directives in IPC definitions where appropriate. --- Userland/DevTools/IPCCompiler/main.cpp | 5 ----- Userland/Libraries/LibGUI/Clipboard.cpp | 1 + Userland/Services/AudioServer/AudioClient.ipc | 2 ++ Userland/Services/AudioServer/AudioServer.ipc | 2 ++ Userland/Services/Clipboard/ClipboardClient.ipc | 2 ++ Userland/Services/Clipboard/ClipboardServer.ipc | 2 ++ Userland/Services/ImageDecoder/ImageDecoderClient.ipc | 3 +++ Userland/Services/ImageDecoder/ImageDecoderServer.ipc | 3 +++ Userland/Services/LaunchServer/LaunchClient.ipc | 2 ++ Userland/Services/LaunchServer/LaunchServer.ipc | 2 ++ Userland/Services/NotificationServer/NotificationClient.ipc | 2 ++ Userland/Services/NotificationServer/NotificationServer.ipc | 2 ++ Userland/Services/RequestServer/RequestClient.ipc | 2 ++ Userland/Services/RequestServer/RequestServer.ipc | 2 ++ Userland/Services/WebContent/WebContentClient.ipc | 4 ++++ Userland/Services/WebContent/WebContentServer.ipc | 4 ++++ Userland/Services/WebSocket/WebSocketClient.ipc | 2 ++ Userland/Services/WebSocket/WebSocketServer.ipc | 2 ++ Userland/Services/WindowServer/WindowClient.ipc | 3 +++ Userland/Services/WindowServer/WindowManagerClient.ipc | 2 ++ Userland/Services/WindowServer/WindowManagerServer.ipc | 2 ++ Userland/Services/WindowServer/WindowServer.ipc | 3 +++ 22 files changed, 49 insertions(+), 5 deletions(-) diff --git a/Userland/DevTools/IPCCompiler/main.cpp b/Userland/DevTools/IPCCompiler/main.cpp index 2affb167dd..654e9fd2a2 100644 --- a/Userland/DevTools/IPCCompiler/main.cpp +++ b/Userland/DevTools/IPCCompiler/main.cpp @@ -276,12 +276,7 @@ int main(int argc, char** argv) generator.append(R"~~~(#include #include #include -#include #include -#include -#include -#include -#include #include #include #include diff --git a/Userland/Libraries/LibGUI/Clipboard.cpp b/Userland/Libraries/LibGUI/Clipboard.cpp index 7a15d72b77..2c7c557744 100644 --- a/Userland/Libraries/LibGUI/Clipboard.cpp +++ b/Userland/Libraries/LibGUI/Clipboard.cpp @@ -8,6 +8,7 @@ #include #include #include +#include #include namespace GUI { diff --git a/Userland/Services/AudioServer/AudioClient.ipc b/Userland/Services/AudioServer/AudioClient.ipc index 54fb049836..56b4f89d1e 100644 --- a/Userland/Services/AudioServer/AudioClient.ipc +++ b/Userland/Services/AudioServer/AudioClient.ipc @@ -1,3 +1,5 @@ +#include + endpoint AudioClient { finished_playing_buffer(i32 buffer_id) =| diff --git a/Userland/Services/AudioServer/AudioServer.ipc b/Userland/Services/AudioServer/AudioServer.ipc index b78e683026..4c23e47d0c 100644 --- a/Userland/Services/AudioServer/AudioServer.ipc +++ b/Userland/Services/AudioServer/AudioServer.ipc @@ -1,3 +1,5 @@ +#include + endpoint AudioServer { // Mixer functions diff --git a/Userland/Services/Clipboard/ClipboardClient.ipc b/Userland/Services/Clipboard/ClipboardClient.ipc index 677533965f..d0548d7460 100644 --- a/Userland/Services/Clipboard/ClipboardClient.ipc +++ b/Userland/Services/Clipboard/ClipboardClient.ipc @@ -1,3 +1,5 @@ +#include + endpoint ClipboardClient { clipboard_data_changed([UTF8] String mime_type) =| diff --git a/Userland/Services/Clipboard/ClipboardServer.ipc b/Userland/Services/Clipboard/ClipboardServer.ipc index a6a12ea158..731a1b2de2 100644 --- a/Userland/Services/Clipboard/ClipboardServer.ipc +++ b/Userland/Services/Clipboard/ClipboardServer.ipc @@ -1,3 +1,5 @@ +#include + endpoint ClipboardServer { get_clipboard_data() => (Core::AnonymousBuffer data, [UTF8] String mime_type, IPC::Dictionary metadata) diff --git a/Userland/Services/ImageDecoder/ImageDecoderClient.ipc b/Userland/Services/ImageDecoder/ImageDecoderClient.ipc index 73dc57c2fe..10c257a8fa 100644 --- a/Userland/Services/ImageDecoder/ImageDecoderClient.ipc +++ b/Userland/Services/ImageDecoder/ImageDecoderClient.ipc @@ -1,3 +1,6 @@ +#include +#include + endpoint ImageDecoderClient { } diff --git a/Userland/Services/ImageDecoder/ImageDecoderServer.ipc b/Userland/Services/ImageDecoder/ImageDecoderServer.ipc index 005b0b943c..5ca2e40ea0 100644 --- a/Userland/Services/ImageDecoder/ImageDecoderServer.ipc +++ b/Userland/Services/ImageDecoder/ImageDecoderServer.ipc @@ -1,3 +1,6 @@ +#include +#include + endpoint ImageDecoderServer { decode_image(Core::AnonymousBuffer data) => (bool is_animated, u32 loop_count, Vector bitmaps, Vector durations) diff --git a/Userland/Services/LaunchServer/LaunchClient.ipc b/Userland/Services/LaunchServer/LaunchClient.ipc index 6bec125047..8899709d89 100644 --- a/Userland/Services/LaunchServer/LaunchClient.ipc +++ b/Userland/Services/LaunchServer/LaunchClient.ipc @@ -1,3 +1,5 @@ +#include + endpoint LaunchClient { } diff --git a/Userland/Services/LaunchServer/LaunchServer.ipc b/Userland/Services/LaunchServer/LaunchServer.ipc index 9cafe22512..d296712be3 100644 --- a/Userland/Services/LaunchServer/LaunchServer.ipc +++ b/Userland/Services/LaunchServer/LaunchServer.ipc @@ -1,3 +1,5 @@ +#include + endpoint LaunchServer { open_url(URL url, String handler_name) => (bool response) diff --git a/Userland/Services/NotificationServer/NotificationClient.ipc b/Userland/Services/NotificationServer/NotificationClient.ipc index eff81745b6..2cb72f2b67 100644 --- a/Userland/Services/NotificationServer/NotificationClient.ipc +++ b/Userland/Services/NotificationServer/NotificationClient.ipc @@ -1,3 +1,5 @@ +#include + endpoint NotificationClient { } diff --git a/Userland/Services/NotificationServer/NotificationServer.ipc b/Userland/Services/NotificationServer/NotificationServer.ipc index c51c894c60..7a6196dff9 100644 --- a/Userland/Services/NotificationServer/NotificationServer.ipc +++ b/Userland/Services/NotificationServer/NotificationServer.ipc @@ -1,3 +1,5 @@ +#include + endpoint NotificationServer { show_notification([UTF8] String text, [UTF8] String title, Gfx::ShareableBitmap icon) => () diff --git a/Userland/Services/RequestServer/RequestClient.ipc b/Userland/Services/RequestServer/RequestClient.ipc index 01d712f5a2..c6731d622e 100644 --- a/Userland/Services/RequestServer/RequestClient.ipc +++ b/Userland/Services/RequestServer/RequestClient.ipc @@ -1,3 +1,5 @@ +#include + endpoint RequestClient { request_progress(i32 request_id, Optional total_size, u32 downloaded_size) =| diff --git a/Userland/Services/RequestServer/RequestServer.ipc b/Userland/Services/RequestServer/RequestServer.ipc index e88a402023..cc4219418f 100644 --- a/Userland/Services/RequestServer/RequestServer.ipc +++ b/Userland/Services/RequestServer/RequestServer.ipc @@ -1,3 +1,5 @@ +#include + endpoint RequestServer { // Test if a specific protocol is supported, e.g "http" diff --git a/Userland/Services/WebContent/WebContentClient.ipc b/Userland/Services/WebContent/WebContentClient.ipc index 16d8f111ee..6369199dba 100644 --- a/Userland/Services/WebContent/WebContentClient.ipc +++ b/Userland/Services/WebContent/WebContentClient.ipc @@ -1,3 +1,7 @@ +#include +#include +#include + endpoint WebContentClient { did_start_loading(URL url) =| diff --git a/Userland/Services/WebContent/WebContentServer.ipc b/Userland/Services/WebContent/WebContentServer.ipc index fc92a6ffaa..92e80b676c 100644 --- a/Userland/Services/WebContent/WebContentServer.ipc +++ b/Userland/Services/WebContent/WebContentServer.ipc @@ -1,3 +1,7 @@ +#include +#include +#include + endpoint WebContentServer { update_system_theme(Core::AnonymousBuffer theme_buffer) =| diff --git a/Userland/Services/WebSocket/WebSocketClient.ipc b/Userland/Services/WebSocket/WebSocketClient.ipc index ef8da18780..a7438d1e3f 100644 --- a/Userland/Services/WebSocket/WebSocketClient.ipc +++ b/Userland/Services/WebSocket/WebSocketClient.ipc @@ -1,3 +1,5 @@ +#include + endpoint WebSocketClient { // Connection API diff --git a/Userland/Services/WebSocket/WebSocketServer.ipc b/Userland/Services/WebSocket/WebSocketServer.ipc index a77da4e85b..a5f020fa48 100644 --- a/Userland/Services/WebSocket/WebSocketServer.ipc +++ b/Userland/Services/WebSocket/WebSocketServer.ipc @@ -1,3 +1,5 @@ +#include + endpoint WebSocketServer { // Connection API diff --git a/Userland/Services/WindowServer/WindowClient.ipc b/Userland/Services/WindowServer/WindowClient.ipc index a3219415f0..28fcee3262 100644 --- a/Userland/Services/WindowServer/WindowClient.ipc +++ b/Userland/Services/WindowServer/WindowClient.ipc @@ -1,3 +1,6 @@ +#include +#include + endpoint WindowClient { fast_greet(Vector screen_rects, u32 main_screen_index, Core::AnonymousBuffer theme_buffer, String default_font_query, String fixed_width_font_query) =| diff --git a/Userland/Services/WindowServer/WindowManagerClient.ipc b/Userland/Services/WindowServer/WindowManagerClient.ipc index bd7317c6f1..220a2d6543 100644 --- a/Userland/Services/WindowServer/WindowManagerClient.ipc +++ b/Userland/Services/WindowServer/WindowManagerClient.ipc @@ -1,3 +1,5 @@ +#include + endpoint WindowManagerClient { window_removed(i32 wm_id, i32 client_id, i32 window_id) =| diff --git a/Userland/Services/WindowServer/WindowManagerServer.ipc b/Userland/Services/WindowServer/WindowManagerServer.ipc index b1a0140a60..d01dcb8736 100644 --- a/Userland/Services/WindowServer/WindowManagerServer.ipc +++ b/Userland/Services/WindowServer/WindowManagerServer.ipc @@ -1,3 +1,5 @@ +#include + endpoint WindowManagerServer { set_event_mask(u32 event_mask) =| diff --git a/Userland/Services/WindowServer/WindowServer.ipc b/Userland/Services/WindowServer/WindowServer.ipc index 99ea7a6f4e..d3d81b6ef9 100644 --- a/Userland/Services/WindowServer/WindowServer.ipc +++ b/Userland/Services/WindowServer/WindowServer.ipc @@ -1,3 +1,6 @@ +#include +#include + endpoint WindowServer { create_menubar(i32 menubar_id) =|