summaryrefslogtreecommitdiff
path: root/Userland/Services
diff options
context:
space:
mode:
authorLucas CHOLLET <lucas.chollet@free.fr>2023-05-05 00:24:53 -0400
committerSam Atkins <atkinssj@gmail.com>2023-05-05 16:41:21 +0100
commit1a97382305f517dcc4c4f71746b6ab5d96012b0d (patch)
tree71bc8573bea401d8a27847c1dadeeceb518fd1a0 /Userland/Services
parentf132751faeaa486c3eebc1ed23117efe9701da22 (diff)
downloadserenity-1a97382305f517dcc4c4f71746b6ab5d96012b0d.zip
LibGUI: Make `Application`'s construction fallible
The pattern to construct `Application` was to use the `try_create` method from the `C_OBJECT` macro. While being safe from an OOM perspective, this method doesn't propagate errors from the constructor. This patch make `Application` use the `C_OBJECT_ABSTRACT` and manually define a `create` method that can bubble up errors from the construction stage. This commit also removes the ability to use `argc` and `argv` to create an `Application`, only `Main`'s `Arguments` can be used. From a user point of view, the patch renames `try_create` => `create`, hence the huge number of modified files.
Diffstat (limited to 'Userland/Services')
-rw-r--r--Userland/Services/FileSystemAccessServer/main.cpp4
-rw-r--r--Userland/Services/LoginServer/main.cpp2
-rw-r--r--Userland/Services/NotificationServer/main.cpp2
-rw-r--r--Userland/Services/Taskbar/main.cpp2
4 files changed, 5 insertions, 5 deletions
diff --git a/Userland/Services/FileSystemAccessServer/main.cpp b/Userland/Services/FileSystemAccessServer/main.cpp
index 5556104df2..3644de3105 100644
--- a/Userland/Services/FileSystemAccessServer/main.cpp
+++ b/Userland/Services/FileSystemAccessServer/main.cpp
@@ -10,11 +10,11 @@
#include <LibIPC/SingleServer.h>
#include <LibMain/Main.h>
-ErrorOr<int> serenity_main(Main::Arguments)
+ErrorOr<int> serenity_main(Main::Arguments arguments)
{
TRY(Core::System::pledge("stdio recvfd sendfd rpath cpath wpath unix thread"));
- auto app = TRY(GUI::Application::try_create(0, nullptr));
+ auto app = TRY(GUI::Application::create(arguments));
app->set_quit_when_last_window_deleted(false);
auto client = TRY(IPC::take_over_accepted_client_from_system_server<FileSystemAccessServer::ConnectionFromClient>());
diff --git a/Userland/Services/LoginServer/main.cpp b/Userland/Services/LoginServer/main.cpp
index 3318cc93bd..df58920cfc 100644
--- a/Userland/Services/LoginServer/main.cpp
+++ b/Userland/Services/LoginServer/main.cpp
@@ -61,7 +61,7 @@ static void login(Core::Account const& account, LoginWindow& window)
ErrorOr<int> serenity_main(Main::Arguments arguments)
{
- auto app = TRY(GUI::Application::try_create(arguments));
+ auto app = TRY(GUI::Application::create(arguments));
TRY(Core::System::pledge("stdio recvfd sendfd cpath chown rpath exec proc id"));
TRY(Core::System::unveil("/home", "r"));
diff --git a/Userland/Services/NotificationServer/main.cpp b/Userland/Services/NotificationServer/main.cpp
index 1a210e6cb3..424241601f 100644
--- a/Userland/Services/NotificationServer/main.cpp
+++ b/Userland/Services/NotificationServer/main.cpp
@@ -14,7 +14,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
{
TRY(Core::System::pledge("stdio recvfd sendfd accept rpath unix"));
- auto app = TRY(GUI::Application::try_create(arguments));
+ auto app = TRY(GUI::Application::create(arguments));
auto server = TRY(IPC::MultiServer<NotificationServer::ConnectionFromClient>::try_create());
TRY(Core::System::unveil("/res", "r"));
diff --git a/Userland/Services/Taskbar/main.cpp b/Userland/Services/Taskbar/main.cpp
index 099b53fbc8..7e1b961758 100644
--- a/Userland/Services/Taskbar/main.cpp
+++ b/Userland/Services/Taskbar/main.cpp
@@ -41,7 +41,7 @@ static ErrorOr<NonnullRefPtr<GUI::Menu>> build_system_menu(GUI::Window&);
ErrorOr<int> serenity_main(Main::Arguments arguments)
{
TRY(Core::System::pledge("stdio recvfd sendfd proc exec rpath unix sigaction"));
- auto app = TRY(GUI::Application::try_create(arguments));
+ auto app = TRY(GUI::Application::create(arguments));
Config::pledge_domains({ "Taskbar", "Calendar" });
Config::monitor_domain("Taskbar");
Config::monitor_domain("Calendar");