RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-14 10:54:57 +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))); 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("Tile"_string));
TRY(background_settings_widget->m_modes.try_append(TRY(String::from_utf8("Center"sv)))); TRY(background_settings_widget->m_modes.try_append("Center"_string));
TRY(background_settings_widget->m_modes.try_append(TRY(String::from_utf8("Stretch"sv)))); TRY(background_settings_widget->m_modes.try_append("Stretch"_string));
TRY(background_settings_widget->create_frame()); TRY(background_settings_widget->create_frame());
TRY(background_settings_widget->load_current_settings()); 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"))); auto mode = TRY(String::from_deprecated_string(ws_config->read_entry("Background", "Mode", "Center")));
if (!m_modes.contains_slow(mode)) { if (!m_modes.contains_slow(mode)) {
warnln("Invalid background mode '{}' in WindowServer config, falling back to 'Center'", 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_monitor_widget->set_wallpaper_mode(mode);
m_mode_combo->set_selected_index(m_modes.find_first_index(mode).value_or(0), GUI::AllowCallback::No); m_mode_combo->set_selected_index(m_modes.find_first_index(mode).value_or(0), GUI::AllowCallback::No);

2
Userland/Applications/FontEditor/MainWidget.cpp
View file

@ -423,7 +423,7 @@ ErrorOr<void> MainWidget::create_models()
auto unicode_blocks = Unicode::block_display_names(); auto unicode_blocks = Unicode::block_display_names();
TRY(m_unicode_block_list.try_ensure_capacity(unicode_blocks.size() + 1)); TRY(m_unicode_block_list.try_ensure_capacity(unicode_blocks.size() + 1));
m_unicode_block_list.unchecked_append(TRY(String::from_utf8("Show All"sv))); m_unicode_block_list.unchecked_append("Show All"_string);
for (auto& block : unicode_blocks) for (auto& block : unicode_blocks)
m_unicode_block_list.unchecked_append(TRY(String::from_utf8(block.display_name))); m_unicode_block_list.unchecked_append(TRY(String::from_utf8(block.display_name)));

2
Userland/Applications/PixelPaint/main.cpp
View file

@ -24,7 +24,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
auto app = TRY(GUI::Application::create(arguments)); auto app = TRY(GUI::Application::create(arguments));
Config::pledge_domain("PixelPaint"); Config::pledge_domain("PixelPaint");
app->set_config_domain(TRY(String::from_utf8("PixelPaint"sv))); app->set_config_domain("PixelPaint"_string);
StringView image_file; StringView image_file;
Core::ArgsParser args_parser; Core::ArgsParser args_parser;

8
Userland/Libraries/LibGUI/UIDimensions.h
View file

@ -156,13 +156,13 @@ public:
if (is_int()) if (is_int())
value_source = TRY(String::number(m_value)); value_source = TRY(String::number(m_value));
else if (is_shrink()) else if (is_shrink())
value_source = TRY(String::from_utf8("GUI::SpecialDimension::Shrink"sv)); value_source = "GUI::SpecialDimension::Shrink"_string;
else if (is_grow()) else if (is_grow())
value_source = TRY(String::from_utf8("GUI::SpecialDimension::Grow"sv)); value_source = "GUI::SpecialDimension::Grow"_string;
else if (is_opportunistic_grow()) else if (is_opportunistic_grow())
value_source = TRY(String::from_utf8("GUI::SpecialDimension::OpportunisticGrow"sv)); value_source = "GUI::SpecialDimension::OpportunisticGrow"_string;
else if (is_fit()) else if (is_fit())
value_source = TRY(String::from_utf8("GUI::SpecialDimension::Fit"sv)); value_source = "GUI::SpecialDimension::Fit"_string;
return String::formatted("GUI::UIDimension {{ {} }}", value_source); return String::formatted("GUI::UIDimension {{ {} }}", value_source);
} }

2
Userland/Services/DeviceMapper/DeviceEventLoop.cpp
View file

@ -87,7 +87,7 @@ ErrorOr<NonnullRefPtr<DeviceNodeFamily>> DeviceEventLoop::find_or_register_new_d
static ErrorOr<String> build_suffix_with_letters(size_t allocation_index) static ErrorOr<String> build_suffix_with_letters(size_t allocation_index)
{ {
auto base_string = TRY(String::from_utf8(""sv)); String base_string {};
while (true) { while (true) {
base_string = TRY(String::formatted("{:c}{}", 'a' + (allocation_index % 26), base_string)); base_string = TRY(String::formatted("{:c}{}", 'a' + (allocation_index % 26), base_string));
allocation_index = (allocation_index / 26); allocation_index = (allocation_index / 26);

2
Userland/Utilities/cal.cpp
View file

@ -111,7 +111,7 @@ static ErrorOr<Vector<String>> month_lines_to_print(Header header_mode, int star
int day = 1; int day = 1;
for (int i = 1; day <= days_in_month; ++i) { for (int i = 1; day <= days_in_month; ++i) {
if (i - 1 < first_day_of_week_for_month) { if (i - 1 < first_day_of_week_for_month) {
TRY(days_in_row.try_append(TRY(String::from_utf8(" "sv)))); TRY(days_in_row.try_append(" "_string));
} else { } else {
if (year == current_year && month == current_month && day == current_day) { if (year == current_year && month == current_month && day == current_day) {
TRY(days_in_row.try_append(TRY(String::formatted(ANSI_INVERT_OUTPUT "{:2}" ANSI_RESET_OUTPUT, day)))); TRY(days_in_row.try_append(TRY(String::formatted(ANSI_INVERT_OUTPUT "{:2}" ANSI_RESET_OUTPUT, day))));

4
Userland/Utilities/pkg/AvailablePort.cpp
View file

@ -155,11 +155,11 @@ ErrorOr<HashMap<String, AvailablePort>> AvailablePort::read_available_ports_list
auto name = TRY(extract_port_name_from_column(port_name_column, port_index)); auto name = TRY(extract_port_name_from_column(port_name_column, port_index));
auto website = TRY(String::from_deprecated_string(port_website_column.rows[port_index].render_for_terminal())); auto website = TRY(String::from_deprecated_string(port_website_column.rows[port_index].render_for_terminal()));
if (website.is_empty()) if (website.is_empty())
website = TRY(String::from_utf8("n/a"sv)); website = "n/a"_string;
auto version = TRY(String::from_deprecated_string(port_version_column.rows[port_index].render_for_terminal())); auto version = TRY(String::from_deprecated_string(port_version_column.rows[port_index].render_for_terminal()));
if (version.is_empty()) if (version.is_empty())
version = TRY(String::from_utf8("n/a"sv)); version = "n/a"_string;
TRY(available_ports.try_set(name, AvailablePort { name, version, website })); TRY(available_ports.try_set(name, AvailablePort { name, version, website }));
} }

2
Userland/Utilities/pkg/InstalledPort.cpp
View file

@ -26,7 +26,7 @@ ErrorOr<HashMap<String, InstalledPort>> InstalledPort::read_ports_database()
auto type = InstalledPort::Type::Dependency; auto type = InstalledPort::Type::Dependency;
// FIXME: Add versioning when printing these ports! // FIXME: Add versioning when printing these ports!
auto name = TRY(String::from_utf8(parts[2])); auto name = TRY(String::from_utf8(parts[2]));
TRY(ports.try_set(name, InstalledPort { TRY(String::from_utf8(parts[2])), type, TRY(String::from_utf8(""sv)) })); TRY(ports.try_set(name, InstalledPort { TRY(String::from_utf8(parts[2])), type, {} }));
} else if (line.starts_with("auto"sv)) { } else if (line.starts_with("auto"sv)) {
auto parts = line.split_view(' '); auto parts = line.split_view(' ');
VERIFY(parts.size() == 3); VERIFY(parts.size() == 3);