Parcourir la source

DisplaySettings: Port to LibMain :^)

Andreas Kling il y a 3 ans
Parent
commit
984cf1fe7a

+ 1 - 1
Userland/Applications/DisplaySettings/CMakeLists.txt

@@ -23,4 +23,4 @@ set(SOURCES
 )
 )
 
 
 serenity_app(DisplaySettings ICON app-display-settings)
 serenity_app(DisplaySettings ICON app-display-settings)
-target_link_libraries(DisplaySettings LibDesktop LibGUI LibConfig)
+target_link_libraries(DisplaySettings LibDesktop LibGUI LibConfig LibMain)

+ 6 - 9
Userland/Applications/DisplaySettings/main.cpp

@@ -11,25 +11,22 @@
 #include "FontSettingsWidget.h"
 #include "FontSettingsWidget.h"
 #include "MonitorSettingsWidget.h"
 #include "MonitorSettingsWidget.h"
 #include <LibConfig/Client.h>
 #include <LibConfig/Client.h>
+#include <LibCore/System.h>
 #include <LibGUI/Application.h>
 #include <LibGUI/Application.h>
 #include <LibGUI/Icon.h>
 #include <LibGUI/Icon.h>
 #include <LibGUI/SettingsWindow.h>
 #include <LibGUI/SettingsWindow.h>
-#include <stdio.h>
-#include <unistd.h>
+#include <LibMain/Main.h>
 
 
-int main(int argc, char** argv)
+ErrorOr<int> serenity_main(Main::Arguments arguments)
 {
 {
-    if (pledge("stdio thread recvfd sendfd rpath cpath wpath unix", nullptr) < 0) {
-        perror("pledge");
-        return 1;
-    }
+    TRY(Core::System::pledge("stdio thread recvfd sendfd rpath cpath wpath unix"));
 
 
-    auto app = GUI::Application::construct(argc, argv);
+    auto app = TRY(GUI::Application::try_create(arguments));
     Config::pledge_domains("WindowManager");
     Config::pledge_domains("WindowManager");
 
 
     auto app_icon = GUI::Icon::default_icon("app-display-settings");
     auto app_icon = GUI::Icon::default_icon("app-display-settings");
 
 
-    auto window = GUI::SettingsWindow::construct("Display Settings");
+    auto window = TRY(GUI::SettingsWindow::try_create("Display Settings"));
     window->add_tab<DisplaySettings::BackgroundSettingsWidget>("Background");
     window->add_tab<DisplaySettings::BackgroundSettingsWidget>("Background");
     window->add_tab<DisplaySettings::FontSettingsWidget>("Fonts");
     window->add_tab<DisplaySettings::FontSettingsWidget>("Fonts");
     window->add_tab<DisplaySettings::MonitorSettingsWidget>("Monitor");
     window->add_tab<DisplaySettings::MonitorSettingsWidget>("Monitor");