From 10b539350670ddfd5dafbeb23ee1f93ca3f0fd4c Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Tue, 23 Nov 2021 23:08:57 +0100 Subject: [PATCH] MouseSettings: Port to LibMain :^) --- .../Applications/MouseSettings/CMakeLists.txt | 2 +- Userland/Applications/MouseSettings/main.cpp | 20 +++++++------------ 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/Userland/Applications/MouseSettings/CMakeLists.txt b/Userland/Applications/MouseSettings/CMakeLists.txt index 586f5cb6ff..974f07bc02 100644 --- a/Userland/Applications/MouseSettings/CMakeLists.txt +++ b/Userland/Applications/MouseSettings/CMakeLists.txt @@ -19,4 +19,4 @@ set(SOURCES ) serenity_app(MouseSettings ICON app-mouse) -target_link_libraries(MouseSettings LibGUI) +target_link_libraries(MouseSettings LibGUI LibMain) diff --git a/Userland/Applications/MouseSettings/main.cpp b/Userland/Applications/MouseSettings/main.cpp index 9a906c331c..d864582316 100644 --- a/Userland/Applications/MouseSettings/main.cpp +++ b/Userland/Applications/MouseSettings/main.cpp @@ -9,29 +9,23 @@ #include "MouseWidget.h" #include "ThemeWidget.h" -#include +#include #include #include #include -#include +#include -int main(int argc, char** argv) +ErrorOr serenity_main(Main::Arguments arguments) { - if (pledge("stdio cpath rpath recvfd sendfd unix", nullptr) < 0) { - perror("pledge"); - return 1; - } + TRY(Core::System::pledge("stdio cpath rpath recvfd sendfd unix", nullptr)); - auto app = GUI::Application::construct(argc, argv); + auto app = TRY(GUI::Application::try_create(arguments)); - if (pledge("stdio cpath rpath recvfd sendfd", nullptr) < 0) { - perror("pledge"); - return 1; - } + TRY(Core::System::pledge("stdio cpath rpath recvfd sendfd", nullptr)); auto app_icon = GUI::Icon::default_icon("app-mouse"); - auto window = GUI::SettingsWindow::construct("Mouse Settings", GUI::SettingsWindow::ShowDefaultsButton::Yes); + auto window = TRY(GUI::SettingsWindow::try_create("Mouse Settings", GUI::SettingsWindow::ShowDefaultsButton::Yes)); window->add_tab("Mouse"); window->add_tab("Cursor Theme"); window->set_icon(app_icon.bitmap_for_size(16));