From 6b862d506359e5eff6cc155ab18350c62c7ab06c Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Sat, 27 Nov 2021 17:35:00 +0100 Subject: [PATCH] TerminalSettings: Port to LibMain :^) --- .../TerminalSettings/CMakeLists.txt | 2 +- .../Applications/TerminalSettings/main.cpp | 43 +++++-------------- 2 files changed, 12 insertions(+), 33 deletions(-) diff --git a/Userland/Applications/TerminalSettings/CMakeLists.txt b/Userland/Applications/TerminalSettings/CMakeLists.txt index 13a82464c3..72b6f681e5 100644 --- a/Userland/Applications/TerminalSettings/CMakeLists.txt +++ b/Userland/Applications/TerminalSettings/CMakeLists.txt @@ -15,4 +15,4 @@ set(SOURCES ) serenity_app(TerminalSettings ICON app-terminal) -target_link_libraries(TerminalSettings LibGUI LibConfig) +target_link_libraries(TerminalSettings LibGUI LibConfig LibMain) diff --git a/Userland/Applications/TerminalSettings/main.cpp b/Userland/Applications/TerminalSettings/main.cpp index 118d534e40..1e2d160f26 100644 --- a/Userland/Applications/TerminalSettings/main.cpp +++ b/Userland/Applications/TerminalSettings/main.cpp @@ -5,51 +5,30 @@ */ #include "TerminalSettingsWidget.h" +#include #include #include #include +#include // Including this after to avoid LibIPC errors #include -int main(int argc, char** argv) +ErrorOr serenity_main(Main::Arguments arguments) { - if (pledge("stdio rpath cpath wpath recvfd sendfd unix proc exec", nullptr) < 0) { - perror("pledge"); - return 1; - } - - auto app = GUI::Application::construct(argc, argv); + TRY(Core::System::pledge("stdio rpath cpath wpath recvfd sendfd unix proc exec", nullptr)); + auto app = TRY(GUI::Application::try_create(arguments)); Config::pledge_domains("Terminal"); - if (pledge("stdio rpath cpath wpath recvfd sendfd proc exec", nullptr) < 0) { - perror("pledge"); - return 1; - } - - if (unveil("/res", "r") < 0) { - perror("unveil"); - return 1; - } - - if (unveil("/bin/keymap", "x") < 0) { - perror("unveil"); - return 1; - } - - if (unveil("/proc/keymap", "r") < 0) { - perror("unveil"); - return 1; - } - - if (unveil(nullptr, nullptr)) { - perror("unveil"); - return 1; - } + TRY(Core::System::pledge("stdio rpath cpath wpath recvfd sendfd proc exec", nullptr)); + TRY(Core::System::unveil("/res", "r")); + TRY(Core::System::unveil("/bin/keymap", "x")); + TRY(Core::System::unveil("/proc/keymap", "r")); + TRY(Core::System::unveil(nullptr, nullptr)); auto app_icon = GUI::Icon::default_icon("app-terminal"); - auto window = GUI::SettingsWindow::construct("Terminal Settings"); + auto window = TRY(GUI::SettingsWindow::try_create("Terminal Settings")); window->set_icon(app_icon.bitmap_for_size(16)); window->add_tab("Terminal"); window->add_tab("View");