From 7d2170246f754c82dba0bf09aaa28bdd9a10b3e4 Mon Sep 17 00:00:00 2001 From: Pedro Pereira Date: Tue, 23 Nov 2021 10:39:33 +0000 Subject: [PATCH] Hearts: Port to LibMain Simplified one pledge() and two unveil() by using TRY(). --- Userland/Games/Hearts/CMakeLists.txt | 2 +- Userland/Games/Hearts/main.cpp | 23 +++++++---------------- 2 files changed, 8 insertions(+), 17 deletions(-) diff --git a/Userland/Games/Hearts/CMakeLists.txt b/Userland/Games/Hearts/CMakeLists.txt index 626b2e9c0b..fa494a8946 100644 --- a/Userland/Games/Hearts/CMakeLists.txt +++ b/Userland/Games/Hearts/CMakeLists.txt @@ -17,4 +17,4 @@ set(SOURCES ) serenity_app(Hearts ICON app-hearts) -target_link_libraries(Hearts LibCards LibGUI LibGfx LibCore LibConfig) +target_link_libraries(Hearts LibCards LibGUI LibGfx LibCore LibConfig LibMain) diff --git a/Userland/Games/Hearts/main.cpp b/Userland/Games/Hearts/main.cpp index 5928e08ecf..862d04fcf5 100644 --- a/Userland/Games/Hearts/main.cpp +++ b/Userland/Games/Hearts/main.cpp @@ -10,6 +10,7 @@ #include "SettingsDialog.h" #include #include +#include #include #include #include @@ -20,30 +21,20 @@ #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 = GUI::Application::construct(arguments); auto app_icon = GUI::Icon::default_icon("app-hearts"); Config::pledge_domains("Hearts"); - if (pledge("stdio recvfd sendfd rpath", nullptr) < 0) { - perror("pledge"); - return 1; - } + TRY(Core::System::pledge("stdio recvfd sendfd rpath", nullptr)); - if (unveil("/res", "r") < 0) { - perror("unveil"); - return 1; - } - - if (unveil(nullptr, nullptr) < 0) { - perror("unveil"); - return 1; - } + TRY(Core::System::unveil("/res", "r")); + TRY(Core::System::unveil(nullptr, nullptr)); auto window = GUI::Window::construct(); window->set_title("Hearts");