mirror of
https://github.com/RGBCube/serenity
synced 2025-10-31 16:42:44 +00:00
1a97382305
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.
38 lines
1.3 KiB
C++
38 lines
1.3 KiB
C++
/*
|
|
* Copyright (c) 2022, kleines Filmröllchen <filmroellchen@serenityos.org>
|
|
* Copyright (c) 2023, Andreas Kling <kling@serenityos.org>
|
|
*
|
|
* SPDX-License-Identifier: BSD-2-Clause
|
|
*/
|
|
|
|
#include "PresenterWidget.h"
|
|
#include <LibCore/ArgsParser.h>
|
|
#include <LibCore/System.h>
|
|
#include <LibGUI/Application.h>
|
|
#include <LibGUI/Icon.h>
|
|
#include <LibGUI/Window.h>
|
|
#include <LibMain/Main.h>
|
|
|
|
ErrorOr<int> serenity_main(Main::Arguments arguments)
|
|
{
|
|
// rpath is required to load .presenter files, unix, sendfd and recvfd are required to talk to WindowServer and WebContent.
|
|
TRY(Core::System::pledge("stdio rpath unix sendfd recvfd"));
|
|
|
|
DeprecatedString file_to_load;
|
|
Core::ArgsParser argument_parser;
|
|
argument_parser.add_positional_argument(file_to_load, "Presentation to load", "file", Core::ArgsParser::Required::No);
|
|
argument_parser.parse(arguments);
|
|
|
|
auto app = TRY(GUI::Application::create(arguments));
|
|
auto window = TRY(GUI::Window::try_create());
|
|
window->set_title("Presenter");
|
|
window->set_icon(GUI::Icon::default_icon("app-presenter"sv).bitmap_for_size(16));
|
|
auto main_widget = TRY(window->set_main_widget<PresenterWidget>());
|
|
TRY(main_widget->initialize_menubar());
|
|
window->show();
|
|
|
|
if (!file_to_load.is_empty())
|
|
main_widget->set_file(file_to_load);
|
|
|
|
return app->exec();
|
|
}
|