diff options
author | Itamar <itamar8910@gmail.com> | 2022-02-25 12:39:33 +0200 |
---|---|---|
committer | Andreas Kling <kling@serenityos.org> | 2022-02-25 22:35:12 +0100 |
commit | 935d0239676a6d71e3f7fc4d7e37c15d4b1fa6f5 (patch) | |
tree | 651928926497d516331807724ff448346996538e /Userland/Services | |
parent | af132fdbd183f82a55a8c03e1e1d2ba275f41067 (diff) | |
download | serenity-935d0239676a6d71e3f7fc4d7e37c15d4b1fa6f5.zip |
Userland: Rename WindowServerConnection=>ConnectionToWindowServer
This was done with CLion's automatic rename feature.
Diffstat (limited to 'Userland/Services')
-rw-r--r-- | Userland/Services/FileSystemAccessServer/ConnectionFromClient.cpp | 8 | ||||
-rw-r--r-- | Userland/Services/Taskbar/TaskbarButton.cpp | 2 | ||||
-rw-r--r-- | Userland/Services/Taskbar/TaskbarWindow.cpp | 4 | ||||
-rw-r--r-- | Userland/Services/Taskbar/main.cpp | 6 | ||||
-rw-r--r-- | Userland/Services/WindowServer/WindowManager.cpp | 2 |
5 files changed, 11 insertions, 11 deletions
diff --git a/Userland/Services/FileSystemAccessServer/ConnectionFromClient.cpp b/Userland/Services/FileSystemAccessServer/ConnectionFromClient.cpp index 48bbb2a548..d385279178 100644 --- a/Userland/Services/FileSystemAccessServer/ConnectionFromClient.cpp +++ b/Userland/Services/FileSystemAccessServer/ConnectionFromClient.cpp @@ -6,7 +6,7 @@ // FIXME: LibIPC Decoder and Encoder are sensitive to include order here // clang-format off -#include <LibGUI/WindowServerConnection.h> +#include <LibGUI/ConnectionToWindowServer.h> // clang-format on #include <AK/Debug.h> #include <FileSystemAccessServer/ConnectionFromClient.h> @@ -41,10 +41,10 @@ RefPtr<GUI::Window> ConnectionFromClient::create_dummy_child_window(i32 window_s auto window = GUI::Window::construct(); window->set_opacity(0); window->set_frameless(true); - auto rect = GUI::WindowServerConnection::the().get_window_rect_from_client(window_server_client_id, parent_window_id); + auto rect = GUI::ConnectionToWindowServer::the().get_window_rect_from_client(window_server_client_id, parent_window_id); window->set_rect(rect); window->show(); - GUI::WindowServerConnection::the().async_set_window_parent_from_client(window_server_client_id, parent_window_id, window->window_id()); + GUI::ConnectionToWindowServer::the().async_set_window_parent_from_client(window_server_client_id, parent_window_id, window->window_id()); return window; } @@ -171,7 +171,7 @@ void ConnectionFromClient::prompt_helper(Optional<String> const& user_picked_fil Messages::FileSystemAccessServer::ExposeWindowServerClientIdResponse ConnectionFromClient::expose_window_server_client_id() { - return GUI::WindowServerConnection::the().expose_client_id(); + return GUI::ConnectionToWindowServer::the().expose_client_id(); } } diff --git a/Userland/Services/Taskbar/TaskbarButton.cpp b/Userland/Services/Taskbar/TaskbarButton.cpp index 553b6301c8..b6cef3e1fb 100644 --- a/Userland/Services/Taskbar/TaskbarButton.cpp +++ b/Userland/Services/Taskbar/TaskbarButton.cpp @@ -8,8 +8,8 @@ #include "WindowList.h" #include <LibGUI/Action.h> #include <LibGUI/ConnectionToWindowMangerServer.h> +#include <LibGUI/ConnectionToWindowServer.h> #include <LibGUI/Painter.h> -#include <LibGUI/WindowServerConnection.h> #include <LibGfx/Font.h> #include <LibGfx/Palette.h> #include <LibGfx/StylePainter.h> diff --git a/Userland/Services/Taskbar/TaskbarWindow.cpp b/Userland/Services/Taskbar/TaskbarWindow.cpp index 2e285fa382..80c8b10603 100644 --- a/Userland/Services/Taskbar/TaskbarWindow.cpp +++ b/Userland/Services/Taskbar/TaskbarWindow.cpp @@ -14,13 +14,13 @@ #include <LibGUI/BoxLayout.h> #include <LibGUI/Button.h> #include <LibGUI/ConnectionToWindowMangerServer.h> +#include <LibGUI/ConnectionToWindowServer.h> #include <LibGUI/Desktop.h> #include <LibGUI/Frame.h> #include <LibGUI/Icon.h> #include <LibGUI/Menu.h> #include <LibGUI/Painter.h> #include <LibGUI/Window.h> -#include <LibGUI/WindowServerConnection.h> #include <LibGfx/FontDatabase.h> #include <LibGfx/Palette.h> #include <serenity.h> @@ -210,7 +210,7 @@ void TaskbarWindow::event(Core::Event& event) Gfx::IntPoint adjusted_point = { adjusted_x, adjusted_y }; if (adjusted_point != mouse_event.position()) { - GUI::WindowServerConnection::the().async_set_global_cursor_position(position() + adjusted_point); + GUI::ConnectionToWindowServer::the().async_set_global_cursor_position(position() + adjusted_point); GUI::MouseEvent adjusted_event = { (GUI::Event::Type)mouse_event.type(), adjusted_point, mouse_event.buttons(), mouse_event.button(), mouse_event.modifiers(), mouse_event.wheel_delta_x(), mouse_event.wheel_delta_y() }; Window::event(adjusted_event); return; diff --git a/Userland/Services/Taskbar/main.cpp b/Userland/Services/Taskbar/main.cpp index b0bd84c7ae..aa62e6b38f 100644 --- a/Userland/Services/Taskbar/main.cpp +++ b/Userland/Services/Taskbar/main.cpp @@ -21,8 +21,8 @@ #include <LibGUI/ActionGroup.h> #include <LibGUI/Application.h> #include <LibGUI/ConnectionToWindowMangerServer.h> +#include <LibGUI/ConnectionToWindowServer.h> #include <LibGUI/Menu.h> -#include <LibGUI/WindowServerConnection.h> #include <LibMain/Main.h> #include <WindowServer/Window.h> #include <serenity.h> @@ -224,7 +224,7 @@ ErrorOr<NonnullRefPtr<GUI::Menu>> build_system_menu() quick_sort(g_themes, [](auto& a, auto& b) { return a.name < b.name; }); } - auto current_theme_name = GUI::WindowServerConnection::the().get_system_theme(); + auto current_theme_name = GUI::ConnectionToWindowServer::the().get_system_theme(); { int theme_identifier = 0; @@ -232,7 +232,7 @@ ErrorOr<NonnullRefPtr<GUI::Menu>> build_system_menu() auto action = GUI::Action::create_checkable(theme.name, [theme_identifier](auto&) { auto& theme = g_themes[theme_identifier]; dbgln("Theme switched to {} at path {}", theme.name, theme.path); - auto success = GUI::WindowServerConnection::the().set_system_theme(theme.path, theme.name); + auto success = GUI::ConnectionToWindowServer::the().set_system_theme(theme.path, theme.name); VERIFY(success); }); if (theme.name == current_theme_name) diff --git a/Userland/Services/WindowServer/WindowManager.cpp b/Userland/Services/WindowServer/WindowManager.cpp index a9d713fd2b..c70d9d6ac8 100644 --- a/Userland/Services/WindowServer/WindowManager.cpp +++ b/Userland/Services/WindowServer/WindowManager.cpp @@ -548,7 +548,7 @@ void WindowManager::tell_wms_super_space_key_pressed() void WindowManager::tell_wms_super_digit_key_pressed(u8 digit) { - for_each_window_manager([digit](WMClientConnection& conn) { + for_each_window_manager([digit](WMConnectionFromClient& conn) { if (conn.window_id() < 0) return IterationDecision::Continue; |