diff options
author | Sam Atkins <atkinssj@serenityos.org> | 2023-01-06 16:48:37 +0000 |
---|---|---|
committer | Andrew Kaster <andrewdkaster@gmail.com> | 2023-01-06 13:36:02 -0700 |
commit | 0c24522635ec7f07e1fb69d9e1cd350d81e2248f (patch) | |
tree | 391782374bada7ee7a986674229551c2ec21f75a /Userland/Libraries/LibGUI/Window.h | |
parent | d223477bc650e271008ccc339fc1e2c0fcc079e7 (diff) | |
download | serenity-0c24522635ec7f07e1fb69d9e1cd350d81e2248f.zip |
LibGUI+Everywhere: Use fallible Window::set_main_widget() everywhere :^)
Rip that bandaid off!
This does the following, in one big, awkward jump:
- Replace all uses of `set_main_widget<Foo>()` with the `try` version.
- Remove `set_main_widget<Foo>()`.
- Rename the `try` version to just be `set_main_widget` because it's now
the only one.
The majority of places that call `set_main_widget<Foo>()` are inside
constructors, so this unfortunately gives us a big batch of new
`release_value_but_fixme_should_propagate_errors()` calls.
Diffstat (limited to 'Userland/Libraries/LibGUI/Window.h')
-rw-r--r-- | Userland/Libraries/LibGUI/Window.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/Userland/Libraries/LibGUI/Window.h b/Userland/Libraries/LibGUI/Window.h index 03a4bece7c..43652891b8 100644 --- a/Userland/Libraries/LibGUI/Window.h +++ b/Userland/Libraries/LibGUI/Window.h @@ -143,21 +143,13 @@ public: void set_main_widget(Widget*); template<class T, class... Args> - inline ErrorOr<NonnullRefPtr<T>> try_set_main_widget(Args&&... args) + inline ErrorOr<NonnullRefPtr<T>> set_main_widget(Args&&... args) { auto widget = TRY(T::try_create(forward<Args>(args)...)); set_main_widget(widget.ptr()); return widget; } - template<class T, class... Args> - inline T& set_main_widget(Args&&... args) - { - auto widget = T::construct(forward<Args>(args)...); - set_main_widget(widget.ptr()); - return *widget; - } - Widget* default_return_key_widget() { return m_default_return_key_widget; } Widget const* default_return_key_widget() const { return m_default_return_key_widget; } void set_default_return_key_widget(Widget*); |