From e4f627f2996ac15d43e5ffa5fe232fcb55ca431b Mon Sep 17 00:00:00 2001 From: Hendiadyoin1 Date: Sun, 11 Jun 2023 19:44:53 +0200 Subject: [PATCH] LibGUI: Stop lying about string types --- Userland/Libraries/LibGUI/CommonActions.cpp | 2 +- Userland/Libraries/LibGUI/Statusbar.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Userland/Libraries/LibGUI/CommonActions.cpp b/Userland/Libraries/LibGUI/CommonActions.cpp index 77eb57ebeb..5a4e5528b8 100644 --- a/Userland/Libraries/LibGUI/CommonActions.cpp +++ b/Userland/Libraries/LibGUI/CommonActions.cpp @@ -22,7 +22,7 @@ NonnullRefPtr make_about_action(DeprecatedString const& app_name, Icon c auto weak_parent = AK::make_weak_ptr_if_nonnull(parent); auto action = Action::create(DeprecatedString::formatted("&About {}", app_name), app_icon.bitmap_for_size(16), [=](auto&) { AboutDialog::show( - String::from_utf8(app_name).release_value_but_fixme_should_propagate_errors(), + String::from_deprecated_string(app_name).release_value_but_fixme_should_propagate_errors(), Core::Version::read_long_version_string().release_value_but_fixme_should_propagate_errors(), app_icon.bitmap_for_size(32), weak_parent) diff --git a/Userland/Libraries/LibGUI/Statusbar.cpp b/Userland/Libraries/LibGUI/Statusbar.cpp index cf5d8c927d..cd18895bf6 100644 --- a/Userland/Libraries/LibGUI/Statusbar.cpp +++ b/Userland/Libraries/LibGUI/Statusbar.cpp @@ -84,7 +84,7 @@ void Statusbar::update_segment(size_t index) if (!text(i).is_empty()) m_segments[i]->set_visible(true); } - segment->set_text(String::from_utf8(segment->restored_text()).release_value_but_fixme_should_propagate_errors()); + segment->set_text(String::from_deprecated_string(segment->restored_text()).release_value_but_fixme_should_propagate_errors()); segment->set_frame_style(Gfx::FrameStyle::SunkenPanel); if (segment->mode() != Segment::Mode::Proportional) segment->set_fixed_width(segment->restored_width()); @@ -93,7 +93,7 @@ void Statusbar::update_segment(size_t index) if (!m_segments[i]->is_clickable()) m_segments[i]->set_visible(false); } - segment->set_text(String::from_utf8(segment->override_text()).release_value_but_fixme_should_propagate_errors()); + segment->set_text(String::from_deprecated_string(segment->override_text()).release_value_but_fixme_should_propagate_errors()); segment->set_frame_style(Gfx::FrameStyle::NoFrame); if (segment->mode() != Segment::Mode::Proportional) segment->set_fixed_width(SpecialDimension::Grow);