diff options
Diffstat (limited to 'Userland/Libraries/LibGUI')
-rw-r--r-- | Userland/Libraries/LibGUI/EmojiInputDialog.cpp | 2 | ||||
-rw-r--r-- | Userland/Libraries/LibGUI/FilePicker.cpp | 2 | ||||
-rw-r--r-- | Userland/Libraries/LibGUI/FontPicker.cpp | 2 | ||||
-rw-r--r-- | Userland/Libraries/LibGUI/IncrementalSearchBanner.cpp | 2 | ||||
-rw-r--r-- | Userland/Libraries/LibGUI/PasswordInputDialog.cpp | 2 | ||||
-rw-r--r-- | Userland/Libraries/LibGUI/Widget.cpp | 6 | ||||
-rw-r--r-- | Userland/Libraries/LibGUI/Widget.h | 4 |
7 files changed, 10 insertions, 10 deletions
diff --git a/Userland/Libraries/LibGUI/EmojiInputDialog.cpp b/Userland/Libraries/LibGUI/EmojiInputDialog.cpp index 5c0752b3bb..4d6ba70caf 100644 --- a/Userland/Libraries/LibGUI/EmojiInputDialog.cpp +++ b/Userland/Libraries/LibGUI/EmojiInputDialog.cpp @@ -93,7 +93,7 @@ EmojiInputDialog::EmojiInputDialog(Window* parent_window) , m_category_action_group(make<ActionGroup>()) { auto main_widget = set_main_widget<Frame>().release_value_but_fixme_should_propagate_errors(); - main_widget->try_load_from_gml(emoji_input_dialog_gml).release_value_but_fixme_should_propagate_errors(); + main_widget->load_from_gml(emoji_input_dialog_gml).release_value_but_fixme_should_propagate_errors(); set_window_type(GUI::WindowType::Popup); set_window_mode(GUI::WindowMode::Modeless); diff --git a/Userland/Libraries/LibGUI/FilePicker.cpp b/Userland/Libraries/LibGUI/FilePicker.cpp index 8709adf6f6..e6c76a9f50 100644 --- a/Userland/Libraries/LibGUI/FilePicker.cpp +++ b/Userland/Libraries/LibGUI/FilePicker.cpp @@ -85,7 +85,7 @@ FilePicker::FilePicker(Window* parent_window, Mode mode, StringView filename, St resize(560, 320); auto widget = set_main_widget<GUI::Widget>().release_value_but_fixme_should_propagate_errors(); - widget->try_load_from_gml(file_picker_dialog_gml).release_value_but_fixme_should_propagate_errors(); + widget->load_from_gml(file_picker_dialog_gml).release_value_but_fixme_should_propagate_errors(); auto& toolbar = *widget->find_descendant_of_type_named<GUI::Toolbar>("toolbar"); diff --git a/Userland/Libraries/LibGUI/FontPicker.cpp b/Userland/Libraries/LibGUI/FontPicker.cpp index 43b01487ff..5d3b8a033f 100644 --- a/Userland/Libraries/LibGUI/FontPicker.cpp +++ b/Userland/Libraries/LibGUI/FontPicker.cpp @@ -27,7 +27,7 @@ FontPicker::FontPicker(Window* parent_window, Gfx::Font const* current_font, boo set_icon(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/app-font-editor.png"sv).release_value_but_fixme_should_propagate_errors()); auto widget = set_main_widget<GUI::Widget>().release_value_but_fixme_should_propagate_errors(); - widget->try_load_from_gml(font_picker_dialog_gml).release_value_but_fixme_should_propagate_errors(); + widget->load_from_gml(font_picker_dialog_gml).release_value_but_fixme_should_propagate_errors(); m_family_list_view = *widget->find_descendant_of_type_named<ListView>("family_list_view"); m_family_list_view->set_model(ItemListModel<DeprecatedString>::create(m_families)); diff --git a/Userland/Libraries/LibGUI/IncrementalSearchBanner.cpp b/Userland/Libraries/LibGUI/IncrementalSearchBanner.cpp index f29643aba7..a1524c2b1f 100644 --- a/Userland/Libraries/LibGUI/IncrementalSearchBanner.cpp +++ b/Userland/Libraries/LibGUI/IncrementalSearchBanner.cpp @@ -19,7 +19,7 @@ namespace GUI { IncrementalSearchBanner::IncrementalSearchBanner(TextEditor& editor) : m_editor(editor) { - try_load_from_gml(incremental_search_banner_gml).release_value_but_fixme_should_propagate_errors(); + load_from_gml(incremental_search_banner_gml).release_value_but_fixme_should_propagate_errors(); m_index_label = find_descendant_of_type_named<Label>("incremental_search_banner_index_label"); m_wrap_search_button = find_descendant_of_type_named<Button>("incremental_search_banner_wrap_search_button"); diff --git a/Userland/Libraries/LibGUI/PasswordInputDialog.cpp b/Userland/Libraries/LibGUI/PasswordInputDialog.cpp index 28a524c79b..6f24b2152f 100644 --- a/Userland/Libraries/LibGUI/PasswordInputDialog.cpp +++ b/Userland/Libraries/LibGUI/PasswordInputDialog.cpp @@ -23,7 +23,7 @@ PasswordInputDialog::PasswordInputDialog(Window* parent_window, DeprecatedString set_title(move(title)); auto widget = set_main_widget<Widget>().release_value_but_fixme_should_propagate_errors(); - widget->try_load_from_gml(password_input_dialog_gml).release_value_but_fixme_should_propagate_errors(); + widget->load_from_gml(password_input_dialog_gml).release_value_but_fixme_should_propagate_errors(); auto& key_icon_label = *widget->find_descendant_of_type_named<GUI::Label>("key_icon_label"); diff --git a/Userland/Libraries/LibGUI/Widget.cpp b/Userland/Libraries/LibGUI/Widget.cpp index 75e0903f9a..ce0d6c1b90 100644 --- a/Userland/Libraries/LibGUI/Widget.cpp +++ b/Userland/Libraries/LibGUI/Widget.cpp @@ -1145,15 +1145,15 @@ void Widget::set_override_cursor(AK::Variant<Gfx::StandardCursor, NonnullRefPtr< } } -ErrorOr<void> Widget::try_load_from_gml(StringView gml_string) +ErrorOr<void> Widget::load_from_gml(StringView gml_string) { - return try_load_from_gml(gml_string, [](DeprecatedString const& class_name) -> ErrorOr<NonnullRefPtr<Core::Object>> { + return load_from_gml(gml_string, [](DeprecatedString const& class_name) -> ErrorOr<NonnullRefPtr<Core::Object>> { dbgln("Class '{}' not registered", class_name); return Error::from_string_literal("Class not registered"); }); } -ErrorOr<void> Widget::try_load_from_gml(StringView gml_string, UnregisteredChildHandler unregistered_child_handler) +ErrorOr<void> Widget::load_from_gml(StringView gml_string, UnregisteredChildHandler unregistered_child_handler) { auto value = TRY(GML::parse_gml(gml_string)); return load_from_gml_ast(value, unregistered_child_handler); diff --git a/Userland/Libraries/LibGUI/Widget.h b/Userland/Libraries/LibGUI/Widget.h index f90c3771a7..8e91e3d504 100644 --- a/Userland/Libraries/LibGUI/Widget.h +++ b/Userland/Libraries/LibGUI/Widget.h @@ -354,8 +354,8 @@ public: void set_override_cursor(AK::Variant<Gfx::StandardCursor, NonnullRefPtr<Gfx::Bitmap>>); using UnregisteredChildHandler = ErrorOr<NonnullRefPtr<Core::Object>>(DeprecatedString const&); - ErrorOr<void> try_load_from_gml(StringView); - ErrorOr<void> try_load_from_gml(StringView, UnregisteredChildHandler); + ErrorOr<void> load_from_gml(StringView); + ErrorOr<void> load_from_gml(StringView, UnregisteredChildHandler); // FIXME: remove this when all uses of shrink_to_fit are eliminated void set_shrink_to_fit(bool); |