Fix build after LibGUI changes

SerenityPorts · Dec 27, 2023 · 29ccf5d · 29ccf5d
1 parent 8dc79d5
commit 29ccf5d
Showing 1 changed file with 14 additions and 9 deletions.
diff --git a/serenity.cpp b/serenity.cpp
@@ -248,7 +248,11 @@ class Frontend : public GUI::Widget {
     }
 
     void status_bar(const char *text) {
-        m_statusbar->set_text(text);
+        auto text_or_error = String::from_utf8({ text, strlen(text) });
+        if (text_or_error.is_error())
+            return;
+
+        m_statusbar->set_text(text_or_error.release_value());
     }
 
     bool wants_statusbar() {
@@ -484,7 +488,8 @@ void create_preset_menu(NonnullRefPtr<GUI::Menu> menu, Frontend& frontend, prese
             menu->add_action(action);
         }
         else {
-            auto& submenu = menu->add_submenu(preset->title);
+            auto title = MUST(String::from_utf8({ preset->title, strlen(preset->title) }));
+            auto submenu = menu->add_submenu(move(title));
             create_preset_menu(submenu, frontend, preset->submenu);
         }
     }
@@ -493,24 +498,24 @@ void create_preset_menu(NonnullRefPtr<GUI::Menu> menu, Frontend& frontend, prese
 ErrorOr<int> serenity_main(Main::Arguments arguments) {
     TRY(Core::System::pledge("stdio rpath accept wpath cpath recvfd sendfd unix fattr"));
 
-    auto app = TRY(GUI::Application::try_create(arguments));
+    auto app = TRY(GUI::Application::create(arguments));
 
-    auto window = TRY(GUI::Window::try_create());
+    auto window = GUI::Window::construct();
     window->set_title(thegame.name);
     window->set_resizable(true);
     window->resize(400, 400);
 
-    auto frontend = TRY(window->set_main_widget<Frontend>());
-    (void)TRY(frontend->try_set_layout<GUI::VerticalBoxLayout>());
+    auto frontend = window->set_main_widget<Frontend>();
+    frontend->set_layout<GUI::VerticalBoxLayout>();
 
     if (frontend->wants_statusbar()) {
-        auto statusbar = TRY(frontend->try_add<GUI::Statusbar>());
+        auto& statusbar = frontend->add<GUI::Statusbar>();
         frontend->set_statusbar(statusbar);
     }
 
     frontend->new_game();
 
-    auto game_menu = TRY(window->try_add_menu("&Game"));
+    auto game_menu = window->add_menu("&Game"_string);
     game_menu->add_action(GUI::Action::create("&New Game", [&](auto&) {
         frontend->new_game();
     }));
@@ -526,7 +531,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments) {
 
     auto presets = frontend->get_presets();
     if (presets) {
-        auto presets_menu = TRY(window->try_add_menu("&Type"));
+        auto presets_menu = window->add_menu("&Type"_string);
         create_preset_menu(presets_menu, frontend, presets);
     }