diff --git a/Userland/Services/ChessEngine/ChessEngine.h b/Userland/Services/ChessEngine/ChessEngine.h index 05e541c1f9..c2c63e3577 100644 --- a/Userland/Services/ChessEngine/ChessEngine.h +++ b/Userland/Services/ChessEngine/ChessEngine.h @@ -14,16 +14,16 @@ class ChessEngine : public Chess::UCI::Endpoint { public: virtual ~ChessEngine() override { } + virtual void handle_uci() override; + virtual void handle_position(const Chess::UCI::PositionCommand&) override; + virtual void handle_go(const Chess::UCI::GoCommand&) override; + +private: ChessEngine() { } ChessEngine(NonnullRefPtr in, NonnullRefPtr out) : Endpoint(in, out) { } - virtual void handle_uci() override; - virtual void handle_position(const Chess::UCI::PositionCommand&) override; - virtual void handle_go(const Chess::UCI::GoCommand&) override; - -private: Chess::Board m_board; }; diff --git a/Userland/Services/Clipboard/ClientConnection.h b/Userland/Services/Clipboard/ClientConnection.h index 578e4a6a8a..ee53f8d9a9 100644 --- a/Userland/Services/Clipboard/ClientConnection.h +++ b/Userland/Services/Clipboard/ClientConnection.h @@ -18,7 +18,6 @@ class ClientConnection final C_OBJECT(ClientConnection); public: - explicit ClientConnection(NonnullRefPtr, int client_id); virtual ~ClientConnection() override; virtual void die() override; @@ -28,6 +27,8 @@ public: void notify_about_clipboard_change(); private: + explicit ClientConnection(NonnullRefPtr, int client_id); + virtual Messages::ClipboardServer::GetClipboardDataResponse get_clipboard_data() override; virtual void set_clipboard_data(Core::AnonymousBuffer const&, String const&, IPC::Dictionary const&) override; }; diff --git a/Userland/Services/DHCPClient/DHCPv4Client.h b/Userland/Services/DHCPClient/DHCPv4Client.h index c3901ab713..cdd5cf7b00 100644 --- a/Userland/Services/DHCPClient/DHCPv4Client.h +++ b/Userland/Services/DHCPClient/DHCPv4Client.h @@ -40,7 +40,6 @@ class DHCPv4Client final : public Core::Object { C_OBJECT(DHCPv4Client) public: - explicit DHCPv4Client(); virtual ~DHCPv4Client() override; void dhcp_discover(const InterfaceDescriptor& ifname); @@ -57,6 +56,8 @@ public: static Result get_discoverable_interfaces(); private: + explicit DHCPv4Client(); + void try_discover_ifs(); HashMap> m_ongoing_transactions; diff --git a/Userland/Services/FileSystemAccessServer/ClientConnection.h b/Userland/Services/FileSystemAccessServer/ClientConnection.h index fb3ecc1025..a62676a180 100644 --- a/Userland/Services/FileSystemAccessServer/ClientConnection.h +++ b/Userland/Services/FileSystemAccessServer/ClientConnection.h @@ -20,12 +20,13 @@ class ClientConnection final C_OBJECT(ClientConnection); public: - explicit ClientConnection(NonnullRefPtr, int client_id); ~ClientConnection() override; virtual void die() override; private: + explicit ClientConnection(NonnullRefPtr, int client_id); + virtual void request_file_read_only_approved(i32, i32, String const&) override; virtual void request_file(i32, i32, String const&, Core::OpenMode const&) override; virtual void prompt_open_file(i32, i32, String const&, String const&, Core::OpenMode const&) override; diff --git a/Userland/Services/ImageDecoder/ClientConnection.h b/Userland/Services/ImageDecoder/ClientConnection.h index c810dbba72..3c1efc7512 100644 --- a/Userland/Services/ImageDecoder/ClientConnection.h +++ b/Userland/Services/ImageDecoder/ClientConnection.h @@ -20,12 +20,13 @@ class ClientConnection final C_OBJECT(ClientConnection); public: - explicit ClientConnection(NonnullRefPtr, int client_id); ~ClientConnection() override; virtual void die() override; private: + explicit ClientConnection(NonnullRefPtr, int client_id); + virtual Messages::ImageDecoderServer::DecodeImageResponse decode_image(Core::AnonymousBuffer const&) override; }; diff --git a/Userland/Services/InspectorServer/ClientConnection.h b/Userland/Services/InspectorServer/ClientConnection.h index f73e3c738d..3b27c7cd83 100644 --- a/Userland/Services/InspectorServer/ClientConnection.h +++ b/Userland/Services/InspectorServer/ClientConnection.h @@ -18,12 +18,13 @@ class ClientConnection final C_OBJECT(ClientConnection); public: - explicit ClientConnection(NonnullRefPtr, int client_id); ~ClientConnection() override; virtual void die() override; private: + explicit ClientConnection(NonnullRefPtr, int client_id); + virtual Messages::InspectorServer::GetAllObjectsResponse get_all_objects(pid_t) override; virtual Messages::InspectorServer::SetInspectedObjectResponse set_inspected_object(pid_t, u64 object_id) override; virtual Messages::InspectorServer::SetObjectPropertyResponse set_object_property(pid_t, u64 object_id, String const& name, String const& value) override; diff --git a/Userland/Services/LookupServer/ClientConnection.h b/Userland/Services/LookupServer/ClientConnection.h index a7f465be30..60bd8697a4 100644 --- a/Userland/Services/LookupServer/ClientConnection.h +++ b/Userland/Services/LookupServer/ClientConnection.h @@ -18,12 +18,13 @@ class ClientConnection final C_OBJECT(ClientConnection); public: - explicit ClientConnection(NonnullRefPtr, int client_id); virtual ~ClientConnection() override; virtual void die() override; private: + explicit ClientConnection(NonnullRefPtr, int client_id); + virtual Messages::LookupServer::LookupNameResponse lookup_name(String const&) override; virtual Messages::LookupServer::LookupAddressResponse lookup_address(String const&) override; }; diff --git a/Userland/Services/RequestServer/ClientConnection.h b/Userland/Services/RequestServer/ClientConnection.h index 2822bd7227..2ec60c54c8 100644 --- a/Userland/Services/RequestServer/ClientConnection.h +++ b/Userland/Services/RequestServer/ClientConnection.h @@ -19,7 +19,6 @@ class ClientConnection final C_OBJECT(ClientConnection); public: - explicit ClientConnection(NonnullRefPtr, int client_id); ~ClientConnection() override; virtual void die() override; @@ -30,6 +29,8 @@ public: void did_request_certificates(Badge, Request&); private: + explicit ClientConnection(NonnullRefPtr, int client_id); + virtual Messages::RequestServer::IsSupportedProtocolResponse is_supported_protocol(String const&) override; virtual Messages::RequestServer::StartRequestResponse start_request(String const&, URL const&, IPC::Dictionary const&, ByteBuffer const&) override; virtual Messages::RequestServer::StopRequestResponse stop_request(i32) override; diff --git a/Userland/Services/SQLServer/ClientConnection.h b/Userland/Services/SQLServer/ClientConnection.h index 96af97fe70..d00dca14e6 100644 --- a/Userland/Services/SQLServer/ClientConnection.h +++ b/Userland/Services/SQLServer/ClientConnection.h @@ -18,7 +18,6 @@ class ClientConnection final C_OBJECT(ClientConnection); public: - explicit ClientConnection(NonnullRefPtr, int client_id); virtual ~ClientConnection() override; virtual void die() override; @@ -26,6 +25,8 @@ public: static RefPtr client_connection_for(int client_id); private: + explicit ClientConnection(NonnullRefPtr, int client_id); + virtual Messages::SQLServer::ConnectResponse connect(String const&) override; virtual Messages::SQLServer::SqlStatementResponse sql_statement(int, String const&) override; virtual void statement_execute(int) override; diff --git a/Userland/Services/SQLServer/DatabaseConnection.h b/Userland/Services/SQLServer/DatabaseConnection.h index a7fc7c4551..068c27bcdc 100644 --- a/Userland/Services/SQLServer/DatabaseConnection.h +++ b/Userland/Services/SQLServer/DatabaseConnection.h @@ -14,6 +14,8 @@ namespace SQLServer { class DatabaseConnection final : public Core::Object { C_OBJECT(DatabaseConnection) + +public: ~DatabaseConnection() override = default; static RefPtr connection_for(int connection_id); diff --git a/Userland/Services/SQLServer/SQLStatement.h b/Userland/Services/SQLServer/SQLStatement.h index 433a5f60b3..3f32ab2ec7 100644 --- a/Userland/Services/SQLServer/SQLStatement.h +++ b/Userland/Services/SQLServer/SQLStatement.h @@ -18,6 +18,8 @@ namespace SQLServer { class SQLStatement final : public Core::Object { C_OBJECT(SQLStatement) + +public: ~SQLStatement() override = default; static RefPtr statement_for(int statement_id); diff --git a/Userland/Services/SpiceAgent/ClipboardServerConnection.h b/Userland/Services/SpiceAgent/ClipboardServerConnection.h index 6c0bba4eb0..57c6813d40 100644 --- a/Userland/Services/SpiceAgent/ClipboardServerConnection.h +++ b/Userland/Services/SpiceAgent/ClipboardServerConnection.h @@ -17,6 +17,7 @@ class ClipboardServerConnection final , public ClipboardClientEndpoint { C_OBJECT(ClipboardServerConnection); +public: Function on_data_changed; RefPtr get_bitmap(); void set_bitmap(Gfx::Bitmap const& bitmap); diff --git a/Userland/Services/WebContent/ClientConnection.h b/Userland/Services/WebContent/ClientConnection.h index 77c0a82f85..2fdbc7d7b2 100644 --- a/Userland/Services/WebContent/ClientConnection.h +++ b/Userland/Services/WebContent/ClientConnection.h @@ -25,7 +25,6 @@ class ClientConnection final C_OBJECT(ClientConnection); public: - explicit ClientConnection(NonnullRefPtr, int client_id); ~ClientConnection() override; virtual void die() override; @@ -33,6 +32,8 @@ public: void initialize_js_console(Badge); private: + explicit ClientConnection(NonnullRefPtr, int client_id); + Web::Page& page(); const Web::Page& page() const; diff --git a/Userland/Services/WebSocket/ClientConnection.h b/Userland/Services/WebSocket/ClientConnection.h index 8f7a602af3..49008d6369 100644 --- a/Userland/Services/WebSocket/ClientConnection.h +++ b/Userland/Services/WebSocket/ClientConnection.h @@ -19,12 +19,13 @@ class ClientConnection final C_OBJECT(ClientConnection); public: - explicit ClientConnection(NonnullRefPtr, int client_id); ~ClientConnection() override; virtual void die() override; private: + explicit ClientConnection(NonnullRefPtr, int client_id); + virtual Messages::WebSocketServer::ConnectResponse connect(URL const&, String const&, Vector const&, Vector const&, IPC::Dictionary const&) override; virtual Messages::WebSocketServer::ReadyStateResponse ready_state(i32) override; virtual void send(i32, bool, ByteBuffer const&) override; diff --git a/Userland/Services/WindowServer/AppletManager.h b/Userland/Services/WindowServer/AppletManager.h index 9e1ad37781..f92fe9979a 100644 --- a/Userland/Services/WindowServer/AppletManager.h +++ b/Userland/Services/WindowServer/AppletManager.h @@ -14,7 +14,6 @@ namespace WindowServer { class AppletManager : public Core::Object { C_OBJECT(AppletManager) public: - AppletManager(); ~AppletManager(); static AppletManager& the(); @@ -35,6 +34,8 @@ public: void did_change_theme(); private: + AppletManager(); + void repaint(); void draw_applet(const Window& applet); void set_hovered_applet(Window*); diff --git a/Userland/Services/WindowServer/Menu.h b/Userland/Services/WindowServer/Menu.h index c3e4afa038..384c54fe48 100644 --- a/Userland/Services/WindowServer/Menu.h +++ b/Userland/Services/WindowServer/Menu.h @@ -28,7 +28,6 @@ class Menu final : public Core::Object { C_OBJECT(Menu); public: - Menu(ClientConnection*, int menu_id, String name); virtual ~Menu() override; ClientConnection* client() { return m_client; } @@ -129,6 +128,8 @@ public: const Vector* items_with_alt_shortcut(u32 alt_shortcut) const; private: + Menu(ClientConnection*, int menu_id, String name); + virtual void event(Core::Event&) override; void handle_mouse_move_event(const MouseEvent&); diff --git a/Userland/Services/WindowServer/MenuManager.h b/Userland/Services/WindowServer/MenuManager.h index 6179011e4c..74a73375df 100644 --- a/Userland/Services/WindowServer/MenuManager.h +++ b/Userland/Services/WindowServer/MenuManager.h @@ -20,7 +20,6 @@ class MenuManager final : public Core::Object { public: static MenuManager& the(); - MenuManager(); virtual ~MenuManager() override; bool is_open(const Menu&) const; @@ -48,6 +47,8 @@ public: Menu* hovered_menu() { return m_hovered_menu; } private: + MenuManager(); + void close_menus(const Vector&); virtual void event(Core::Event&) override; diff --git a/Userland/Services/WindowServer/WindowManager.h b/Userland/Services/WindowServer/WindowManager.h index 5584fa4f47..4114343554 100644 --- a/Userland/Services/WindowServer/WindowManager.h +++ b/Userland/Services/WindowServer/WindowManager.h @@ -68,7 +68,6 @@ public: static WindowManager& the(); - explicit WindowManager(Gfx::PaletteImpl const&); virtual ~WindowManager() override; Palette palette() const { return Palette(*m_palette); } @@ -322,6 +321,8 @@ public: void apply_cursor_theme(String const& name); private: + explicit WindowManager(Gfx::PaletteImpl const&); + void notify_new_active_window(Window&); void notify_new_active_input_window(Window&); void notify_previous_active_window(Window&); diff --git a/Userland/Utilities/shot.cpp b/Userland/Utilities/shot.cpp index 13a8b193bd..74b8782b11 100644 --- a/Userland/Utilities/shot.cpp +++ b/Userland/Utilities/shot.cpp @@ -24,13 +24,6 @@ class SelectableLayover final : public GUI::Widget { C_OBJECT(SelectableLayover) public: - SelectableLayover(GUI::Window* window) - : m_window(window) - , m_background_color(palette().threed_highlight().with_alpha(128)) - { - set_override_cursor(Gfx::StandardCursor::Crosshair); - } - virtual ~SelectableLayover() override {}; Gfx::IntRect region() const @@ -39,6 +32,13 @@ public: } private: + SelectableLayover(GUI::Window* window) + : m_window(window) + , m_background_color(palette().threed_highlight().with_alpha(128)) + { + set_override_cursor(Gfx::StandardCursor::Crosshair); + } + virtual void mousedown_event(GUI::MouseEvent& event) override { if (event.button() == GUI::MouseButton::Primary)