diff --git a/Userland/Applications/AnalogClock/CMakeLists.txt b/Userland/Applications/AnalogClock/CMakeLists.txt index a3ab6b2abe..e942ee5cf3 100644 --- a/Userland/Applications/AnalogClock/CMakeLists.txt +++ b/Userland/Applications/AnalogClock/CMakeLists.txt @@ -10,4 +10,4 @@ set(SOURCES ) serenity_app(AnalogClock ICON app-analog-clock) -target_link_libraries(AnalogClock LibGUI) +target_link_libraries(AnalogClock LibGUI LibMain) diff --git a/Userland/Applications/AnalogClock/main.cpp b/Userland/Applications/AnalogClock/main.cpp index 5f7abcce81..6e5b6030d9 100644 --- a/Userland/Applications/AnalogClock/main.cpp +++ b/Userland/Applications/AnalogClock/main.cpp @@ -1,53 +1,45 @@ /* * Copyright (c) 2021, Erlend Høier + * Copyright (c) 2021, Julius Heijmen * * SPDX-License-Identifier: BSD-2-Clause */ #include "AnalogClock.h" #include +#include #include #include #include #include #include -#include +#include -int main(int argc, char** argv) +ErrorOr serenity_main(Main::Arguments arguments) { - auto app = GUI::Application::construct(argc, argv); + auto app = TRY(GUI::Application::try_create(arguments)); - if (pledge("stdio recvfd sendfd rpath", nullptr) < 0) { - perror("pledge"); - return 1; - } + TRY(Core::System::pledge("stdio recvfd sendfd rpath")); + TRY(Core::System::unveil("/res", "r")); + TRY(Core::System::unveil(nullptr, nullptr)); - if (unveil("/res", "r") < 0) { - perror("unveil"); - return 1; - } - - if (unveil(nullptr, nullptr) < 0) { - perror("unveil"); - return 1; - } - - auto app_icon = GUI::Icon::default_icon("app-analog-clock"); - auto window = GUI::Window::construct(); + auto app_icon = TRY(GUI::Icon::try_create_default_icon("app-analog-clock")); + auto window = TRY(GUI::Window::try_create()); window->set_title(Core::DateTime::now().to_string("%Y-%m-%d")); window->set_icon(app_icon.bitmap_for_size(16)); window->resize(170, 170); window->set_resizable(false); - auto& clock = window->set_main_widget(); + auto clock = TRY(window->try_set_main_widget()); auto show_window_frame_action = GUI::Action::create_checkable( "Show Window &Frame", { Mod_Alt, KeyCode::Key_F }, [&](auto& action) { - clock.set_show_window_frame(action.is_checked()); + clock->set_show_window_frame(action.is_checked()); }); - show_window_frame_action->set_checked(clock.show_window_frame()); - auto menu = GUI::Menu::construct(); - menu->add_action(move(show_window_frame_action)); - clock.on_context_menu_request = [&](auto& event) { + show_window_frame_action->set_checked(clock->show_window_frame()); + auto menu = TRY(GUI::Menu::try_create()); + TRY(menu->try_add_action(*show_window_frame_action)); + + clock->on_context_menu_request = [&](auto& event) { menu->popup(event.screen_position()); };