diff --git a/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateLocaleData.cpp b/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateLocaleData.cpp index fbe93fbf4d9..f3acc8bada4 100644 --- a/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateLocaleData.cpp +++ b/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateLocaleData.cpp @@ -1375,7 +1375,7 @@ static LanguageMapping const* resolve_likely_subtag(LanguageID const& language_i if (!language_id.script.has_value()) continue; - search_key.language = String::from_utf8_short_string("und"sv); + search_key.language = "und"_short_string; search_key.script = *language_id.script; break; diff --git a/Tests/AK/TestFlyString.cpp b/Tests/AK/TestFlyString.cpp index f2eb60b232d..ff0cd0d5f78 100644 --- a/Tests/AK/TestFlyString.cpp +++ b/Tests/AK/TestFlyString.cpp @@ -22,13 +22,13 @@ TEST_CASE(empty_string) TEST_CASE(short_string) { - FlyString fly1 { MUST(String::from_utf8("foo"sv)) }; + FlyString fly1 { MUST("foo"_string) }; EXPECT_EQ(fly1, "foo"sv); - FlyString fly2 { MUST(String::from_utf8("foo"sv)) }; + FlyString fly2 { MUST("foo"_string) }; EXPECT_EQ(fly2, "foo"sv); - FlyString fly3 { MUST(String::from_utf8("bar"sv)) }; + FlyString fly3 { MUST("bar"_string) }; EXPECT_EQ(fly3, "bar"sv); EXPECT_EQ(fly1, fly2); @@ -45,15 +45,15 @@ TEST_CASE(short_string) TEST_CASE(long_string) { - FlyString fly1 { MUST(String::from_utf8("thisisdefinitelymorethan7bytes"sv)) }; + FlyString fly1 { MUST("thisisdefinitelymorethan7bytes"_string) }; EXPECT_EQ(fly1, "thisisdefinitelymorethan7bytes"sv); EXPECT_EQ(FlyString::number_of_fly_strings(), 1u); - FlyString fly2 { MUST(String::from_utf8("thisisdefinitelymorethan7bytes"sv)) }; + FlyString fly2 { MUST("thisisdefinitelymorethan7bytes"_string) }; EXPECT_EQ(fly2, "thisisdefinitelymorethan7bytes"sv); EXPECT_EQ(FlyString::number_of_fly_strings(), 1u); - FlyString fly3 { MUST(String::from_utf8("thisisalsoforsuremorethan7bytes"sv)) }; + FlyString fly3 { MUST("thisisalsoforsuremorethan7bytes"_string) }; EXPECT_EQ(fly3, "thisisalsoforsuremorethan7bytes"sv); EXPECT_EQ(FlyString::number_of_fly_strings(), 2u); @@ -68,15 +68,15 @@ TEST_CASE(long_string) TEST_CASE(from_string_view) { - auto fly1 = MUST(FlyString::from_utf8("thisisdefinitelymorethan7bytes"sv)); + auto fly1 = MUST("thisisdefinitelymorethan7bytes"_fly_string); EXPECT_EQ(fly1, "thisisdefinitelymorethan7bytes"sv); EXPECT_EQ(FlyString::number_of_fly_strings(), 1u); - auto fly2 = MUST(FlyString::from_utf8("thisisdefinitelymorethan7bytes"sv)); + auto fly2 = MUST("thisisdefinitelymorethan7bytes"_fly_string); EXPECT_EQ(fly2, "thisisdefinitelymorethan7bytes"sv); EXPECT_EQ(FlyString::number_of_fly_strings(), 1u); - auto fly3 = MUST(FlyString::from_utf8("foo"sv)); + auto fly3 = MUST("foo"_fly_string); EXPECT_EQ(fly3, "foo"sv); EXPECT_EQ(FlyString::number_of_fly_strings(), 1u); @@ -91,7 +91,7 @@ TEST_CASE(fly_string_keep_string_data_alive) { FlyString fly {}; { - auto string = MUST(String::from_utf8("thisisdefinitelymorethan7bytes"sv)); + auto string = MUST("thisisdefinitelymorethan7bytes"_string); fly = FlyString { string }; EXPECT_EQ(FlyString::number_of_fly_strings(), 1u); } @@ -108,7 +108,7 @@ TEST_CASE(moved_fly_string_becomes_empty) FlyString fly1 {}; EXPECT(fly1.is_empty()); - FlyString fly2 { MUST(String::from_utf8("thisisdefinitelymorethan7bytes"sv)) }; + FlyString fly2 { MUST("thisisdefinitelymorethan7bytes"_string) }; EXPECT_EQ(fly2, "thisisdefinitelymorethan7bytes"sv); EXPECT_EQ(FlyString::number_of_fly_strings(), 1u); diff --git a/Tests/AK/TestHashMap.cpp b/Tests/AK/TestHashMap.cpp index 6e70540a9fd..3ca4dbe71bb 100644 --- a/Tests/AK/TestHashMap.cpp +++ b/Tests/AK/TestHashMap.cpp @@ -227,11 +227,11 @@ TEST_CASE(take) EXPECT(!map.take("foo"sv).has_value()); EXPECT(!map.take("bar"sv).has_value()); - EXPECT(!map.take(String::from_utf8_short_string("baz"sv)).has_value()); + EXPECT(!map.take("baz"_short_string).has_value()); - map.set(String::from_utf8_short_string("foo"sv), 1); - map.set(String::from_utf8_short_string("bar"sv), 2); - map.set(String::from_utf8_short_string("baz"sv), 3); + map.set("foo"_short_string, 1); + map.set("bar"_short_string, 2); + map.set("baz"_short_string, 3); auto foo = map.take("foo"sv); EXPECT_EQ(foo, 1); @@ -245,9 +245,9 @@ TEST_CASE(take) bar = map.take("bar"sv); EXPECT(!bar.has_value()); - auto baz = map.take(String::from_utf8_short_string("baz"sv)); + auto baz = map.take("baz"_short_string); EXPECT_EQ(baz, 3); - baz = map.take(String::from_utf8_short_string("baz"sv)); + baz = map.take("baz"_short_string); EXPECT(!baz.has_value()); } diff --git a/Tests/AK/TestString.cpp b/Tests/AK/TestString.cpp index 59668da04f4..f992fa1bc0b 100644 --- a/Tests/AK/TestString.cpp +++ b/Tests/AK/TestString.cpp @@ -21,17 +21,21 @@ TEST_CASE(construct_empty) String empty; EXPECT(empty.is_empty()); EXPECT_EQ(empty.bytes().size(), 0u); + EXPECT_EQ(empty, ""sv); - auto empty2 = MUST(String::from_utf8(""sv)); + auto empty2 = MUST(""_string); EXPECT(empty2.is_empty()); EXPECT_EQ(empty, empty2); - EXPECT_EQ(empty, ""sv); + + auto empty3 = MUST(String::from_utf8(""sv)); + EXPECT(empty3.is_empty()); + EXPECT_EQ(empty, empty3); } TEST_CASE(move_assignment) { - String string1 = MUST(String::from_utf8("hello"sv)); - string1 = MUST(String::from_utf8("friends!"sv)); + String string1 = MUST("hello"_string); + string1 = MUST("friends!"_string); EXPECT_EQ(string1, "friends!"sv); } @@ -47,6 +51,16 @@ TEST_CASE(short_strings) EXPECT_EQ(string2.is_short_string(), true); EXPECT_EQ(string2.bytes().size(), 7u); EXPECT_EQ(string2, string1); + + auto string3 = MUST("abcdefg"_string); + EXPECT_EQ(string3.is_short_string(), true); + EXPECT_EQ(string3.bytes().size(), 7u); + EXPECT_EQ(string3, string1); + + constexpr auto string4 = "abcdefg"_short_string; + EXPECT_EQ(string4.is_short_string(), true); + EXPECT_EQ(string4.bytes().size(), 7u); + EXPECT_EQ(string4, string1); #else auto string1 = MUST(String::from_utf8("abc"sv)); EXPECT_EQ(string1.is_short_string(), true); @@ -57,6 +71,16 @@ TEST_CASE(short_strings) EXPECT_EQ(string2.is_short_string(), true); EXPECT_EQ(string2.bytes().size(), 3u); EXPECT_EQ(string2, string1); + + auto string3 = MUST("abc"_string); + EXPECT_EQ(string3.is_short_string(), true); + EXPECT_EQ(string3.bytes().size(), 3u); + EXPECT_EQ(string3, string1); + + constexpr auto string4 = "abc"_short_string; + EXPECT_EQ(string4.is_short_string(), true); + EXPECT_EQ(string4.bytes().size(), 3u); + EXPECT_EQ(string4, string1); #endif } @@ -138,7 +162,7 @@ TEST_CASE(from_code_points) TEST_CASE(substring) { - auto superstring = MUST(String::from_utf8("Hello I am a long string"sv)); + auto superstring = MUST("Hello I am a long string"_string); auto short_substring = MUST(superstring.substring_from_byte_offset(0, 5)); EXPECT_EQ(short_substring, "Hello"sv); @@ -148,7 +172,7 @@ TEST_CASE(substring) TEST_CASE(substring_with_shared_superstring) { - auto superstring = MUST(String::from_utf8("Hello I am a long string"sv)); + auto superstring = MUST("Hello I am a long string"_string); auto substring1 = MUST(superstring.substring_from_byte_offset_with_shared_superstring(0, 5)); EXPECT_EQ(substring1, "Hello"sv); @@ -159,7 +183,7 @@ TEST_CASE(substring_with_shared_superstring) TEST_CASE(code_points) { - auto string = MUST(String::from_utf8("🦬🪒"sv)); + auto string = MUST("🦬🪒"_string); Vector code_points; for (auto code_point : string.code_points()) @@ -182,20 +206,20 @@ TEST_CASE(string_builder) TEST_CASE(ak_format) { - auto foo = MUST(String::formatted("Hello {}", MUST(String::from_utf8("friends"sv)))); + auto foo = MUST(String::formatted("Hello {}", MUST("friends"_string))); EXPECT_EQ(foo, "Hello friends"sv); } TEST_CASE(replace) { { - auto haystack = MUST(String::from_utf8("Hello enemies"sv)); + auto haystack = MUST("Hello enemies"_string); auto result = MUST(haystack.replace("enemies"sv, "friends"sv, ReplaceMode::All)); EXPECT_EQ(result, "Hello friends"sv); } { - auto base_title = MUST(String::from_utf8("anon@courage:~"sv)); + auto base_title = MUST("anon@courage:~"_string); auto result = MUST(base_title.replace("[*]"sv, "(*)"sv, ReplaceMode::FirstOnly)); EXPECT_EQ(result, "anon@courage:~"sv); } @@ -221,17 +245,17 @@ TEST_CASE(reverse) TEST_CASE(to_lowercase) { { - auto string = MUST(String::from_utf8("Aa"sv)); + auto string = MUST("Aa"_string); auto result = MUST(string.to_lowercase()); EXPECT_EQ(result, "aa"sv); } { - auto string = MUST(String::from_utf8("Ωω"sv)); + auto string = MUST("Ωω"_string); auto result = MUST(string.to_lowercase()); EXPECT_EQ(result, "ωω"sv); } { - auto string = MUST(String::from_utf8("İi̇"sv)); + auto string = MUST("İi̇"_string); auto result = MUST(string.to_lowercase()); EXPECT_EQ(result, "i̇i̇"sv); } @@ -240,17 +264,17 @@ TEST_CASE(to_lowercase) TEST_CASE(to_uppercase) { { - auto string = MUST(String::from_utf8("Aa"sv)); + auto string = MUST("Aa"_string); auto result = MUST(string.to_uppercase()); EXPECT_EQ(result, "AA"sv); } { - auto string = MUST(String::from_utf8("Ωω"sv)); + auto string = MUST("Ωω"_string); auto result = MUST(string.to_uppercase()); EXPECT_EQ(result, "ΩΩ"sv); } { - auto string = MUST(String::from_utf8("ʼn"sv)); + auto string = MUST("ʼn"_string); auto result = MUST(string.to_uppercase()); EXPECT_EQ(result, "ʼN"sv); } @@ -259,22 +283,22 @@ TEST_CASE(to_uppercase) TEST_CASE(to_titlecase) { { - auto string = MUST(String::from_utf8("foo bar baz"sv)); + auto string = MUST("foo bar baz"_string); auto result = MUST(string.to_titlecase()); EXPECT_EQ(result, "Foo Bar Baz"sv); } { - auto string = MUST(String::from_utf8("foo \n \r bar \t baz"sv)); + auto string = MUST("foo \n \r bar \t baz"_string); auto result = MUST(string.to_titlecase()); EXPECT_EQ(result, "Foo \n \r Bar \t Baz"sv); } { - auto string = MUST(String::from_utf8("f\"oo\" b'ar'"sv)); + auto string = MUST("f\"oo\" b'ar'"_string); auto result = MUST(string.to_titlecase()); EXPECT_EQ(result, "F\"Oo\" B'ar'"sv); } { - auto string = MUST(String::from_utf8("123dollars"sv)); + auto string = MUST("123dollars"_string); auto result = MUST(string.to_titlecase()); EXPECT_EQ(result, "123Dollars"sv); } @@ -289,10 +313,10 @@ TEST_CASE(equals_ignoring_case) EXPECT(MUST(string1.equals_ignoring_case(string2))); } { - auto string1 = MUST(String::from_utf8("abcd"sv)); - auto string2 = MUST(String::from_utf8("ABCD"sv)); - auto string3 = MUST(String::from_utf8("AbCd"sv)); - auto string4 = MUST(String::from_utf8("dcba"sv)); + auto string1 = MUST("abcd"_string); + auto string2 = MUST("ABCD"_string); + auto string3 = MUST("AbCd"_string); + auto string4 = MUST("dcba"_string); EXPECT(MUST(string1.equals_ignoring_case(string2))); EXPECT(MUST(string1.equals_ignoring_case(string3))); @@ -307,12 +331,12 @@ TEST_CASE(equals_ignoring_case) EXPECT(!MUST(string3.equals_ignoring_case(string4))); } { - auto string1 = MUST(String::from_utf8("\u00DF"sv)); // LATIN SMALL LETTER SHARP S - auto string2 = MUST(String::from_utf8("SS"sv)); - auto string3 = MUST(String::from_utf8("Ss"sv)); - auto string4 = MUST(String::from_utf8("ss"sv)); - auto string5 = MUST(String::from_utf8("S"sv)); - auto string6 = MUST(String::from_utf8("s"sv)); + auto string1 = MUST("\u00DF"_string); // LATIN SMALL LETTER SHARP S + auto string2 = MUST("SS"_string); + auto string3 = MUST("Ss"_string); + auto string4 = MUST("ss"_string); + auto string5 = MUST("S"_string); + auto string6 = MUST("s"_string); EXPECT(MUST(string1.equals_ignoring_case(string2))); EXPECT(MUST(string1.equals_ignoring_case(string3))); @@ -342,8 +366,8 @@ TEST_CASE(equals_ignoring_case) TEST_CASE(is_one_of) { - auto foo = MUST(String::from_utf8("foo"sv)); - auto bar = MUST(String::from_utf8("bar"sv)); + auto foo = MUST("foo"_string); + auto bar = MUST("bar"_string); EXPECT(foo.is_one_of(foo)); EXPECT(foo.is_one_of(foo, bar)); @@ -359,7 +383,7 @@ TEST_CASE(is_one_of) TEST_CASE(split) { { - auto test = MUST(String::from_utf8("foo bar baz"sv)); + auto test = MUST("foo bar baz"_string); auto parts = MUST(test.split(' ')); EXPECT_EQ(parts.size(), 3u); EXPECT_EQ(parts[0], "foo"); @@ -367,7 +391,7 @@ TEST_CASE(split) EXPECT_EQ(parts[2], "baz"); } { - auto test = MUST(String::from_utf8("ωΣ2ωΣω"sv)); + auto test = MUST("ωΣ2ωΣω"_string); auto parts = MUST(test.split(0x03A3u)); EXPECT_EQ(parts.size(), 3u); EXPECT_EQ(parts[0], "ω"sv); @@ -387,7 +411,7 @@ TEST_CASE(find_byte_offset) EXPECT(!index2.has_value()); } { - auto string = MUST(String::from_utf8("foo"sv)); + auto string = MUST("foo"_string); auto index1 = string.find_byte_offset('f'); EXPECT_EQ(index1, 0u); @@ -402,7 +426,7 @@ TEST_CASE(find_byte_offset) EXPECT(!index4.has_value()); } { - auto string = MUST(String::from_utf8("foo"sv)); + auto string = MUST("foo"_string); auto index1 = string.find_byte_offset("fo"sv); EXPECT_EQ(index1, 0u); @@ -417,7 +441,7 @@ TEST_CASE(find_byte_offset) EXPECT(!index4.has_value()); } { - auto string = MUST(String::from_utf8("ωΣωΣω"sv)); + auto string = MUST("ωΣωΣω"_string); auto index1 = string.find_byte_offset(0x03C9U); EXPECT_EQ(index1, 0u); @@ -435,7 +459,7 @@ TEST_CASE(find_byte_offset) EXPECT_EQ(index5, 8u); } { - auto string = MUST(String::from_utf8("ωΣωΣω"sv)); + auto string = MUST("ωΣωΣω"_string); auto index1 = string.find_byte_offset("ω"sv); EXPECT_EQ(index1, 0u); @@ -549,7 +573,7 @@ TEST_CASE(join) auto string5 = MUST(String::join(',', Array { 1, 2, 3 }, "[{}]"sv)); EXPECT_EQ(string5, "[1],[2],[3]"sv); - auto string6 = MUST(String::join(String::from_utf8_short_string("!!!"sv), Array { "foo"sv, "bar"sv, "baz"sv })); + auto string6 = MUST(String::join("!!!"_short_string, Array { "foo"sv, "bar"sv, "baz"sv })); EXPECT_EQ(string6, "foo!!!bar!!!baz"sv); auto string7 = MUST(String::join(" - "sv, Array { 1, 16, 256, 4096 }, "[{:#04x}]"sv)); @@ -571,7 +595,7 @@ TEST_CASE(trim) EXPECT(result.is_empty()); } { - auto string = MUST(String::from_utf8("word"sv)); + auto string = MUST("word"_string); auto result = MUST(string.trim(" "sv, TrimMode::Both)); EXPECT_EQ(result, "word"sv); @@ -583,7 +607,7 @@ TEST_CASE(trim) EXPECT_EQ(result, "word"sv); } { - auto string = MUST(String::from_utf8(" word"sv)); + auto string = MUST(" word"_string); auto result = MUST(string.trim(" "sv, TrimMode::Both)); EXPECT_EQ(result, "word"sv); @@ -595,7 +619,7 @@ TEST_CASE(trim) EXPECT_EQ(result, " word"sv); } { - auto string = MUST(String::from_utf8("word "sv)); + auto string = MUST("word "_string); auto result = MUST(string.trim(" "sv, TrimMode::Both)); EXPECT_EQ(result, "word"sv); @@ -607,7 +631,7 @@ TEST_CASE(trim) EXPECT_EQ(result, "word"sv); } { - auto string = MUST(String::from_utf8(" word "sv)); + auto string = MUST(" word "_string); auto result = MUST(string.trim(" "sv, TrimMode::Both)); EXPECT_EQ(result, "word"sv); @@ -619,7 +643,7 @@ TEST_CASE(trim) EXPECT_EQ(result, " word"sv); } { - auto string = MUST(String::from_utf8(" word "sv)); + auto string = MUST(" word "_string); auto result = MUST(string.trim("\t"sv, TrimMode::Both)); EXPECT_EQ(result, " word "sv); @@ -631,7 +655,7 @@ TEST_CASE(trim) EXPECT_EQ(result, " word "sv); } { - auto string = MUST(String::from_utf8("ωΣωΣω"sv)); + auto string = MUST("ωΣωΣω"_string); auto result = MUST(string.trim("ω"sv, TrimMode::Both)); EXPECT_EQ(result, "ΣωΣ"sv); @@ -643,7 +667,7 @@ TEST_CASE(trim) EXPECT_EQ(result, "ωΣωΣ"sv); } { - auto string = MUST(String::from_utf8("ωΣωΣω"sv)); + auto string = MUST("ωΣωΣω"_string); auto result = MUST(string.trim("ωΣ"sv, TrimMode::Both)); EXPECT(result.is_empty()); @@ -655,7 +679,7 @@ TEST_CASE(trim) EXPECT(result.is_empty()); } { - auto string = MUST(String::from_utf8("ωΣωΣω"sv)); + auto string = MUST("ωΣωΣω"_string); auto result = MUST(string.trim("Σω"sv, TrimMode::Both)); EXPECT(result.is_empty()); diff --git a/Tests/AK/TestUtf16.cpp b/Tests/AK/TestUtf16.cpp index ada7196bc2f..302e5357e2f 100644 --- a/Tests/AK/TestUtf16.cpp +++ b/Tests/AK/TestUtf16.cpp @@ -53,7 +53,7 @@ TEST_CASE(decode_utf8) TEST_CASE(encode_utf8) { { - auto utf8_string = MUST(String::from_utf8("Привет, мир! 😀 γειά σου κόσμος こんにちは世界"sv)); + auto utf8_string = MUST("Привет, мир! 😀 γειά σου κόσμος こんにちは世界"_string); auto string = MUST(AK::utf8_to_utf16(utf8_string)); Utf16View view { string }; EXPECT_EQ(MUST(view.to_utf8(Utf16View::AllowInvalidCodeUnits::Yes)), utf8_string); diff --git a/Userland/Applets/Audio/main.cpp b/Userland/Applets/Audio/main.cpp index 6f4d1c81c85..149a8cc29f1 100644 --- a/Userland/Applets/Audio/main.cpp +++ b/Userland/Applets/Audio/main.cpp @@ -85,7 +85,7 @@ private: m_root_container->set_layout(4, 0); m_root_container->set_frame_shape(Gfx::FrameShape::Window); - m_percent_box = m_root_container->add(String::from_utf8_short_string("\xE2\x84\xB9"sv)); + m_percent_box = m_root_container->add("\xE2\x84\xB9"_short_string); m_percent_box->set_tooltip(m_show_percent ? "Hide percent" : "Show percent"); m_percent_box->set_checked(m_show_percent); m_percent_box->on_checked = [&](bool show_percent) { @@ -110,7 +110,7 @@ private: update(); }; - m_mute_box = m_root_container->add(String::from_utf8_short_string("\xE2\x9D\x8C"sv)); + m_mute_box = m_root_container->add("\xE2\x9D\x8C"_short_string); m_mute_box->set_checked(m_audio_muted); m_mute_box->set_tooltip(m_audio_muted ? "Unmute" : "Mute"); m_mute_box->on_checked = [&](bool is_muted) { diff --git a/Userland/Applications/Browser/DownloadWidget.cpp b/Userland/Applications/Browser/DownloadWidget.cpp index 5155b9e596e..ac6cfa313fd 100644 --- a/Userland/Applications/Browser/DownloadWidget.cpp +++ b/Userland/Applications/Browser/DownloadWidget.cpp @@ -84,7 +84,7 @@ DownloadWidget::DownloadWidget(const URL& url) destination_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); destination_label.set_fixed_height(16); - m_close_on_finish_checkbox = add(String::from_utf8("Close when finished"sv).release_value_but_fixme_should_propagate_errors()); + m_close_on_finish_checkbox = add("Close when finished"_string.release_value_but_fixme_should_propagate_errors()); m_close_on_finish_checkbox->set_checked(close_on_finish); m_close_on_finish_checkbox->on_checked = [&](bool checked) { @@ -94,7 +94,7 @@ DownloadWidget::DownloadWidget(const URL& url) auto& button_container = add(); button_container.set_layout(); button_container.add_spacer().release_value_but_fixme_should_propagate_errors(); - m_cancel_button = button_container.add(String::from_utf8_short_string("Cancel"sv)); + m_cancel_button = button_container.add("Cancel"_short_string); m_cancel_button->set_fixed_size(100, 22); m_cancel_button->on_click = [this](auto) { bool success = m_download->stop(); @@ -102,7 +102,7 @@ DownloadWidget::DownloadWidget(const URL& url) window()->close(); }; - m_close_button = button_container.add(String::from_utf8_short_string("OK"sv)); + m_close_button = button_container.add("OK"_short_string); m_close_button->set_enabled(false); m_close_button->set_fixed_size(100, 22); m_close_button->on_click = [this](auto) { @@ -151,7 +151,7 @@ void DownloadWidget::did_finish(bool success) m_browser_image->load_from_file("/res/graphics/download-finished.gif"sv); window()->set_title("Download finished!"); m_close_button->set_enabled(true); - m_cancel_button->set_text(String::from_utf8("Open in Folder"sv).release_value_but_fixme_should_propagate_errors()); + m_cancel_button->set_text("Open in Folder"_string.release_value_but_fixme_should_propagate_errors()); m_cancel_button->on_click = [this](auto) { Desktop::Launcher::open(URL::create_with_file_scheme(Core::StandardPaths::downloads_directory(), m_url.basename())); window()->close(); diff --git a/Userland/Applications/Calculator/RoundingDialog.cpp b/Userland/Applications/Calculator/RoundingDialog.cpp index 759c17c5e24..9f9e49e709c 100644 --- a/Userland/Applications/Calculator/RoundingDialog.cpp +++ b/Userland/Applications/Calculator/RoundingDialog.cpp @@ -46,8 +46,8 @@ RoundingDialog::RoundingDialog(GUI::Window* parent_window, StringView title) m_rounding_spinbox = GUI::SpinBox::construct(); m_buttons_container = GUI::Widget::construct(); - m_ok_button = GUI::DialogButton::construct(String::from_utf8_short_string("OK"sv)); - m_cancel_button = GUI::DialogButton::construct(String::from_utf8_short_string("Cancel"sv)); + m_ok_button = GUI::DialogButton::construct("OK"_short_string); + m_cancel_button = GUI::DialogButton::construct("Cancel"_short_string); main_widget->add_child(*m_rounding_spinbox); main_widget->add_child(*m_buttons_container); diff --git a/Userland/Applications/Calendar/AddEventDialog.cpp b/Userland/Applications/Calendar/AddEventDialog.cpp index 2e02f940987..3be8ec5aa7c 100644 --- a/Userland/Applications/Calendar/AddEventDialog.cpp +++ b/Userland/Applications/Calendar/AddEventDialog.cpp @@ -90,7 +90,7 @@ AddEventDialog::AddEventDialog(Core::DateTime date_time, Window* parent_window) button_container.set_fixed_height(20); button_container.set_layout(); button_container.add_spacer().release_value_but_fixme_should_propagate_errors(); - auto& ok_button = button_container.add(String::from_utf8_short_string("OK"sv)); + auto& ok_button = button_container.add("OK"_short_string); ok_button.set_fixed_size(80, 20); ok_button.on_click = [this](auto) { dbgln("TODO: Add event icon on specific tile"); diff --git a/Userland/Applications/FileManager/PropertiesWindow.cpp b/Userland/Applications/FileManager/PropertiesWindow.cpp index f268ddd6907..b9a8a73b343 100644 --- a/Userland/Applications/FileManager/PropertiesWindow.cpp +++ b/Userland/Applications/FileManager/PropertiesWindow.cpp @@ -154,17 +154,17 @@ ErrorOr PropertiesWindow::create_widgets(bool disable_rename) TRY(button_widget->add_spacer()); - auto ok_button = TRY(make_button(String::from_utf8_short_string("OK"sv), button_widget)); + auto ok_button = TRY(make_button("OK"_short_string, button_widget)); ok_button->on_click = [this](auto) { if (apply_changes()) close(); }; - auto cancel_button = TRY(make_button(String::from_utf8_short_string("Cancel"sv), button_widget)); + auto cancel_button = TRY(make_button("Cancel"_short_string, button_widget)); cancel_button->on_click = [this](auto) { close(); }; - m_apply_button = TRY(make_button(String::from_utf8_short_string("Apply"sv), button_widget)); + m_apply_button = TRY(make_button("Apply"_short_string, button_widget)); m_apply_button->on_click = [this](auto) { apply_changes(); }; m_apply_button->set_enabled(false); diff --git a/Userland/Applications/Help/MainWidget.cpp b/Userland/Applications/Help/MainWidget.cpp index be58ec69f1c..9478604a9e7 100644 --- a/Userland/Applications/Help/MainWidget.cpp +++ b/Userland/Applications/Help/MainWidget.cpp @@ -213,7 +213,7 @@ ErrorOr MainWidget::initialize_fallibles(GUI::Window& window) TRY(go_menu->try_add_action(*m_go_home_action)); auto help_menu = TRY(window.try_add_menu("&Help")); - String help_page_path = TRY(TRY(try_make_ref_counted(Manual::sections[1 - 1], TRY(String::from_utf8("Help"sv))))->path()); + String help_page_path = TRY(TRY(try_make_ref_counted(Manual::sections[1 - 1], TRY("Help"_string)))->path()); TRY(help_menu->try_add_action(GUI::CommonActions::make_command_palette_action(&window))); TRY(help_menu->try_add_action(GUI::Action::create("&Contents", { Key_F1 }, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/filetype-unknown.png"sv)), [this, help_page_path = move(help_page_path)](auto&) { open_page(help_page_path); diff --git a/Userland/Applications/KeyboardMapper/KeyboardMapperWidget.cpp b/Userland/Applications/KeyboardMapper/KeyboardMapperWidget.cpp index 738e102d3ed..438212deb60 100644 --- a/Userland/Applications/KeyboardMapper/KeyboardMapperWidget.cpp +++ b/Userland/Applications/KeyboardMapper/KeyboardMapperWidget.cpp @@ -88,11 +88,11 @@ void KeyboardMapperWidget::create_frame() m_map_group->set_layout(); m_map_group->set_fixed_width(450); - add_map_radio_button("map"sv, String::from_utf8_short_string("Default"sv)); - add_map_radio_button("shift_map"sv, String::from_utf8_short_string("Shift"sv)); - add_map_radio_button("altgr_map"sv, String::from_utf8_short_string("AltGr"sv)); - add_map_radio_button("alt_map"sv, String::from_utf8_short_string("Alt"sv)); - add_map_radio_button("shift_altgr_map"sv, String::from_utf8("Shift+AltGr"sv).release_value_but_fixme_should_propagate_errors()); + add_map_radio_button("map"sv, "Default"_short_string); + add_map_radio_button("shift_map"sv, "Shift"_short_string); + add_map_radio_button("altgr_map"sv, "AltGr"_short_string); + add_map_radio_button("alt_map"sv, "Alt"_short_string); + add_map_radio_button("shift_altgr_map"sv, "Shift+AltGr"_string.release_value_but_fixme_should_propagate_errors()); bottom_widget.add_spacer().release_value_but_fixme_should_propagate_errors(); } diff --git a/Userland/Applications/PDFViewer/PDFViewerWidget.cpp b/Userland/Applications/PDFViewer/PDFViewerWidget.cpp index 3d0210dee41..d2ebec6cd47 100644 --- a/Userland/Applications/PDFViewer/PDFViewerWidget.cpp +++ b/Userland/Applications/PDFViewer/PDFViewerWidget.cpp @@ -339,11 +339,11 @@ void PDFViewerWidget::initialize_toolbar(GUI::Toolbar& toolbar) toolbar.add_separator(); m_show_clipping_paths = toolbar.add(); - m_show_clipping_paths->set_text(String::from_utf8("Show clipping paths"sv).release_value_but_fixme_should_propagate_errors()); + m_show_clipping_paths->set_text("Show clipping paths"_string.release_value_but_fixme_should_propagate_errors()); m_show_clipping_paths->set_checked(m_viewer->show_clipping_paths(), GUI::AllowCallback::No); m_show_clipping_paths->on_checked = [&](auto checked) { m_viewer->set_show_clipping_paths(checked); }; m_show_images = toolbar.add(); - m_show_images->set_text(String::from_utf8("Show images"sv).release_value_but_fixme_should_propagate_errors()); + m_show_images->set_text("Show images"_string.release_value_but_fixme_should_propagate_errors()); m_show_images->set_checked(m_viewer->show_images(), GUI::AllowCallback::No); m_show_images->on_checked = [&](auto checked) { m_viewer->set_show_images(checked); }; } diff --git a/Userland/Applications/PixelPaint/CreateNewImageDialog.cpp b/Userland/Applications/PixelPaint/CreateNewImageDialog.cpp index dec5c81ed93..f837a5e0cff 100644 --- a/Userland/Applications/PixelPaint/CreateNewImageDialog.cpp +++ b/Userland/Applications/PixelPaint/CreateNewImageDialog.cpp @@ -110,12 +110,12 @@ CreateNewImageDialog::CreateNewImageDialog(GUI::Window* parent_window) }; auto& set_defaults_checkbox = main_widget->add(); - set_defaults_checkbox.set_text(String::from_utf8("Use these settings as default"sv).release_value_but_fixme_should_propagate_errors()); + set_defaults_checkbox.set_text("Use these settings as default"_string.release_value_but_fixme_should_propagate_errors()); auto& button_container = main_widget->add(); button_container.set_layout(); - auto& ok_button = button_container.add(String::from_utf8_short_string("OK"sv)); + auto& ok_button = button_container.add("OK"_short_string); ok_button.on_click = [&](auto) { if (set_defaults_checkbox.is_checked()) { Config::write_string("PixelPaint"sv, "NewImage"sv, "Name"sv, m_image_name); @@ -128,7 +128,7 @@ CreateNewImageDialog::CreateNewImageDialog(GUI::Window* parent_window) }; ok_button.set_default(true); - auto& cancel_button = button_container.add(String::from_utf8_short_string("Cancel"sv)); + auto& cancel_button = button_container.add("Cancel"_short_string); cancel_button.on_click = [this](auto) { done(ExecResult::Cancel); }; diff --git a/Userland/Applications/PixelPaint/CreateNewLayerDialog.cpp b/Userland/Applications/PixelPaint/CreateNewLayerDialog.cpp index b18123887f7..a39da30d045 100644 --- a/Userland/Applications/PixelPaint/CreateNewLayerDialog.cpp +++ b/Userland/Applications/PixelPaint/CreateNewLayerDialog.cpp @@ -47,13 +47,13 @@ CreateNewLayerDialog::CreateNewLayerDialog(Gfx::IntSize suggested_size, GUI::Win auto& button_container = main_widget->add(); button_container.set_layout(); - auto& ok_button = button_container.add(String::from_utf8_short_string("OK"sv)); + auto& ok_button = button_container.add("OK"_short_string); ok_button.on_click = [this](auto) { done(ExecResult::OK); }; ok_button.set_default(true); - auto& cancel_button = button_container.add(String::from_utf8_short_string("Cancel"sv)); + auto& cancel_button = button_container.add("Cancel"_short_string); cancel_button.on_click = [this](auto) { done(ExecResult::Cancel); }; diff --git a/Userland/Applications/PixelPaint/FilterParams.h b/Userland/Applications/PixelPaint/FilterParams.h index e8d0d02b948..1e8df1918ee 100644 --- a/Userland/Applications/PixelPaint/FilterParams.h +++ b/Userland/Applications/PixelPaint/FilterParams.h @@ -80,13 +80,13 @@ private: } } - auto& norm_checkbox = main_widget->template add(String::from_utf8("Normalize"sv).release_value_but_fixme_should_propagate_errors()); + auto& norm_checkbox = main_widget->template add("Normalize"_string.release_value_but_fixme_should_propagate_errors()); norm_checkbox.set_checked(false); - auto& wrap_checkbox = main_widget->template add(String::from_utf8_short_string("Wrap"sv)); + auto& wrap_checkbox = main_widget->template add("Wrap"_short_string); wrap_checkbox.set_checked(m_should_wrap); - auto& button = main_widget->template add(String::from_utf8_short_string("Done"sv)); + auto& button = main_widget->template add("Done"_short_string); button.on_click = [&](auto) { m_should_wrap = wrap_checkbox.is_checked(); if (norm_checkbox.is_checked()) diff --git a/Userland/Applications/PixelPaint/Filters/Bloom.cpp b/Userland/Applications/PixelPaint/Filters/Bloom.cpp index 6ebad51bce8..aa51a7080f4 100644 --- a/Userland/Applications/PixelPaint/Filters/Bloom.cpp +++ b/Userland/Applications/PixelPaint/Filters/Bloom.cpp @@ -69,7 +69,7 @@ ErrorOr> Bloom::get_settings_widget() radius_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); radius_label->set_fixed_height(20); - auto radius_slider = TRY(radius_container->try_add(Orientation::Horizontal, String::from_utf8_short_string("px"sv))); + auto radius_slider = TRY(radius_container->try_add(Orientation::Horizontal, "px"_short_string)); radius_slider->set_range(0, 50); radius_slider->set_value(m_blur_radius); radius_slider->on_change = [&](int value) { diff --git a/Userland/Applications/PixelPaint/Filters/FastBoxBlur.cpp b/Userland/Applications/PixelPaint/Filters/FastBoxBlur.cpp index 6be4e75f775..870163dbd64 100644 --- a/Userland/Applications/PixelPaint/Filters/FastBoxBlur.cpp +++ b/Userland/Applications/PixelPaint/Filters/FastBoxBlur.cpp @@ -47,7 +47,7 @@ ErrorOr> FastBoxBlur::get_settings_widget() name_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); name_label->set_fixed_height(10); - auto asymmetric_checkbox = TRY(settings_widget->try_add(TRY(String::from_utf8("Use Asymmetric Radii"sv)))); + auto asymmetric_checkbox = TRY(settings_widget->try_add(TRY("Use Asymmetric Radii"_string))); asymmetric_checkbox->set_checked(false); asymmetric_checkbox->set_fixed_height(15); asymmetric_checkbox->on_checked = [this](bool checked) { @@ -68,7 +68,7 @@ ErrorOr> FastBoxBlur::get_settings_widget() update_preview(); }; - m_vector_checkbox = TRY(settings_widget->try_add(TRY(String::from_utf8("Use Direction and magnitude"sv)))); + m_vector_checkbox = TRY(settings_widget->try_add(TRY("Use Direction and magnitude"_string))); m_vector_checkbox->set_checked(false); m_vector_checkbox->set_visible(false); m_vector_checkbox->set_fixed_height(15); @@ -92,7 +92,7 @@ ErrorOr> FastBoxBlur::get_settings_widget() radius_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); radius_label->set_fixed_size(50, 20); - auto radius_slider = TRY(m_radius_container->try_add(Orientation::Horizontal, String::from_utf8_short_string("px"sv))); + auto radius_slider = TRY(m_radius_container->try_add(Orientation::Horizontal, "px"_short_string)); radius_slider->set_range(0, 25); radius_slider->set_value(m_radius); radius_slider->on_change = [&](int value) { @@ -113,7 +113,7 @@ ErrorOr> FastBoxBlur::get_settings_widget() radius_x_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); radius_x_label->set_fixed_size(50, 20); - m_radius_x_slider = TRY(radius_x_container->try_add(Orientation::Horizontal, String::from_utf8_short_string("px"sv))); + m_radius_x_slider = TRY(radius_x_container->try_add(Orientation::Horizontal, "px"_short_string)); m_radius_x_slider->set_range(0, 50); m_radius_x_slider->set_value(m_radius_x); m_radius_x_slider->on_change = [&](int value) { @@ -129,7 +129,7 @@ ErrorOr> FastBoxBlur::get_settings_widget() radius_y_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); radius_y_label->set_fixed_size(50, 20); - m_radius_y_slider = TRY(radius_y_container->try_add(Orientation::Horizontal, String::from_utf8_short_string("px"sv))); + m_radius_y_slider = TRY(radius_y_container->try_add(Orientation::Horizontal, "px"_short_string)); m_radius_y_slider->set_range(0, 50); m_radius_y_slider->set_value(m_radius_y); m_radius_y_slider->on_change = [&](int value) { @@ -150,7 +150,7 @@ ErrorOr> FastBoxBlur::get_settings_widget() angle_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); angle_label->set_fixed_size(60, 20); - m_angle_slider = TRY(angle_container->try_add(Orientation::Horizontal, String::from_utf8_short_string("°"sv))); + m_angle_slider = TRY(angle_container->try_add(Orientation::Horizontal, "°"_short_string)); m_angle_slider->set_range(0, 360); m_angle_slider->set_value(m_angle); m_angle_slider->on_change = [&](int value) { @@ -166,7 +166,7 @@ ErrorOr> FastBoxBlur::get_settings_widget() magnitude_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); magnitude_label->set_fixed_size(60, 20); - m_magnitude_slider = TRY(magnitude_container->try_add(Orientation::Horizontal, String::from_utf8_short_string("px"sv))); + m_magnitude_slider = TRY(magnitude_container->try_add(Orientation::Horizontal, "px"_short_string)); m_magnitude_slider->set_range(0, 50); m_magnitude_slider->set_value(m_radius); m_magnitude_slider->on_change = [&](int value) { @@ -178,7 +178,7 @@ ErrorOr> FastBoxBlur::get_settings_widget() gaussian_container->set_fixed_height(20); TRY(gaussian_container->try_set_layout(GUI::Margins { 4, 0, 4, 0 })); - m_gaussian_checkbox = TRY(gaussian_container->try_add(TRY(String::from_utf8("Approximate Gaussian Blur"sv)))); + m_gaussian_checkbox = TRY(gaussian_container->try_add(TRY("Approximate Gaussian Blur"_string))); m_gaussian_checkbox->set_checked(m_approximate_gauss); m_gaussian_checkbox->set_tooltip("A real gaussian blur can be approximated by running the box blur multiple times with different weights."); m_gaussian_checkbox->on_checked = [this](bool checked) { diff --git a/Userland/Applications/PixelPaint/Filters/Sepia.cpp b/Userland/Applications/PixelPaint/Filters/Sepia.cpp index 789ebdc9f55..1755e8f96a6 100644 --- a/Userland/Applications/PixelPaint/Filters/Sepia.cpp +++ b/Userland/Applications/PixelPaint/Filters/Sepia.cpp @@ -36,7 +36,7 @@ ErrorOr> Sepia::get_settings_widget() amount_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); amount_label->set_fixed_size(50, 20); - auto amount_slider = TRY(amount_container->try_add(Orientation::Horizontal, String::from_utf8_short_string("%"sv))); + auto amount_slider = TRY(amount_container->try_add(Orientation::Horizontal, "%"_short_string)); amount_slider->set_range(0, 100); amount_slider->set_value(m_amount * 100); amount_slider->on_change = [this](int value) { diff --git a/Userland/Applications/PixelPaint/LayerPropertiesWidget.cpp b/Userland/Applications/PixelPaint/LayerPropertiesWidget.cpp index f4367735403..c9ba4f81370 100644 --- a/Userland/Applications/PixelPaint/LayerPropertiesWidget.cpp +++ b/Userland/Applications/PixelPaint/LayerPropertiesWidget.cpp @@ -56,7 +56,7 @@ LayerPropertiesWidget::LayerPropertiesWidget() m_layer->set_opacity_percent(value); }; - m_visibility_checkbox = group_box.add(String::from_utf8_short_string("Visible"sv)); + m_visibility_checkbox = group_box.add("Visible"_short_string); m_visibility_checkbox->set_fixed_height(20); m_visibility_checkbox->on_checked = [this](bool checked) { if (m_layer) diff --git a/Userland/Applications/PixelPaint/Tools/BrushTool.cpp b/Userland/Applications/PixelPaint/Tools/BrushTool.cpp index 4520ecae664..383963c14be 100644 --- a/Userland/Applications/PixelPaint/Tools/BrushTool.cpp +++ b/Userland/Applications/PixelPaint/Tools/BrushTool.cpp @@ -151,7 +151,7 @@ ErrorOr BrushTool::get_properties_widget() size_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); size_label->set_fixed_size(80, 20); - auto size_slider = TRY(size_container->try_add(Orientation::Horizontal, String::from_utf8_short_string("px"sv))); + auto size_slider = TRY(size_container->try_add(Orientation::Horizontal, "px"_short_string)); size_slider->set_range(1, 100); size_slider->set_value(m_size); size_slider->set_override_cursor(cursor()); @@ -171,7 +171,7 @@ ErrorOr BrushTool::get_properties_widget() hardness_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); hardness_label->set_fixed_size(80, 20); - auto hardness_slider = TRY(hardness_container->try_add(Orientation::Horizontal, String::from_utf8_short_string("%"sv))); + auto hardness_slider = TRY(hardness_container->try_add(Orientation::Horizontal, "%"_short_string)); hardness_slider->set_range(1, 100); hardness_slider->set_value(m_hardness); diff --git a/Userland/Applications/PixelPaint/Tools/BucketTool.cpp b/Userland/Applications/PixelPaint/Tools/BucketTool.cpp index 4fc56ce9e13..39e6a83f0c8 100644 --- a/Userland/Applications/PixelPaint/Tools/BucketTool.cpp +++ b/Userland/Applications/PixelPaint/Tools/BucketTool.cpp @@ -75,7 +75,7 @@ ErrorOr BucketTool::get_properties_widget() threshold_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); threshold_label->set_fixed_size(80, 20); - auto threshold_slider = TRY(threshold_container->try_add(Orientation::Horizontal, String::from_utf8_short_string("%"sv))); + auto threshold_slider = TRY(threshold_container->try_add(Orientation::Horizontal, "%"_short_string)); threshold_slider->set_range(0, 100); threshold_slider->set_value(m_threshold); diff --git a/Userland/Applications/PixelPaint/Tools/CloneTool.cpp b/Userland/Applications/PixelPaint/Tools/CloneTool.cpp index 6f3a6d333b0..4e64896bba3 100644 --- a/Userland/Applications/PixelPaint/Tools/CloneTool.cpp +++ b/Userland/Applications/PixelPaint/Tools/CloneTool.cpp @@ -147,7 +147,7 @@ ErrorOr CloneTool::get_properties_widget() size_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); size_label->set_fixed_size(80, 20); - auto size_slider = TRY(size_container->try_add(Orientation::Horizontal, String::from_utf8_short_string("px"sv))); + auto size_slider = TRY(size_container->try_add(Orientation::Horizontal, "px"_short_string)); size_slider->set_range(1, 100); size_slider->set_value(size()); @@ -164,7 +164,7 @@ ErrorOr CloneTool::get_properties_widget() hardness_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); hardness_label->set_fixed_size(80, 20); - auto hardness_slider = TRY(hardness_container->try_add(Orientation::Horizontal, String::from_utf8_short_string("%"sv))); + auto hardness_slider = TRY(hardness_container->try_add(Orientation::Horizontal, "%"_short_string)); hardness_slider->set_range(1, 100); hardness_slider->on_change = [&](int value) { set_hardness(value); diff --git a/Userland/Applications/PixelPaint/Tools/EllipseTool.cpp b/Userland/Applications/PixelPaint/Tools/EllipseTool.cpp index d46888b0e52..a1140171fec 100644 --- a/Userland/Applications/PixelPaint/Tools/EllipseTool.cpp +++ b/Userland/Applications/PixelPaint/Tools/EllipseTool.cpp @@ -140,7 +140,7 @@ ErrorOr EllipseTool::get_properties_widget() thickness_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); thickness_label->set_fixed_size(80, 20); - auto thickness_slider = TRY(thickness_container->try_add(Orientation::Horizontal, String::from_utf8_short_string("px"sv))); + auto thickness_slider = TRY(thickness_container->try_add(Orientation::Horizontal, "px"_short_string)); thickness_slider->set_range(1, 10); thickness_slider->set_value(m_thickness); @@ -157,9 +157,9 @@ ErrorOr EllipseTool::get_properties_widget() auto mode_radio_container = TRY(mode_container->try_add()); (void)TRY(mode_radio_container->try_set_layout()); - auto outline_mode_radio = TRY(mode_radio_container->try_add(String::from_utf8_short_string("Outline"sv))); - auto fill_mode_radio = TRY(mode_radio_container->try_add(String::from_utf8_short_string("Fill"sv))); - auto aa_enable_checkbox = TRY(mode_radio_container->try_add(TRY(String::from_utf8("Anti-alias"sv)))); + auto outline_mode_radio = TRY(mode_radio_container->try_add("Outline"_short_string)); + auto fill_mode_radio = TRY(mode_radio_container->try_add("Fill"_short_string)); + auto aa_enable_checkbox = TRY(mode_radio_container->try_add(TRY("Anti-alias"_string))); aa_enable_checkbox->on_checked = [this](bool checked) { m_antialias_enabled = checked; diff --git a/Userland/Applications/PixelPaint/Tools/EraseTool.cpp b/Userland/Applications/PixelPaint/Tools/EraseTool.cpp index e28ffc905f3..46c432f479f 100644 --- a/Userland/Applications/PixelPaint/Tools/EraseTool.cpp +++ b/Userland/Applications/PixelPaint/Tools/EraseTool.cpp @@ -67,7 +67,7 @@ ErrorOr EraseTool::get_properties_widget() size_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); size_label->set_fixed_size(80, 20); - auto size_slider = TRY(size_container->try_add(Orientation::Horizontal, String::from_utf8_short_string("px"sv))); + auto size_slider = TRY(size_container->try_add(Orientation::Horizontal, "px"_short_string)); size_slider->set_range(1, 100); size_slider->set_value(size()); @@ -85,7 +85,7 @@ ErrorOr EraseTool::get_properties_widget() hardness_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); hardness_label->set_fixed_size(80, 20); - auto hardness_slider = TRY(hardness_container->try_add(Orientation::Horizontal, String::from_utf8_short_string("%"sv))); + auto hardness_slider = TRY(hardness_container->try_add(Orientation::Horizontal, "%"_short_string)); hardness_slider->set_range(1, 100); hardness_slider->set_value(hardness()); @@ -100,7 +100,7 @@ ErrorOr EraseTool::get_properties_widget() auto use_secondary_color_checkbox = TRY(secondary_color_container->try_add()); use_secondary_color_checkbox->set_checked(m_use_secondary_color); - use_secondary_color_checkbox->set_text(TRY(String::from_utf8("Use secondary color"sv))); + use_secondary_color_checkbox->set_text(TRY("Use secondary color"_string)); use_secondary_color_checkbox->on_checked = [this](bool checked) { m_use_secondary_color = checked; }; @@ -114,8 +114,8 @@ ErrorOr EraseTool::get_properties_widget() auto mode_radio_container = TRY(mode_container->try_add()); (void)TRY(mode_radio_container->try_set_layout()); - auto pencil_mode_radio = TRY(mode_radio_container->try_add(String::from_utf8_short_string("Pencil"sv))); - auto brush_mode_radio = TRY(mode_radio_container->try_add(String::from_utf8_short_string("Brush"sv))); + auto pencil_mode_radio = TRY(mode_radio_container->try_add("Pencil"_short_string)); + auto brush_mode_radio = TRY(mode_radio_container->try_add("Brush"_short_string)); pencil_mode_radio->on_checked = [this, hardness_slider, size_slider](bool) { m_draw_mode = DrawMode::Pencil; diff --git a/Userland/Applications/PixelPaint/Tools/GradientTool.cpp b/Userland/Applications/PixelPaint/Tools/GradientTool.cpp index b8f7181ecd3..78bb405cc3c 100644 --- a/Userland/Applications/PixelPaint/Tools/GradientTool.cpp +++ b/Userland/Applications/PixelPaint/Tools/GradientTool.cpp @@ -206,7 +206,7 @@ ErrorOr GradientTool::get_properties_widget() set_primary_slider(opacity_slider); - auto use_secondary_color_checkbox = TRY(properties_widget->try_add(TRY(String::from_utf8("Use secondary color"sv)))); + auto use_secondary_color_checkbox = TRY(properties_widget->try_add(TRY("Use secondary color"_string))); use_secondary_color_checkbox->on_checked = [this](bool checked) { m_use_secondary_color = checked; m_editor->update(); @@ -217,7 +217,7 @@ ErrorOr GradientTool::get_properties_widget() TRY(button_container->try_set_layout()); button_container->add_spacer().release_value_but_fixme_should_propagate_errors(); - auto apply_button = TRY(button_container->try_add(String::from_utf8_short_string("Apply"sv))); + auto apply_button = TRY(button_container->try_add("Apply"_short_string)); apply_button->on_click = [this](auto) { rasterize_gradient(); }; diff --git a/Userland/Applications/PixelPaint/Tools/GuideTool.cpp b/Userland/Applications/PixelPaint/Tools/GuideTool.cpp index 67d3c15e237..ac1b5f1073a 100644 --- a/Userland/Applications/PixelPaint/Tools/GuideTool.cpp +++ b/Userland/Applications/PixelPaint/Tools/GuideTool.cpp @@ -191,7 +191,7 @@ ErrorOr GuideTool::get_properties_widget() snapping_label->set_fixed_size(80, 20); snapping_label->set_tooltip("Press Shift to snap"); - auto snapping_slider = TRY(snapping_container->try_add(Orientation::Horizontal, String::from_utf8_short_string("px"sv))); + auto snapping_slider = TRY(snapping_container->try_add(Orientation::Horizontal, "px"_short_string)); snapping_slider->set_range(0, 50); snapping_slider->set_value(m_snap_size); diff --git a/Userland/Applications/PixelPaint/Tools/LineTool.cpp b/Userland/Applications/PixelPaint/Tools/LineTool.cpp index 7aa170cc974..a6cfc85caae 100644 --- a/Userland/Applications/PixelPaint/Tools/LineTool.cpp +++ b/Userland/Applications/PixelPaint/Tools/LineTool.cpp @@ -133,7 +133,7 @@ ErrorOr LineTool::get_properties_widget() thickness_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); thickness_label->set_fixed_size(80, 20); - auto thickness_slider = TRY(thickness_container->try_add(Orientation::Horizontal, String::from_utf8_short_string("px"sv))); + auto thickness_slider = TRY(thickness_container->try_add(Orientation::Horizontal, "px"_short_string)); thickness_slider->set_range(1, 10); thickness_slider->set_value(m_thickness); @@ -150,7 +150,7 @@ ErrorOr LineTool::get_properties_widget() mode_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); mode_label->set_fixed_size(80, 20); - auto aa_enable_checkbox = TRY(mode_container->try_add(TRY(String::from_utf8("Anti-alias"sv)))); + auto aa_enable_checkbox = TRY(mode_container->try_add(TRY("Anti-alias"_string))); aa_enable_checkbox->on_checked = [this](bool checked) { m_antialias_enabled = checked; }; diff --git a/Userland/Applications/PixelPaint/Tools/MoveTool.cpp b/Userland/Applications/PixelPaint/Tools/MoveTool.cpp index 0dd4a902ef8..10252259bc2 100644 --- a/Userland/Applications/PixelPaint/Tools/MoveTool.cpp +++ b/Userland/Applications/PixelPaint/Tools/MoveTool.cpp @@ -304,9 +304,9 @@ ErrorOr MoveTool::get_properties_widget() auto mode_radio_container = TRY(selection_mode_container->try_add()); (void)TRY(mode_radio_container->try_set_layout()); - m_selection_mode_foreground = TRY(mode_radio_container->try_add(TRY(String::from_utf8("Foreground"sv)))); + m_selection_mode_foreground = TRY(mode_radio_container->try_add(TRY("Foreground"_string))); - m_selection_mode_active = TRY(mode_radio_container->try_add(TRY(String::from_utf8("Active Layer"sv)))); + m_selection_mode_active = TRY(mode_radio_container->try_add(TRY("Active Layer"_string))); m_selection_mode_foreground->on_checked = [this](bool) { m_layer_selection_mode = LayerSelectionMode::ForegroundLayer; diff --git a/Userland/Applications/PixelPaint/Tools/PenTool.cpp b/Userland/Applications/PixelPaint/Tools/PenTool.cpp index e6233c971b7..b72c48ef735 100644 --- a/Userland/Applications/PixelPaint/Tools/PenTool.cpp +++ b/Userland/Applications/PixelPaint/Tools/PenTool.cpp @@ -49,7 +49,7 @@ ErrorOr PenTool::get_properties_widget() size_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); size_label->set_fixed_size(80, 20); - auto size_slider = TRY(size_container->try_add(Orientation::Horizontal, String::from_utf8_short_string("px"sv))); + auto size_slider = TRY(size_container->try_add(Orientation::Horizontal, "px"_short_string)); size_slider->set_range(1, 20); size_slider->set_value(size()); diff --git a/Userland/Applications/PixelPaint/Tools/PickerTool.cpp b/Userland/Applications/PixelPaint/Tools/PickerTool.cpp index 5f951943005..ce231098a83 100644 --- a/Userland/Applications/PixelPaint/Tools/PickerTool.cpp +++ b/Userland/Applications/PixelPaint/Tools/PickerTool.cpp @@ -46,7 +46,7 @@ ErrorOr PickerTool::get_properties_widget() auto properties_widget = TRY(GUI::Widget::try_create()); (void)TRY(properties_widget->try_set_layout()); - auto sample_checkbox = TRY(properties_widget->try_add(TRY(String::from_utf8("Sample all layers"sv)))); + auto sample_checkbox = TRY(properties_widget->try_add(TRY("Sample all layers"_string))); sample_checkbox->set_checked(m_sample_all_layers); sample_checkbox->on_checked = [this](bool value) { m_sample_all_layers = value; diff --git a/Userland/Applications/PixelPaint/Tools/RectangleSelectTool.cpp b/Userland/Applications/PixelPaint/Tools/RectangleSelectTool.cpp index 0375b3b26ce..f1bfc6c269c 100644 --- a/Userland/Applications/PixelPaint/Tools/RectangleSelectTool.cpp +++ b/Userland/Applications/PixelPaint/Tools/RectangleSelectTool.cpp @@ -166,7 +166,7 @@ ErrorOr RectangleSelectTool::get_properties_widget() feather_label->set_fixed_size(80, 20); int const feather_slider_max = 100; - auto feather_slider = TRY(feather_container->try_add(Orientation::Horizontal, String::from_utf8_short_string("%"sv))); + auto feather_slider = TRY(feather_container->try_add(Orientation::Horizontal, "%"_short_string)); feather_slider->set_range(0, feather_slider_max); feather_slider->set_value((int)floorf(m_edge_feathering * (float)feather_slider_max)); diff --git a/Userland/Applications/PixelPaint/Tools/RectangleTool.cpp b/Userland/Applications/PixelPaint/Tools/RectangleTool.cpp index d41d26f0b8f..f7987dd1dd6 100644 --- a/Userland/Applications/PixelPaint/Tools/RectangleTool.cpp +++ b/Userland/Applications/PixelPaint/Tools/RectangleTool.cpp @@ -154,7 +154,7 @@ ErrorOr RectangleTool::get_properties_widget() thickness_or_radius_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); thickness_or_radius_label->set_fixed_size(80, 20); - auto thickness_or_radius_slider = TRY(thickness_or_radius_container->try_add(Orientation::Horizontal, String::from_utf8_short_string("px"sv))); + auto thickness_or_radius_slider = TRY(thickness_or_radius_container->try_add(Orientation::Horizontal, "px"_short_string)); thickness_or_radius_slider->on_change = [&](int value) { if (m_fill_mode == FillMode::RoundedCorners) { @@ -187,12 +187,12 @@ ErrorOr RectangleTool::get_properties_widget() auto mode_radio_container = TRY(mode_container->try_add()); (void)TRY(mode_radio_container->try_set_layout()); - auto outline_mode_radio = TRY(mode_radio_container->try_add(String::from_utf8_short_string("Outline"sv))); - auto fill_mode_radio = TRY(mode_radio_container->try_add(String::from_utf8_short_string("Fill"sv))); - auto gradient_mode_radio = TRY(mode_radio_container->try_add(TRY(String::from_utf8("Gradient"sv)))); + auto outline_mode_radio = TRY(mode_radio_container->try_add("Outline"_short_string)); + auto fill_mode_radio = TRY(mode_radio_container->try_add("Fill"_short_string)); + auto gradient_mode_radio = TRY(mode_radio_container->try_add(TRY("Gradient"_string))); mode_radio_container->set_fixed_width(70); - auto rounded_corners_mode_radio = TRY(mode_radio_container->try_add(String::from_utf8_short_string("Rounded"sv))); + auto rounded_corners_mode_radio = TRY(mode_radio_container->try_add("Rounded"_short_string)); outline_mode_radio->on_checked = [this, update_slider](bool) { m_fill_mode = FillMode::Outline; @@ -215,7 +215,7 @@ ErrorOr RectangleTool::get_properties_widget() auto mode_extras_container = TRY(mode_container->try_add()); (void)TRY(mode_extras_container->try_set_layout()); - auto aa_enable_checkbox = TRY(mode_extras_container->try_add(TRY(String::from_utf8("Anti-alias"sv)))); + auto aa_enable_checkbox = TRY(mode_extras_container->try_add(TRY("Anti-alias"_string))); aa_enable_checkbox->on_checked = [this](bool checked) { m_antialias_enabled = checked; }; diff --git a/Userland/Applications/PixelPaint/Tools/SprayTool.cpp b/Userland/Applications/PixelPaint/Tools/SprayTool.cpp index aaf2ef652dd..c56185e7813 100644 --- a/Userland/Applications/PixelPaint/Tools/SprayTool.cpp +++ b/Userland/Applications/PixelPaint/Tools/SprayTool.cpp @@ -104,7 +104,7 @@ ErrorOr SprayTool::get_properties_widget() size_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); size_label->set_fixed_size(80, 20); - auto size_slider = TRY(size_container->try_add(Orientation::Horizontal, String::from_utf8_short_string("px"sv))); + auto size_slider = TRY(size_container->try_add(Orientation::Horizontal, "px"_short_string)); size_slider->set_range(1, 20); size_slider->set_value(m_thickness); @@ -121,7 +121,7 @@ ErrorOr SprayTool::get_properties_widget() density_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); density_label->set_fixed_size(80, 20); - auto density_slider = TRY(density_container->try_add(Orientation::Horizontal, String::from_utf8_short_string("%"sv))); + auto density_slider = TRY(density_container->try_add(Orientation::Horizontal, "%"_short_string)); density_slider->set_range(1, 100); density_slider->set_value(m_density); diff --git a/Userland/Applications/PixelPaint/Tools/TextTool.cpp b/Userland/Applications/PixelPaint/Tools/TextTool.cpp index 3a030571df9..e8488104d9f 100644 --- a/Userland/Applications/PixelPaint/Tools/TextTool.cpp +++ b/Userland/Applications/PixelPaint/Tools/TextTool.cpp @@ -116,7 +116,7 @@ ErrorOr TextTool::get_properties_widget() m_font_label = TRY(properties_widget->try_add(m_selected_font->human_readable_name())); - auto change_font_button = TRY(properties_widget->try_add(TRY(String::from_utf8("Change Font..."sv)))); + auto change_font_button = TRY(properties_widget->try_add(TRY("Change Font..."_string))); change_font_button->on_click = [this](auto) { auto picker = GUI::FontPicker::construct(nullptr, m_selected_font, false); if (picker->exec() == GUI::Dialog::ExecResult::OK) { diff --git a/Userland/Applications/PixelPaint/Tools/WandSelectTool.cpp b/Userland/Applications/PixelPaint/Tools/WandSelectTool.cpp index 45bf033ac6a..74dbb0c0197 100644 --- a/Userland/Applications/PixelPaint/Tools/WandSelectTool.cpp +++ b/Userland/Applications/PixelPaint/Tools/WandSelectTool.cpp @@ -81,7 +81,7 @@ ErrorOr WandSelectTool::get_properties_widget() threshold_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); threshold_label->set_fixed_size(80, 20); - auto threshold_slider = TRY(threshold_container->try_add(Orientation::Horizontal, String::from_utf8_short_string("%"sv))); + auto threshold_slider = TRY(threshold_container->try_add(Orientation::Horizontal, "%"_short_string)); threshold_slider->set_range(0, 100); threshold_slider->set_value(m_threshold); diff --git a/Userland/Applications/PixelPaint/Tools/ZoomTool.cpp b/Userland/Applications/PixelPaint/Tools/ZoomTool.cpp index 78ad3c48291..dc616021742 100644 --- a/Userland/Applications/PixelPaint/Tools/ZoomTool.cpp +++ b/Userland/Applications/PixelPaint/Tools/ZoomTool.cpp @@ -37,7 +37,7 @@ ErrorOr ZoomTool::get_properties_widget() sensitivity_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); sensitivity_label->set_fixed_size(80, 20); - auto sensitivity_slider = TRY(sensitivity_container->try_add(Orientation::Horizontal, String::from_utf8_short_string("%"sv))); + auto sensitivity_slider = TRY(sensitivity_container->try_add(Orientation::Horizontal, "%"_short_string)); sensitivity_slider->set_range(1, 100); sensitivity_slider->set_value(100 * m_sensitivity); diff --git a/Userland/Applications/Spreadsheet/CellTypeDialog.cpp b/Userland/Applications/Spreadsheet/CellTypeDialog.cpp index 4e38fe74138..1f5979217d5 100644 --- a/Userland/Applications/Spreadsheet/CellTypeDialog.cpp +++ b/Userland/Applications/Spreadsheet/CellTypeDialog.cpp @@ -56,7 +56,7 @@ CellTypeDialog::CellTypeDialog(Vector const& positions, Sheet& sheet, buttonbox.set_shrink_to_fit(true); buttonbox.set_layout(GUI::Margins {}, 10); buttonbox.add_spacer().release_value_but_fixme_should_propagate_errors(); - auto& ok_button = buttonbox.add(String::from_utf8_short_string("OK"sv)); + auto& ok_button = buttonbox.add("OK"_short_string); ok_button.set_fixed_width(80); ok_button.on_click = [&](auto) { done(ExecResult::OK); }; } @@ -157,7 +157,7 @@ void CellTypeDialog::setup_tabs(GUI::TabWidget& tabs, Vector const& po }; { - auto& checkbox = right_side.add(String::from_utf8("Override max length"sv).release_value_but_fixme_should_propagate_errors()); + auto& checkbox = right_side.add("Override max length"_string.release_value_but_fixme_should_propagate_errors()); auto& spinbox = right_side.add(); checkbox.set_checked(m_length != -1); spinbox.set_min(0); @@ -177,7 +177,7 @@ void CellTypeDialog::setup_tabs(GUI::TabWidget& tabs, Vector const& po }; } { - auto& checkbox = right_side.add(String::from_utf8("Override display format"sv).release_value_but_fixme_should_propagate_errors()); + auto& checkbox = right_side.add("Override display format"_string.release_value_but_fixme_should_propagate_errors()); auto& editor = right_side.add(); checkbox.set_checked(!m_format.is_empty()); editor.set_name("format_editor"); diff --git a/Userland/Applications/Terminal/main.cpp b/Userland/Applications/Terminal/main.cpp index 72da1fc0304..3aa8f7d6cfc 100644 --- a/Userland/Applications/Terminal/main.cpp +++ b/Userland/Applications/Terminal/main.cpp @@ -201,8 +201,8 @@ static ErrorOr> create_find_window(VT::TerminalWidget find_forwards->click(); }; - auto match_case = TRY(main_widget->try_add(TRY(String::from_utf8("Case sensitive"sv)))); - auto wrap_around = TRY(main_widget->try_add(TRY(String::from_utf8("Wrap around"sv)))); + auto match_case = TRY(main_widget->try_add(TRY("Case sensitive"_string))); + auto wrap_around = TRY(main_widget->try_add(TRY("Wrap around"_string))); find_backwards->on_click = [&terminal, find_textbox, match_case, wrap_around](auto) { auto needle = find_textbox->text(); diff --git a/Userland/DevTools/HackStudio/FindInFilesWidget.cpp b/Userland/DevTools/HackStudio/FindInFilesWidget.cpp index 410662e0940..a950b98e3e0 100644 --- a/Userland/DevTools/HackStudio/FindInFilesWidget.cpp +++ b/Userland/DevTools/HackStudio/FindInFilesWidget.cpp @@ -122,7 +122,7 @@ FindInFilesWidget::FindInFilesWidget() m_textbox = top_container.add(); - m_button = top_container.add(String::from_utf8("Find in files"sv).release_value_but_fixme_should_propagate_errors()); + m_button = top_container.add("Find in files"_string.release_value_but_fixme_should_propagate_errors()); m_button->set_fixed_width(100); m_result_view = add(); diff --git a/Userland/DevTools/Inspector/main.cpp b/Userland/DevTools/Inspector/main.cpp index b16a8d418bd..3e5b82dea57 100644 --- a/Userland/DevTools/Inspector/main.cpp +++ b/Userland/DevTools/Inspector/main.cpp @@ -51,7 +51,7 @@ ErrorOr serenity_main(Main::Arguments arguments) auto app_icon = TRY(GUI::Icon::try_create_default_icon("app-inspector"sv)); if (gui_mode) { choose_pid: - auto process_chooser = TRY(GUI::ProcessChooser::try_create("Inspector"sv, String::from_utf8_short_string("Inspect"sv), app_icon.bitmap_for_size(16))); + auto process_chooser = TRY(GUI::ProcessChooser::try_create("Inspector"sv, "Inspect"_short_string, app_icon.bitmap_for_size(16))); if (process_chooser->exec() == GUI::Dialog::ExecResult::Cancel) return 0; pid = process_chooser->pid(); diff --git a/Userland/DevTools/Profiler/main.cpp b/Userland/DevTools/Profiler/main.cpp index 0364365d21f..8269403d282 100644 --- a/Userland/DevTools/Profiler/main.cpp +++ b/Userland/DevTools/Profiler/main.cpp @@ -325,7 +325,7 @@ static bool prompt_to_stop_profiling(pid_t pid, DeprecatedString const& process_ }).release_value_but_fixme_should_propagate_errors(); update_timer->start(); - auto& stop_button = widget->add(String::from_utf8_short_string("Stop"sv)); + auto& stop_button = widget->add("Stop"_short_string); stop_button.set_fixed_size(140, 22); stop_button.on_click = [&](auto) { GUI::Application::the()->quit(); @@ -338,7 +338,7 @@ static bool prompt_to_stop_profiling(pid_t pid, DeprecatedString const& process_ bool generate_profile(pid_t& pid) { if (!pid) { - auto process_chooser = GUI::ProcessChooser::construct("Profiler"sv, String::from_utf8_short_string("Profile"sv), Gfx::Bitmap::load_from_file("/res/icons/16x16/app-profiler.png"sv).release_value_but_fixme_should_propagate_errors()); + auto process_chooser = GUI::ProcessChooser::construct("Profiler"sv, "Profile"_short_string, Gfx::Bitmap::load_from_file("/res/icons/16x16/app-profiler.png"sv).release_value_but_fixme_should_propagate_errors()); if (process_chooser->exec() == GUI::Dialog::ExecResult::Cancel) return false; pid = process_chooser->pid(); diff --git a/Userland/Games/Hearts/Game.cpp b/Userland/Games/Hearts/Game.cpp index 2996d21c7dd..dcaafcbf428 100644 --- a/Userland/Games/Hearts/Game.cpp +++ b/Userland/Games/Hearts/Game.cpp @@ -78,7 +78,7 @@ Game::Game() m_players[3].name = "Lisa"; m_players[3].taken_cards_target = { width, height / 2 - Card::height / 2 }; - m_passing_button = add(String::from_utf8("Pass Left"sv).release_value_but_fixme_should_propagate_errors()); + m_passing_button = add("Pass Left"_string.release_value_but_fixme_should_propagate_errors()); constexpr int button_width = 120; constexpr int button_height = 30; m_passing_button->set_relative_rect(width / 2 - button_width / 2, height - 3 * outer_border_size - Card::height - button_height, button_width, button_height); @@ -133,7 +133,7 @@ void Game::show_score_card(bool game_over) button_container.set_shrink_to_fit(true); button_container.set_layout(); - auto& close_button = button_container.add(String::from_utf8_short_string("OK"sv)); + auto& close_button = button_container.add("OK"_short_string); close_button.on_click = [&score_dialog](auto) { score_dialog->done(GUI::Dialog::ExecResult::OK); }; @@ -178,13 +178,13 @@ void Game::setup(DeprecatedString player_name, int hand_number) m_human_can_play = true; switch (passing_direction()) { case PassingDirection::Left: - m_passing_button->set_text(String::from_utf8("Pass Left"sv).release_value_but_fixme_should_propagate_errors()); + m_passing_button->set_text("Pass Left"_string.release_value_but_fixme_should_propagate_errors()); break; case PassingDirection::Across: - m_passing_button->set_text(String::from_utf8("Pass Across"sv).release_value_but_fixme_should_propagate_errors()); + m_passing_button->set_text("Pass Across"_string.release_value_but_fixme_should_propagate_errors()); break; case PassingDirection::Right: - m_passing_button->set_text(String::from_utf8("Pass Right"sv).release_value_but_fixme_should_propagate_errors()); + m_passing_button->set_text("Pass Right"_string.release_value_but_fixme_should_propagate_errors()); break; default: VERIFY_NOT_REACHED(); @@ -869,7 +869,7 @@ void Game::pass_cards() } m_state = State::PassingAccept; - m_passing_button->set_text(String::from_utf8_short_string("OK"sv)); + m_passing_button->set_text("OK"_short_string); m_passing_button->set_enabled(true); } diff --git a/Userland/Games/Hearts/SettingsDialog.cpp b/Userland/Games/Hearts/SettingsDialog.cpp index 27a4016e03f..dcb87822e81 100644 --- a/Userland/Games/Hearts/SettingsDialog.cpp +++ b/Userland/Games/Hearts/SettingsDialog.cpp @@ -39,11 +39,11 @@ SettingsDialog::SettingsDialog(GUI::Window* parent, DeprecatedString player_name auto& button_box = main_widget->add(); button_box.set_layout(GUI::Margins {}, 12); - button_box.add(String::from_utf8_short_string("Cancel"sv)).on_click = [this](auto) { + button_box.add("Cancel"_short_string).on_click = [this](auto) { done(ExecResult::Cancel); }; - button_box.add(String::from_utf8_short_string("OK"sv)).on_click = [this](auto) { + button_box.add("OK"_short_string).on_click = [this](auto) { done(ExecResult::OK); }; } diff --git a/Userland/Libraries/LibCore/Process.cpp b/Userland/Libraries/LibCore/Process.cpp index 33e65ee4946..22d5f678982 100644 --- a/Userland/Libraries/LibCore/Process.cpp +++ b/Userland/Libraries/LibCore/Process.cpp @@ -111,7 +111,7 @@ ErrorOr Process::get_name() return String::from_utf8(StringView { buffer, strlen(buffer) }); #else // FIXME: Implement Process::get_name() for other platforms. - return String::from_utf8_short_string("???"sv); + return "???"_short_string; #endif } diff --git a/Userland/Libraries/LibCore/StandardPaths.cpp b/Userland/Libraries/LibCore/StandardPaths.cpp index 41755490e6b..5157c7073c2 100644 --- a/Userland/Libraries/LibCore/StandardPaths.cpp +++ b/Userland/Libraries/LibCore/StandardPaths.cpp @@ -116,14 +116,14 @@ ErrorOr> StandardPaths::font_directories() { return Vector { { #if defined(AK_OS_SERENITY) - TRY(String::from_utf8("/res/fonts"sv)), + TRY("/res/fonts"_string), #elif defined(AK_OS_MACOS) - TRY(String::from_utf8("/System/Library/Fonts"sv)), - TRY(String::from_utf8("/Library/Fonts"sv)), + TRY("/System/Library/Fonts"_string), + TRY("/Library/Fonts"_string), TRY(String::formatted("{}/Library/Fonts"sv, home_directory())), #else - TRY(String::from_utf8("/usr/share/fonts"sv)), - TRY(String::from_utf8("/usr/local/share/fonts"sv)), + TRY("/usr/share/fonts"_string), + TRY("/usr/local/share/fonts"_string), TRY(String::formatted("{}/.local/share/fonts"sv, home_directory())), #endif } }; diff --git a/Userland/Libraries/LibCrypto/BigInt/UnsignedBigInteger.cpp b/Userland/Libraries/LibCrypto/BigInt/UnsignedBigInteger.cpp index 4cd143dfda4..f643b6dee8f 100644 --- a/Userland/Libraries/LibCrypto/BigInt/UnsignedBigInteger.cpp +++ b/Userland/Libraries/LibCrypto/BigInt/UnsignedBigInteger.cpp @@ -150,7 +150,7 @@ ErrorOr UnsignedBigInteger::to_base(u16 N) const { VERIFY(N <= 36); if (*this == UnsignedBigInteger { 0 }) - return String::from_utf8_short_string("0"sv); + return "0"_short_string; StringBuilder builder; UnsignedBigInteger temp(*this); diff --git a/Userland/Libraries/LibDSP/Effects.cpp b/Userland/Libraries/LibDSP/Effects.cpp index b7e3f58d350..48f3e2b58d8 100644 --- a/Userland/Libraries/LibDSP/Effects.cpp +++ b/Userland/Libraries/LibDSP/Effects.cpp @@ -12,9 +12,9 @@ namespace DSP::Effects { Delay::Delay(NonnullRefPtr transport) : EffectProcessor(move(transport)) - , m_delay_decay(String::from_utf8_short_string("Decay"sv), 0.01, 0.99, 0.33, Logarithmic::No) - , m_delay_time(String::from_utf8("Delay Time"sv), 3, 2000, 900, Logarithmic::Yes) - , m_dry_gain(String::from_utf8_short_string("Dry"sv), 0, 1, 0.9, Logarithmic::No) + , m_delay_decay("Decay"_short_string, 0.01, 0.99, 0.33, Logarithmic::No) + , m_delay_time("Delay Time"_string, 3, 2000, 900, Logarithmic::Yes) + , m_dry_gain("Dry"_short_string, 0, 1, 0.9, Logarithmic::No) { m_parameters.append(m_delay_decay); @@ -59,9 +59,9 @@ void Delay::process_impl(Signal const& input_signal, Signal& output_signal) Mastering::Mastering(NonnullRefPtr transport) : EffectProcessor(move(transport)) - , m_pan(String::from_utf8_short_string("Pan"sv), -1, 1, 0, Logarithmic::No) - , m_volume(String::from_utf8_short_string("Volume"sv), 0, 1, 1, Logarithmic::No) - , m_muted(String::from_utf8_short_string("Mute"sv), false) + , m_pan("Pan"_short_string, -1, 1, 0, Logarithmic::No) + , m_volume("Volume"_short_string, 0, 1, 1, Logarithmic::No) + , m_muted("Mute"_short_string, false) { m_parameters.append(m_muted); m_parameters.append(m_volume); diff --git a/Userland/Libraries/LibDSP/Synthesizers.cpp b/Userland/Libraries/LibDSP/Synthesizers.cpp index 897c4c8bff6..44df72e4354 100644 --- a/Userland/Libraries/LibDSP/Synthesizers.cpp +++ b/Userland/Libraries/LibDSP/Synthesizers.cpp @@ -19,11 +19,11 @@ namespace DSP::Synthesizers { Classic::Classic(NonnullRefPtr transport) : DSP::SynthesizerProcessor(move(transport)) - , m_waveform(String::from_utf8("Waveform"sv), Waveform::Saw) - , m_attack(String::from_utf8_short_string("Attack"sv), 0.01, 2000, 5, Logarithmic::Yes) - , m_decay(String::from_utf8_short_string("Decay"sv), 0.01, 20'000, 80, Logarithmic::Yes) - , m_sustain(String::from_utf8_short_string("Sustain"sv), 0.001, 1, 0.725, Logarithmic::No) - , m_release(String::from_utf8_short_string("Release"sv), 0.01, 6'000, 120, Logarithmic::Yes) + , m_waveform("Waveform"_string, Waveform::Saw) + , m_attack("Attack"_short_string, 0.01, 2000, 5, Logarithmic::Yes) + , m_decay("Decay"_short_string, 0.01, 20'000, 80, Logarithmic::Yes) + , m_sustain("Sustain"_short_string, 0.001, 1, 0.725, Logarithmic::No) + , m_release("Release"_short_string, 0.01, 6'000, 120, Logarithmic::Yes) { m_parameters.append(m_waveform); m_parameters.append(m_attack); diff --git a/Userland/Libraries/LibGLSL/Linker.cpp b/Userland/Libraries/LibGLSL/Linker.cpp index 50e7790a89c..0d9fb3e66ab 100644 --- a/Userland/Libraries/LibGLSL/Linker.cpp +++ b/Userland/Libraries/LibGLSL/Linker.cpp @@ -15,8 +15,8 @@ ErrorOr> Linker::link(Vector cons GPU::IR::Shader shader; - auto input_name = TRY(String::from_utf8("input0"sv)); - auto output_name = TRY(String::from_utf8("output0"sv)); + auto input_name = TRY("input0"_string); + auto output_name = TRY("output0"_string); TRY(shader.inputs.try_append({ move(input_name), GPU::IR::StorageType::Vector4 })); TRY(shader.outputs.try_append({ move(output_name), GPU::IR::StorageType::Vector4 })); GPU::IR::Instruction instruction { diff --git a/Userland/Libraries/LibGUI/ColorPicker.cpp b/Userland/Libraries/LibGUI/ColorPicker.cpp index b4d757e47b4..7de9564f48f 100644 --- a/Userland/Libraries/LibGUI/ColorPicker.cpp +++ b/Userland/Libraries/LibGUI/ColorPicker.cpp @@ -228,14 +228,14 @@ void ColorPicker::build_ui() button_container.add_spacer().release_value_but_fixme_should_propagate_errors(); auto& ok_button = button_container.add(); - ok_button.set_text(String::from_utf8_short_string("OK"sv)); + ok_button.set_text("OK"_short_string); ok_button.on_click = [this](auto) { done(ExecResult::OK); }; ok_button.set_default(true); auto& cancel_button = button_container.add(); - cancel_button.set_text(String::from_utf8_short_string("Cancel"sv)); + cancel_button.set_text("Cancel"_short_string); cancel_button.on_click = [this](auto) { done(ExecResult::Cancel); }; @@ -407,7 +407,7 @@ void ColorPicker::build_ui_custom(Widget& root_container) make_spinbox(Blue, m_color.blue()); make_spinbox(Alpha, m_color.alpha()); - m_selector_button = vertical_container.add(String::from_utf8("Select on screen"sv).release_value_but_fixme_should_propagate_errors()); + m_selector_button = vertical_container.add("Select on screen"_string.release_value_but_fixme_should_propagate_errors()); m_selector_button->on_click = [this](auto) { auto selector = ColorSelectOverlay::construct(); auto original_color = m_color; diff --git a/Userland/Libraries/LibGUI/FilePicker.cpp b/Userland/Libraries/LibGUI/FilePicker.cpp index b5db27f7da4..795832447d0 100644 --- a/Userland/Libraries/LibGUI/FilePicker.cpp +++ b/Userland/Libraries/LibGUI/FilePicker.cpp @@ -224,7 +224,7 @@ FilePicker::FilePicker(Window* parent_window, Mode mode, StringView filename, St ok_button.set_enabled(m_mode == Mode::OpenFolder || !m_filename_textbox->text().is_empty()); auto& cancel_button = *widget->find_descendant_of_type_named("cancel_button"); - cancel_button.set_text(String::from_utf8_short_string("Cancel"sv)); + cancel_button.set_text("Cancel"_short_string); cancel_button.on_click = [this](auto) { done(ExecResult::Cancel); }; diff --git a/Userland/Libraries/LibGUI/FilePicker.h b/Userland/Libraries/LibGUI/FilePicker.h index ad0d8277f16..0096877844a 100644 --- a/Userland/Libraries/LibGUI/FilePicker.h +++ b/Userland/Libraries/LibGUI/FilePicker.h @@ -54,11 +54,11 @@ private: case Mode::Open: case Mode::OpenMultiple: case Mode::OpenFolder: - return String::from_utf8_short_string("Open"sv); + return "Open"_short_string; case Mode::Save: - return String::from_utf8_short_string("Save"sv); + return "Save"_short_string; default: - return String::from_utf8_short_string("OK"sv); + return "OK"_short_string; } } diff --git a/Userland/Libraries/LibGUI/IncrementalSearchBanner.cpp b/Userland/Libraries/LibGUI/IncrementalSearchBanner.cpp index c4580352b77..ecba03dd3a8 100644 --- a/Userland/Libraries/LibGUI/IncrementalSearchBanner.cpp +++ b/Userland/Libraries/LibGUI/IncrementalSearchBanner.cpp @@ -37,7 +37,7 @@ IncrementalSearchBanner::IncrementalSearchBanner(TextEditor& editor) }; m_close_button = find_descendant_of_type_named