diff --git a/Userland/Libraries/LibGUI/ScrollableContainerWidget.cpp b/Userland/Libraries/LibGUI/ScrollableContainerWidget.cpp index 51962a44a4..f7110fb988 100644 --- a/Userland/Libraries/LibGUI/ScrollableContainerWidget.cpp +++ b/Userland/Libraries/LibGUI/ScrollableContainerWidget.cpp @@ -102,7 +102,7 @@ void ScrollableContainerWidget::set_widget(GUI::Widget* widget) update_widget_position(); } -ErrorOr ScrollableContainerWidget::load_from_gml_ast(NonnullRefPtr ast, ErrorOr> (*unregistered_child_handler)(DeprecatedString const&)) +ErrorOr ScrollableContainerWidget::load_from_gml_ast(NonnullRefPtr ast, UnregisteredChildHandler unregistered_child_handler) { if (is(ast.ptr())) return load_from_gml_ast(static_ptr_cast(ast)->main_class(), unregistered_child_handler); diff --git a/Userland/Libraries/LibGUI/ScrollableContainerWidget.h b/Userland/Libraries/LibGUI/ScrollableContainerWidget.h index b87c4053ec..ef0e4e7ac9 100644 --- a/Userland/Libraries/LibGUI/ScrollableContainerWidget.h +++ b/Userland/Libraries/LibGUI/ScrollableContainerWidget.h @@ -30,7 +30,7 @@ private: void update_widget_size(); void update_widget_position(); void update_widget_min_size(); - virtual ErrorOr load_from_gml_ast(NonnullRefPtr ast, ErrorOr> (*unregistered_child_handler)(DeprecatedString const&)) override; + virtual ErrorOr load_from_gml_ast(NonnullRefPtr ast, UnregisteredChildHandler) override; ScrollableContainerWidget(); diff --git a/Userland/Libraries/LibGUI/Widget.cpp b/Userland/Libraries/LibGUI/Widget.cpp index c160d9c069..3d4f2684cf 100644 --- a/Userland/Libraries/LibGUI/Widget.cpp +++ b/Userland/Libraries/LibGUI/Widget.cpp @@ -1153,7 +1153,7 @@ ErrorOr Widget::try_load_from_gml(StringView gml_string) }); } -ErrorOr Widget::try_load_from_gml(StringView gml_string, ErrorOr> (*unregistered_child_handler)(DeprecatedString const&)) +ErrorOr Widget::try_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); @@ -1164,12 +1164,12 @@ bool Widget::load_from_gml(StringView gml_string) return !try_load_from_gml(gml_string).is_error(); } -bool Widget::load_from_gml(StringView gml_string, ErrorOr> (*unregistered_child_handler)(DeprecatedString const&)) +bool Widget::load_from_gml(StringView gml_string, UnregisteredChildHandler unregistered_child_handler) { return !try_load_from_gml(gml_string, unregistered_child_handler).is_error(); } -ErrorOr Widget::load_from_gml_ast(NonnullRefPtr ast, ErrorOr> (*unregistered_child_handler)(DeprecatedString const&)) +ErrorOr Widget::load_from_gml_ast(NonnullRefPtr ast, UnregisteredChildHandler unregistered_child_handler) { if (is(ast.ptr())) return load_from_gml_ast(static_ptr_cast(ast)->main_class(), unregistered_child_handler); diff --git a/Userland/Libraries/LibGUI/Widget.h b/Userland/Libraries/LibGUI/Widget.h index f43e55b92f..20c8985e8a 100644 --- a/Userland/Libraries/LibGUI/Widget.h +++ b/Userland/Libraries/LibGUI/Widget.h @@ -353,12 +353,13 @@ public: AK::Variant> const& override_cursor() const { return m_override_cursor; } void set_override_cursor(AK::Variant>); + using UnregisteredChildHandler = ErrorOr>(DeprecatedString const&); ErrorOr try_load_from_gml(StringView); - ErrorOr try_load_from_gml(StringView, ErrorOr> (*unregistered_child_handler)(DeprecatedString const&)); + ErrorOr try_load_from_gml(StringView, UnregisteredChildHandler); // FIXME: Replace all uses of load_from_gml() with try_load_from_gml() bool load_from_gml(StringView gml_string); - bool load_from_gml(StringView, ErrorOr> (*unregistered_child_handler)(DeprecatedString const&)); + bool load_from_gml(StringView, UnregisteredChildHandler); // FIXME: remove this when all uses of shrink_to_fit are eliminated void set_shrink_to_fit(bool); @@ -367,7 +368,7 @@ public: bool has_pending_drop() const; // In order for others to be able to call this, it needs to be public. - virtual ErrorOr load_from_gml_ast(NonnullRefPtr ast, ErrorOr> (*unregistered_child_handler)(DeprecatedString const&)); + virtual ErrorOr load_from_gml_ast(NonnullRefPtr ast, UnregisteredChildHandler); protected: Widget();