RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-28 19:15:09 +00:00
Code Issues Activity Actions

Userland: Don't use String::from_utf8() for literal strings

Browse source
This commit is contained in:
Tim Ledbetter 2023-09-14 17:57:11 +01:00 • committed by Andreas Kling
parent 4cc3c41269
commit c74f7e5f2a
8 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Userland/Applications/DisplaySettings/BackgroundSettingsWidget.cpp
View file

@ -35,9 +35,9 @@ ErrorOr<NonnullRefPtr<BackgroundSettingsWidget>> BackgroundSettingsWidget::try_c
{
auto background_settings_widget = TRY(adopt_nonnull_ref_or_enomem(new (nothrow) BackgroundSettingsWidget(background_settings_changed)));
TRY(background_settings_widget->m_modes.try_append(TRY(String::from_utf8("Tile"sv))));
TRY(background_settings_widget->m_modes.try_append(TRY(String::from_utf8("Center"sv))));
TRY(background_settings_widget->m_modes.try_append(TRY(String::from_utf8("Stretch"sv))));
TRY(background_settings_widget->m_modes.try_append("Tile"_string));
TRY(background_settings_widget->m_modes.try_append("Center"_string));
TRY(background_settings_widget->m_modes.try_append("Stretch"_string));
TRY(background_settings_widget->create_frame());
TRY(background_settings_widget->load_current_settings());
@ -154,7 +154,7 @@ ErrorOr<void> BackgroundSettingsWidget::load_current_settings()
auto mode = TRY(String::from_deprecated_string(ws_config->read_entry("Background", "Mode", "Center")));
if (!m_modes.contains_slow(mode)) {
warnln("Invalid background mode '{}' in WindowServer config, falling back to 'Center'", mode);
mode = TRY(String::from_utf8("Center"sv));
mode = "Center"_string;
}
m_monitor_widget->set_wallpaper_mode(mode);
m_mode_combo->set_selected_index(m_modes.find_first_index(mode).value_or(0), GUI::AllowCallback::No);