From 973cb0a49e30d7fbecda82026e91b199e8ecb36d Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Tue, 23 Nov 2021 23:45:55 +0100 Subject: [PATCH] Calculator: Port to LibMain :^) --- .../Applications/Calculator/CMakeLists.txt | 2 +- Userland/Applications/Calculator/main.cpp | 28 ++++++------------- 2 files changed, 10 insertions(+), 20 deletions(-) diff --git a/Userland/Applications/Calculator/CMakeLists.txt b/Userland/Applications/Calculator/CMakeLists.txt index 31d4d842be..74a3d9a58c 100644 --- a/Userland/Applications/Calculator/CMakeLists.txt +++ b/Userland/Applications/Calculator/CMakeLists.txt @@ -15,4 +15,4 @@ set(SOURCES ) serenity_app(Calculator ICON app-calculator) -target_link_libraries(Calculator LibGUI) +target_link_libraries(Calculator LibGUI LibMain) diff --git a/Userland/Applications/Calculator/main.cpp b/Userland/Applications/Calculator/main.cpp index bf7d34a358..2ebc65f157 100644 --- a/Userland/Applications/Calculator/main.cpp +++ b/Userland/Applications/Calculator/main.cpp @@ -5,6 +5,7 @@ */ #include "CalculatorWidget.h" +#include #include #include #include @@ -13,33 +14,22 @@ #include #include #include +#include #include #include -int main(int argc, char** argv) +ErrorOr serenity_main(Main::Arguments arguments) { - if (pledge("stdio recvfd sendfd rpath unix", nullptr) < 0) { - perror("pledge"); - return 1; - } + TRY(Core::System::pledge("stdio recvfd sendfd rpath unix", nullptr)); + auto app = TRY(GUI::Application::try_create(arguments)); - auto app = GUI::Application::construct(argc, argv); - - if (pledge("stdio recvfd sendfd rpath", nullptr) < 0) { - perror("pledge"); - return 1; - } - - if (unveil("/res", "r") < 0) { - perror("unveil"); - return 1; - } - - unveil(nullptr, nullptr); + TRY(Core::System::pledge("stdio recvfd sendfd rpath", nullptr)); + TRY(Core::System::unveil("/res", "r")); + TRY(Core::System::unveil(nullptr, nullptr)); auto app_icon = GUI::Icon::default_icon("app-calculator"); - auto window = GUI::Window::construct(); + auto window = TRY(GUI::Window::try_create()); window->set_title("Calculator"); window->set_resizable(false); window->resize(250, 215);