mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 22:27:35 +00:00
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.
This commit is contained in:
parent
f132751fae
commit
1a97382305
93 changed files with 121 additions and 118 deletions
|
@ -25,8 +25,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
|||
args_parser.parse(arguments);
|
||||
|
||||
// A Core::EventLoop is all we need, but ConnectionToWindowServer needs a full Application object.
|
||||
char* dummy_argv[] = { arguments.argv[0] };
|
||||
auto app = TRY(GUI::Application::try_create(1, dummy_argv));
|
||||
auto app = TRY(GUI::Application::create(arguments));
|
||||
auto screen_layout = GUI::ConnectionToWindowServer::the().get_screen_layout();
|
||||
if (screen < 0 || (size_t)screen >= screen_layout.screens.size()) {
|
||||
warnln("invalid screen index: {}", screen);
|
||||
|
|
|
@ -59,7 +59,7 @@ static ErrorOr<Options> parse_options(Main::Arguments arguments)
|
|||
|
||||
ErrorOr<int> serenity_main(Main::Arguments arguments)
|
||||
{
|
||||
auto app = TRY(GUI::Application::try_create(arguments));
|
||||
auto app = TRY(GUI::Application::create(arguments));
|
||||
|
||||
Options options = TRY(parse_options(arguments));
|
||||
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
ErrorOr<int> serenity_main(Main::Arguments arguments)
|
||||
{
|
||||
auto app = TRY(GUI::Application::try_create(arguments));
|
||||
auto app = TRY(GUI::Application::create(arguments));
|
||||
|
||||
Core::ArgsParser args_parser;
|
||||
StringView title {};
|
||||
|
|
|
@ -62,7 +62,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
|||
args_parser.add_positional_argument(watch_command, "Command to run in watch mode", "command", Core::ArgsParser::Required::No);
|
||||
args_parser.parse(arguments);
|
||||
|
||||
auto app = TRY(GUI::Application::try_create(arguments));
|
||||
auto app = TRY(GUI::Application::create(arguments));
|
||||
|
||||
auto& clipboard = GUI::Clipboard::the();
|
||||
|
||||
|
|
|
@ -112,7 +112,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
|||
output_path = Core::DateTime::now().to_deprecated_string("screenshot-%Y-%m-%d-%H-%M-%S.png"sv);
|
||||
}
|
||||
|
||||
auto app = TRY(GUI::Application::try_create(arguments));
|
||||
auto app = TRY(GUI::Application::create(arguments));
|
||||
Optional<Gfx::IntRect> crop_region;
|
||||
if (select_region) {
|
||||
auto window = GUI::Window::construct();
|
||||
|
|
|
@ -31,7 +31,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
|||
args_parser.add_positional_argument(path, "Wallpaper to set", "path", Core::ArgsParser::Required::No);
|
||||
args_parser.parse(arguments);
|
||||
|
||||
auto app = TRY(GUI::Application::try_create(arguments));
|
||||
auto app = TRY(GUI::Application::create(arguments));
|
||||
|
||||
TRY(Core::System::pledge("stdio rpath unix sendfd"));
|
||||
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
ErrorOr<int> serenity_main(Main::Arguments arguments)
|
||||
{
|
||||
auto app = TRY(GUI::Application::try_create(arguments));
|
||||
auto app = TRY(GUI::Application::create(arguments));
|
||||
|
||||
int flash_flush = -1;
|
||||
Core::ArgsParser args_parser;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue