mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 22:07:35 +00:00
LibGUI+Userland: Rename try_load_from_gml()
-> load_from_gml()
:^)
It's the only one, so the `try` prefix is unnecessary now.
This commit is contained in:
parent
e4e12f3a96
commit
f0395a2042
85 changed files with 107 additions and 107 deletions
|
@ -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);
|
||||
|
|
|
@ -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");
|
||||
|
||||
|
|
|
@ -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));
|
||||
|
|
|
@ -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");
|
||||
|
|
|
@ -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");
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue