diff --git a/AK/IPv6Address.h b/AK/IPv6Address.h index a9fbef9f4a0..6bfd811a0e7 100644 --- a/AK/IPv6Address.h +++ b/AK/IPv6Address.h @@ -58,7 +58,7 @@ public: #ifdef KERNEL return Kernel::KString::try_create("::"sv); #else - return "::"_short_string; + return "::"_string; #endif } diff --git a/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateLocaleData.cpp b/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateLocaleData.cpp index aa6f39964ec..f81cdb11506 100644 --- a/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateLocaleData.cpp +++ b/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateLocaleData.cpp @@ -1496,7 +1496,7 @@ static LanguageMapping const* resolve_likely_subtag(LanguageID const& language_i if (!language_id.script.has_value()) continue; - search_key.language = "und"_short_string; + search_key.language = "und"_string; search_key.script = *language_id.script; break; diff --git a/Meta/Lagom/Tools/CodeGenerators/LibUnicode/GenerateUnicodeData.cpp b/Meta/Lagom/Tools/CodeGenerators/LibUnicode/GenerateUnicodeData.cpp index 0d11accf06d..e8e25da5422 100644 --- a/Meta/Lagom/Tools/CodeGenerators/LibUnicode/GenerateUnicodeData.cpp +++ b/Meta/Lagom/Tools/CodeGenerators/LibUnicode/GenerateUnicodeData.cpp @@ -1071,12 +1071,12 @@ static constexpr Array<@mapping_type@, @size@> s_@name@_mappings { { auto optional_code_point_to_string = [](auto const& code_point) -> ErrorOr { if (!code_point.has_value()) - return "-1"_short_string; + return "-1"_string; return String::number(*code_point); }; auto first_index_to_string = [](auto const& list) -> ErrorOr { if (list.is_empty()) - return "0"_short_string; + return "0"_string; return String::number(list.first()); }; diff --git a/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSEnums.cpp b/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSEnums.cpp index cbcdeee7d19..bd1e6cabf3e 100644 --- a/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSEnums.cpp +++ b/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSEnums.cpp @@ -65,13 +65,13 @@ enum class ValueID; // Find the smallest possible type to use. auto member_max_value = members.size() - 1; if (NumericLimits::max() >= member_max_value) { - TRY(enum_generator.set("enum_type", "u8"_short_string)); + TRY(enum_generator.set("enum_type", "u8"_string)); } else if (NumericLimits::max() >= member_max_value) { - TRY(enum_generator.set("enum_type", "u16"_short_string)); + TRY(enum_generator.set("enum_type", "u16"_string)); } else if (NumericLimits::max() >= member_max_value) { - TRY(enum_generator.set("enum_type", "u32"_short_string)); + TRY(enum_generator.set("enum_type", "u32"_string)); } else { - TRY(enum_generator.set("enum_type", "u64"_short_string)); + TRY(enum_generator.set("enum_type", "u64"_string)); } TRY(enum_generator.try_appendln("enum class @name:titlecase@ : @enum_type@ {")); diff --git a/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSMathFunctions.cpp b/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSMathFunctions.cpp index 5cb134a08f5..1ec74baba78 100644 --- a/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSMathFunctions.cpp +++ b/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSMathFunctions.cpp @@ -249,7 +249,7 @@ ErrorOr> Parser::parse_math_function(PropertyID property if (auto default_value = parameter.get_deprecated_string("default"sv); default_value.has_value()) { TRY(parameter_generator.set("parameter_default", TRY(String::formatted(" = RoundingStrategy::{}", TRY(title_casify(default_value.value())))))); } else { - TRY(parameter_generator.set("parameter_default", ""_short_string)); + TRY(parameter_generator.set("parameter_default", ""_string)); } } else { // NOTE: This assumes everything not handled above is a calculation node of some kind. @@ -264,7 +264,7 @@ ErrorOr> Parser::parse_math_function(PropertyID property if (auto default_value = parameter.get_deprecated_string("default"sv); default_value.has_value()) { TRY(parameter_generator.set("parameter_default", TRY(String::formatted(" = TRY(ConstantCalculationNode::create(CalculationNode::constant_type_from_string(\"{}\"sv).value()))", TRY(String::from_deprecated_string(default_value.value())))))); } else { - TRY(parameter_generator.set("parameter_default", ""_short_string)); + TRY(parameter_generator.set("parameter_default", ""_string)); } } @@ -351,7 +351,7 @@ ErrorOr> Parser::parse_math_function(PropertyID property TRY(parameter_generator.set("parameter_index"sv, TRY(String::number(parameter_index)))); if (parameter_type_string == ""sv) { - TRY(parameter_generator.set("release_value"sv, ""_short_string)); + TRY(parameter_generator.set("release_value"sv, ""_string)); } else { // NOTE: This assumes everything not handled above is a calculation node of some kind. TRY(parameter_generator.set("release_value"sv, ".release_nonnull()"_string)); diff --git a/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSMediaFeatureID.cpp b/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSMediaFeatureID.cpp index 07a6f414cf6..97a86b29441 100644 --- a/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSMediaFeatureID.cpp +++ b/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSMediaFeatureID.cpp @@ -145,7 +145,7 @@ bool media_feature_type_is_range(MediaFeatureID media_feature_id) VERIFY(feature.has("type"sv)); auto feature_type = feature.get_deprecated_string("type"sv); VERIFY(feature_type.has_value()); - TRY(member_generator.set("is_range", feature_type.value() == "range" ? "true"_short_string : "false"_short_string)); + TRY(member_generator.set("is_range", feature_type.value() == "range" ? "true"_string : "false"_string)); TRY(member_generator.try_append(R"~~~( case MediaFeatureID::@name:titlecase@: return @is_range@;)~~~")); diff --git a/Tests/AK/TestHashMap.cpp b/Tests/AK/TestHashMap.cpp index cd7d911d69e..8b274c7acb1 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("baz"_short_string).has_value()); + EXPECT(!map.take("baz"_string).has_value()); - map.set("foo"_short_string, 1); - map.set("bar"_short_string, 2); - map.set("baz"_short_string, 3); + map.set("foo"_string, 1); + map.set("bar"_string, 2); + map.set("baz"_string, 3); auto foo = map.take("foo"sv); EXPECT_EQ(foo, 1); @@ -245,10 +245,10 @@ TEST_CASE(take) bar = map.take("bar"sv); EXPECT(!bar.has_value()); - auto baz = map.take("baz"_short_string); + auto baz = map.take("baz"_string); EXPECT_EQ(baz, 3); - baz = map.take("baz"_short_string); + baz = map.take("baz"_string); EXPECT(!baz.has_value()); } diff --git a/Tests/AK/TestString.cpp b/Tests/AK/TestString.cpp index bb10f573c64..c2f3d631c17 100644 --- a/Tests/AK/TestString.cpp +++ b/Tests/AK/TestString.cpp @@ -638,7 +638,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("!!!"_short_string, Array { "foo"sv, "bar"sv, "baz"sv })); + auto string6 = MUST(String::join("!!!"_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)); @@ -763,28 +763,28 @@ TEST_CASE(contains) EXPECT(!String {}.contains(" "sv)); EXPECT(!String {}.contains(0)); - EXPECT("a"_short_string.contains("a"sv)); - EXPECT(!"a"_short_string.contains({})); - EXPECT(!"a"_short_string.contains("b"sv)); - EXPECT(!"a"_short_string.contains("ab"sv)); + EXPECT("a"_string.contains("a"sv)); + EXPECT(!"a"_string.contains({})); + EXPECT(!"a"_string.contains("b"sv)); + EXPECT(!"a"_string.contains("ab"sv)); - EXPECT("a"_short_string.contains(0x0061)); - EXPECT(!"a"_short_string.contains(0x0062)); + EXPECT("a"_string.contains(0x0061)); + EXPECT(!"a"_string.contains(0x0062)); - EXPECT("abc"_short_string.contains("a"sv)); - EXPECT("abc"_short_string.contains("b"sv)); - EXPECT("abc"_short_string.contains("c"sv)); - EXPECT("abc"_short_string.contains("ab"sv)); - EXPECT("abc"_short_string.contains("bc"sv)); - EXPECT("abc"_short_string.contains("abc"sv)); - EXPECT(!"abc"_short_string.contains({})); - EXPECT(!"abc"_short_string.contains("ac"sv)); - EXPECT(!"abc"_short_string.contains("abcd"sv)); + EXPECT("abc"_string.contains("a"sv)); + EXPECT("abc"_string.contains("b"sv)); + EXPECT("abc"_string.contains("c"sv)); + EXPECT("abc"_string.contains("ab"sv)); + EXPECT("abc"_string.contains("bc"sv)); + EXPECT("abc"_string.contains("abc"sv)); + EXPECT(!"abc"_string.contains({})); + EXPECT(!"abc"_string.contains("ac"sv)); + EXPECT(!"abc"_string.contains("abcd"sv)); - EXPECT("abc"_short_string.contains(0x0061)); - EXPECT("abc"_short_string.contains(0x0062)); - EXPECT("abc"_short_string.contains(0x0063)); - EXPECT(!"abc"_short_string.contains(0x0064)); + EXPECT("abc"_string.contains(0x0061)); + EXPECT("abc"_string.contains(0x0062)); + EXPECT("abc"_string.contains(0x0063)); + EXPECT(!"abc"_string.contains(0x0064)); auto emoji = "😀"_string; EXPECT(emoji.contains("\xF0"sv)); @@ -809,24 +809,24 @@ TEST_CASE(starts_with) EXPECT(!String {}.starts_with_bytes(" "sv)); EXPECT(!String {}.starts_with(0)); - EXPECT("a"_short_string.starts_with_bytes({})); - EXPECT("a"_short_string.starts_with_bytes("a"sv)); - EXPECT(!"a"_short_string.starts_with_bytes("b"sv)); - EXPECT(!"a"_short_string.starts_with_bytes("ab"sv)); + EXPECT("a"_string.starts_with_bytes({})); + EXPECT("a"_string.starts_with_bytes("a"sv)); + EXPECT(!"a"_string.starts_with_bytes("b"sv)); + EXPECT(!"a"_string.starts_with_bytes("ab"sv)); - EXPECT("a"_short_string.starts_with(0x0061)); - EXPECT(!"a"_short_string.starts_with(0x0062)); + EXPECT("a"_string.starts_with(0x0061)); + EXPECT(!"a"_string.starts_with(0x0062)); - EXPECT("abc"_short_string.starts_with_bytes({})); - EXPECT("abc"_short_string.starts_with_bytes("a"sv)); - EXPECT("abc"_short_string.starts_with_bytes("ab"sv)); - EXPECT("abc"_short_string.starts_with_bytes("abc"sv)); - EXPECT(!"abc"_short_string.starts_with_bytes("b"sv)); - EXPECT(!"abc"_short_string.starts_with_bytes("bc"sv)); + EXPECT("abc"_string.starts_with_bytes({})); + EXPECT("abc"_string.starts_with_bytes("a"sv)); + EXPECT("abc"_string.starts_with_bytes("ab"sv)); + EXPECT("abc"_string.starts_with_bytes("abc"sv)); + EXPECT(!"abc"_string.starts_with_bytes("b"sv)); + EXPECT(!"abc"_string.starts_with_bytes("bc"sv)); - EXPECT("abc"_short_string.starts_with(0x0061)); - EXPECT(!"abc"_short_string.starts_with(0x0062)); - EXPECT(!"abc"_short_string.starts_with(0x0063)); + EXPECT("abc"_string.starts_with(0x0061)); + EXPECT(!"abc"_string.starts_with(0x0062)); + EXPECT(!"abc"_string.starts_with(0x0063)); auto emoji = "😀🙃"_string; EXPECT(emoji.starts_with_bytes("\xF0"sv)); @@ -850,24 +850,24 @@ TEST_CASE(ends_with) EXPECT(!String {}.ends_with_bytes(" "sv)); EXPECT(!String {}.ends_with(0)); - EXPECT("a"_short_string.ends_with_bytes({})); - EXPECT("a"_short_string.ends_with_bytes("a"sv)); - EXPECT(!"a"_short_string.ends_with_bytes("b"sv)); - EXPECT(!"a"_short_string.ends_with_bytes("ba"sv)); + EXPECT("a"_string.ends_with_bytes({})); + EXPECT("a"_string.ends_with_bytes("a"sv)); + EXPECT(!"a"_string.ends_with_bytes("b"sv)); + EXPECT(!"a"_string.ends_with_bytes("ba"sv)); - EXPECT("a"_short_string.ends_with(0x0061)); - EXPECT(!"a"_short_string.ends_with(0x0062)); + EXPECT("a"_string.ends_with(0x0061)); + EXPECT(!"a"_string.ends_with(0x0062)); - EXPECT("abc"_short_string.ends_with_bytes({})); - EXPECT("abc"_short_string.ends_with_bytes("c"sv)); - EXPECT("abc"_short_string.ends_with_bytes("bc"sv)); - EXPECT("abc"_short_string.ends_with_bytes("abc"sv)); - EXPECT(!"abc"_short_string.ends_with_bytes("b"sv)); - EXPECT(!"abc"_short_string.ends_with_bytes("ab"sv)); + EXPECT("abc"_string.ends_with_bytes({})); + EXPECT("abc"_string.ends_with_bytes("c"sv)); + EXPECT("abc"_string.ends_with_bytes("bc"sv)); + EXPECT("abc"_string.ends_with_bytes("abc"sv)); + EXPECT(!"abc"_string.ends_with_bytes("b"sv)); + EXPECT(!"abc"_string.ends_with_bytes("ab"sv)); - EXPECT("abc"_short_string.ends_with(0x0063)); - EXPECT(!"abc"_short_string.ends_with(0x0062)); - EXPECT(!"abc"_short_string.ends_with(0x0061)); + EXPECT("abc"_string.ends_with(0x0063)); + EXPECT(!"abc"_string.ends_with(0x0062)); + EXPECT(!"abc"_string.ends_with(0x0061)); auto emoji = "😀🙃"_string; EXPECT(emoji.ends_with_bytes("\x83"sv)); diff --git a/Userland/Applets/Audio/main.cpp b/Userland/Applets/Audio/main.cpp index 25b31e82d20..625b7a888e0 100644 --- a/Userland/Applets/Audio/main.cpp +++ b/Userland/Applets/Audio/main.cpp @@ -86,7 +86,7 @@ private: m_root_container->set_layout(4, 0); m_root_container->set_frame_style(Gfx::FrameStyle::Window); - m_percent_box = m_root_container->add("\xE2\x84\xB9"_short_string); + m_percent_box = m_root_container->add("\xE2\x84\xB9"_string); m_percent_box->set_tooltip(show_percent() ? "Hide percent" : "Show percent"); m_percent_box->set_checked(show_percent()); m_percent_box->on_checked = [&](bool show_percent) { @@ -109,7 +109,7 @@ private: update(); }; - m_mute_box = m_root_container->add("\xE2\x9D\x8C"_short_string); + m_mute_box = m_root_container->add("\xE2\x9D\x8C"_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/Applets/ClipboardHistory/ClipboardHistoryModel.cpp b/Userland/Applets/ClipboardHistory/ClipboardHistoryModel.cpp index 0b4c352895d..243503515d0 100644 --- a/Userland/Applets/ClipboardHistory/ClipboardHistoryModel.cpp +++ b/Userland/Applets/ClipboardHistory/ClipboardHistoryModel.cpp @@ -27,13 +27,13 @@ ErrorOr ClipboardHistoryModel::column_name(int column) const { switch (column) { case Column::Data: - return "Data"_short_string; + return "Data"_string; case Column::Type: - return "Type"_short_string; + return "Type"_string; case Column::Size: - return "Size"_short_string; + return "Size"_string; case Column::Time: - return "Time"_short_string; + return "Time"_string; default: VERIFY_NOT_REACHED(); } diff --git a/Userland/Applications/3DFileViewer/main.cpp b/Userland/Applications/3DFileViewer/main.cpp index 898ac7a9832..42c0d198c17 100644 --- a/Userland/Applications/3DFileViewer/main.cpp +++ b/Userland/Applications/3DFileViewer/main.cpp @@ -372,7 +372,7 @@ ErrorOr serenity_main(Main::Arguments arguments) time.set_x(widget->width() - time.width() - 6); widget->set_stat_label(time); - auto& file_menu = window->add_menu("&File"_short_string); + auto& file_menu = window->add_menu("&File"_string); file_menu.add_action(GUI::CommonActions::make_open_action([&](auto&) { FileSystemAccessClient::OpenFileOptions options { @@ -390,7 +390,7 @@ ErrorOr serenity_main(Main::Arguments arguments) app->quit(); })); - auto& view_menu = window->add_menu("&View"_short_string); + auto& view_menu = window->add_menu("&View"_string); view_menu.add_action(GUI::CommonActions::make_fullscreen_action([&](auto&) { window->set_fullscreen(!window->is_fullscreen()); })); @@ -456,7 +456,7 @@ ErrorOr serenity_main(Main::Arguments arguments) texture_enabled_action->set_checked(true); texture_menu.add_action(texture_enabled_action); - auto& wrap_u_menu = texture_menu.add_submenu("Wrap &S"_short_string); + auto& wrap_u_menu = texture_menu.add_submenu("Wrap &S"_string); GUI::ActionGroup wrap_s_actions; wrap_s_actions.set_exclusive(true); @@ -480,7 +480,7 @@ ErrorOr serenity_main(Main::Arguments arguments) wrap_u_repeat_action->set_checked(true); - auto& wrap_t_menu = texture_menu.add_submenu("Wrap &T"_short_string); + auto& wrap_t_menu = texture_menu.add_submenu("Wrap &T"_string); GUI::ActionGroup wrap_t_actions; wrap_t_actions.set_exclusive(true); @@ -504,7 +504,7 @@ ErrorOr serenity_main(Main::Arguments arguments) wrap_t_repeat_action->set_checked(true); - auto& texture_scale_menu = texture_menu.add_submenu("S&cale"_short_string); + auto& texture_scale_menu = texture_menu.add_submenu("S&cale"_string); GUI::ActionGroup texture_scale_actions; texture_scale_actions.set_exclusive(true); @@ -562,7 +562,7 @@ ErrorOr serenity_main(Main::Arguments arguments) texture_mag_filter_nearest_action->set_checked(true); - auto& help_menu = window->add_menu("&Help"_short_string); + auto& help_menu = window->add_menu("&Help"_string); help_menu.add_action(GUI::CommonActions::make_command_palette_action(window)); help_menu.add_action(GUI::CommonActions::make_about_action("3D File Viewer", app_icon, window)); diff --git a/Userland/Applications/Browser/BookmarksBarWidget.cpp b/Userland/Applications/Browser/BookmarksBarWidget.cpp index 048c617eef3..84178b536e8 100644 --- a/Userland/Applications/Browser/BookmarksBarWidget.cpp +++ b/Userland/Applications/Browser/BookmarksBarWidget.cpp @@ -165,8 +165,8 @@ BookmarksBarWidget::BookmarksBarWidget(DeprecatedString const& bookmarks_file, b this)); Vector fields; - fields.empend("title", "Title"_short_string, Gfx::TextAlignment::CenterLeft); - fields.empend("url", "Url"_short_string, Gfx::TextAlignment::CenterRight); + fields.empend("title", "Title"_string, Gfx::TextAlignment::CenterLeft); + fields.empend("url", "Url"_string, Gfx::TextAlignment::CenterRight); set_model(GUI::JsonArrayModel::create(bookmarks_file, move(fields))); model()->invalidate(); } diff --git a/Userland/Applications/Browser/BrowserWindow.cpp b/Userland/Applications/Browser/BrowserWindow.cpp index 1074ae5d130..2ef1ed25e60 100644 --- a/Userland/Applications/Browser/BrowserWindow.cpp +++ b/Userland/Applications/Browser/BrowserWindow.cpp @@ -153,7 +153,7 @@ BrowserWindow::BrowserWindow(CookieJar& cookie_jar, URL url, WebView::UseJavaScr void BrowserWindow::build_menus() { - auto& file_menu = add_menu("&File"_short_string); + auto& file_menu = add_menu("&File"_string); file_menu.add_action(WindowActions::the().create_new_tab_action()); file_menu.add_action(WindowActions::the().create_new_window_action()); @@ -168,11 +168,11 @@ void BrowserWindow::build_menus() GUI::Application::the()->quit(); })); - auto& view_menu = add_menu("&View"_short_string); + auto& view_menu = add_menu("&View"_string); view_menu.add_action(WindowActions::the().show_bookmarks_bar_action()); view_menu.add_action(WindowActions::the().vertical_tabs_action()); view_menu.add_separator(); - m_zoom_menu = view_menu.add_submenu("&Zoom"_short_string); + m_zoom_menu = view_menu.add_submenu("&Zoom"_string); m_zoom_menu->add_action(GUI::CommonActions::make_zoom_in_action( [this](auto&) { auto& tab = active_tab(); @@ -219,7 +219,7 @@ void BrowserWindow::build_menus() m_reload_action = GUI::CommonActions::make_reload_action([this](auto&) { active_tab().reload(); }, this); m_reload_action->set_status_tip("Reload current page"_string); - auto& go_menu = add_menu("&Go"_short_string); + auto& go_menu = add_menu("&Go"_string); go_menu.add_action(*m_go_back_action); go_menu.add_action(*m_go_forward_action); go_menu.add_action(*m_go_home_action); @@ -340,7 +340,7 @@ void BrowserWindow::build_menus() }); settings_menu.add_action(move(open_settings_action)); - auto& debug_menu = add_menu("&Debug"_short_string); + auto& debug_menu = add_menu("&Debug"_string); debug_menu.add_action(GUI::Action::create( "Dump &DOM Tree", g_icon_bag.dom_tree, [this](auto&) { active_tab().view().debug_request("dump-dom-tree"); @@ -462,7 +462,7 @@ void BrowserWindow::build_menus() same_origin_policy_action->set_checked(false); debug_menu.add_action(same_origin_policy_action); - auto& help_menu = add_menu("&Help"_short_string); + auto& help_menu = add_menu("&Help"_string); help_menu.add_action(GUI::CommonActions::make_command_palette_action(this)); help_menu.add_action(WindowActions::the().about_action()); } @@ -564,7 +564,7 @@ void BrowserWindow::set_window_title_for_tab(Tab const& tab) Tab& BrowserWindow::create_new_tab(URL url, Web::HTML::ActivateTab activate) { - auto& new_tab = m_tab_widget->add_tab("New tab"_short_string, *this, m_use_javascript_bytecode); + auto& new_tab = m_tab_widget->add_tab("New tab"_string, *this, m_use_javascript_bytecode); m_tab_widget->set_bar_visible(!is_fullscreen() && m_tab_widget->children().size() > 1); diff --git a/Userland/Applications/Browser/CookiesModel.cpp b/Userland/Applications/Browser/CookiesModel.cpp index 2ee6ed74327..4466599cc16 100644 --- a/Userland/Applications/Browser/CookiesModel.cpp +++ b/Userland/Applications/Browser/CookiesModel.cpp @@ -38,13 +38,13 @@ ErrorOr CookiesModel::column_name(int column) const { switch (column) { case Column::Domain: - return "Domain"_short_string; + return "Domain"_string; case Column::Path: - return "Path"_short_string; + return "Path"_string; case Column::Name: - return "Name"_short_string; + return "Name"_string; case Column::Value: - return "Value"_short_string; + return "Value"_string; case Column::ExpiryTime: return "Expiry time"_string; case Column::SameSite: diff --git a/Userland/Applications/Browser/DownloadWidget.cpp b/Userland/Applications/Browser/DownloadWidget.cpp index 59117674fd7..c4b64978635 100644 --- a/Userland/Applications/Browser/DownloadWidget.cpp +++ b/Userland/Applications/Browser/DownloadWidget.cpp @@ -103,7 +103,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("Cancel"_short_string); + m_cancel_button = button_container.add("Cancel"_string); m_cancel_button->set_fixed_size(100, 22); m_cancel_button->on_click = [this](auto) { bool success = m_download->stop(); @@ -111,7 +111,7 @@ DownloadWidget::DownloadWidget(const URL& url) window()->close(); }; - m_close_button = button_container.add("OK"_short_string); + m_close_button = button_container.add("OK"_string); m_close_button->set_enabled(false); m_close_button->set_fixed_size(100, 22); m_close_button->on_click = [this](auto) { diff --git a/Userland/Applications/Browser/History/HistoryModel.cpp b/Userland/Applications/Browser/History/HistoryModel.cpp index ec85b6cab5a..94e5972b7ff 100644 --- a/Userland/Applications/Browser/History/HistoryModel.cpp +++ b/Userland/Applications/Browser/History/HistoryModel.cpp @@ -38,9 +38,9 @@ ErrorOr HistoryModel::column_name(int column) const { switch (column) { case Column::Title: - return "Title"_short_string; + return "Title"_string; case Column::URL: - return "URL"_short_string; + return "URL"_string; default: VERIFY_NOT_REACHED(); } diff --git a/Userland/Applications/Browser/InspectorWidget.cpp b/Userland/Applications/Browser/InspectorWidget.cpp index 639a91c1326..c7d4f5ef6af 100644 --- a/Userland/Applications/Browser/InspectorWidget.cpp +++ b/Userland/Applications/Browser/InspectorWidget.cpp @@ -84,7 +84,7 @@ InspectorWidget::InspectorWidget() auto& top_tab_widget = splitter.add(); - auto& dom_tree_container = top_tab_widget.add_tab("DOM"_short_string); + auto& dom_tree_container = top_tab_widget.add_tab("DOM"_string); dom_tree_container.set_layout(4); m_dom_tree_view = dom_tree_container.add(); m_dom_tree_view->on_selection_change = [this] { diff --git a/Userland/Applications/Browser/StorageModel.cpp b/Userland/Applications/Browser/StorageModel.cpp index 07eaeff6543..c9aadeb4bf9 100644 --- a/Userland/Applications/Browser/StorageModel.cpp +++ b/Userland/Applications/Browser/StorageModel.cpp @@ -39,9 +39,9 @@ ErrorOr StorageModel::column_name(int column) const { switch (column) { case Column::Key: - return "Key"_short_string; + return "Key"_string; case Column::Value: - return "Value"_short_string; + return "Value"_string; case Column::__Count: return String {}; } diff --git a/Userland/Applications/BrowserSettings/BrowserSettingsWidget.cpp b/Userland/Applications/BrowserSettings/BrowserSettingsWidget.cpp index 651395d7909..fbd7173b835 100644 --- a/Userland/Applications/BrowserSettings/BrowserSettingsWidget.cpp +++ b/Userland/Applications/BrowserSettings/BrowserSettingsWidget.cpp @@ -97,7 +97,7 @@ ErrorOr BrowserSettingsWidget::setup() }; Vector search_engine_fields; - search_engine_fields.empend("title", "Title"_short_string, Gfx::TextAlignment::CenterLeft); + search_engine_fields.empend("title", "Title"_string, Gfx::TextAlignment::CenterLeft); search_engine_fields.empend("url_format", "Url format"_string, Gfx::TextAlignment::CenterLeft); auto search_engines_model = GUI::JsonArrayModel::create(DeprecatedString::formatted("{}/SearchEngines.json", Core::StandardPaths::config_directory()), move(search_engine_fields)); search_engines_model->invalidate(); diff --git a/Userland/Applications/BrowserSettings/main.cpp b/Userland/Applications/BrowserSettings/main.cpp index a8784a35052..780241cb2aa 100644 --- a/Userland/Applications/BrowserSettings/main.cpp +++ b/Userland/Applications/BrowserSettings/main.cpp @@ -37,7 +37,7 @@ ErrorOr serenity_main(Main::Arguments arguments) auto window = TRY(GUI::SettingsWindow::create("Browser Settings", GUI::SettingsWindow::ShowDefaultsButton::Yes)); window->set_icon(app_icon.bitmap_for_size(16)); - (void)TRY(window->add_tab(TRY(BrowserSettingsWidget::create()), "Browser"_short_string, "browser"sv)); + (void)TRY(window->add_tab(TRY(BrowserSettingsWidget::create()), "Browser"_string, "browser"sv)); (void)TRY(window->add_tab(TRY(ContentFilterSettingsWidget::create()), "Content Filtering"_string, "content-filtering"sv)); (void)TRY(window->add_tab(TRY(AutoplaySettingsWidget::create()), "Autoplay"_string, "autoplay"sv)); window->set_active_tab(selected_tab); diff --git a/Userland/Applications/Calculator/CalculatorWidget.cpp b/Userland/Applications/Calculator/CalculatorWidget.cpp index 64a93717a3a..385df9bee96 100644 --- a/Userland/Applications/Calculator/CalculatorWidget.cpp +++ b/Userland/Applications/Calculator/CalculatorWidget.cpp @@ -149,7 +149,7 @@ void CalculatorWidget::update_display() { m_entry->set_text(m_keypad.to_deprecated_string()); if (m_calculator.has_error()) - m_label->set_text("E"_short_string); + m_label->set_text("E"_string); else m_label->set_text({}); } diff --git a/Userland/Applications/Calculator/main.cpp b/Userland/Applications/Calculator/main.cpp index a691e04b722..17325e69656 100644 --- a/Userland/Applications/Calculator/main.cpp +++ b/Userland/Applications/Calculator/main.cpp @@ -39,12 +39,12 @@ ErrorOr serenity_main(Main::Arguments arguments) window->set_icon(app_icon.bitmap_for_size(16)); - auto& file_menu = window->add_menu("&File"_short_string); + auto& file_menu = window->add_menu("&File"_string); file_menu.add_action(GUI::CommonActions::make_quit_action([](auto&) { GUI::Application::the()->quit(); })); - auto& edit_menu = window->add_menu("&Edit"_short_string); + auto& edit_menu = window->add_menu("&Edit"_string); edit_menu.add_action(GUI::CommonActions::make_copy_action([&](auto&) { GUI::Clipboard::the().set_plain_text(widget->get_entry()); })); @@ -71,7 +71,7 @@ ErrorOr serenity_main(Main::Arguments arguments) widget->set_typed_entry(Crypto::BigFraction { Crypto::SignedBigInteger(16180339887), power }); })); - auto& round_menu = window->add_menu("&Round"_short_string); + auto& round_menu = window->add_menu("&Round"_string); GUI::ActionGroup preview_actions; static constexpr auto rounding_modes = Array { 0, 2, 4 }; @@ -121,7 +121,7 @@ ErrorOr serenity_main(Main::Arguments arguments) round_menu.action_at(last_rounding_mode.value())->activate(); - auto& help_menu = window->add_menu("&Help"_short_string); + auto& help_menu = window->add_menu("&Help"_string); help_menu.add_action(GUI::CommonActions::make_command_palette_action(window)); help_menu.add_action(GUI::CommonActions::make_about_action("Calculator", app_icon, window)); diff --git a/Userland/Applications/Calendar/AddEventDialog.cpp b/Userland/Applications/Calendar/AddEventDialog.cpp index cec8890b672..ac615228e51 100644 --- a/Userland/Applications/Calendar/AddEventDialog.cpp +++ b/Userland/Applications/Calendar/AddEventDialog.cpp @@ -94,7 +94,7 @@ AddEventDialog::AddEventDialog(Core::DateTime date_time, EventManager& event_man 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("OK"_short_string); + auto& ok_button = button_container.add("OK"_string); ok_button.set_fixed_size(80, 20); ok_button.on_click = [&](auto) { add_event_to_calendar().release_value_but_fixme_should_propagate_errors(); @@ -142,7 +142,7 @@ ErrorOr AddEventDialog::MonthListModel::column_name(int column) const { switch (column) { case Column::Month: - return "Month"_short_string; + return "Month"_string; default: VERIFY_NOT_REACHED(); } diff --git a/Userland/Applications/Calendar/CalendarWidget.cpp b/Userland/Applications/Calendar/CalendarWidget.cpp index 46bb57b9a39..48baf2fecd1 100644 --- a/Userland/Applications/Calendar/CalendarWidget.cpp +++ b/Userland/Applications/Calendar/CalendarWidget.cpp @@ -82,7 +82,7 @@ ErrorOr> CalendarWidget::create(GUI::Window* paren auto save_as_action = widget->create_save_as_action(); auto save_action = widget->create_save_action(save_as_action); - auto& file_menu = parent_window->add_menu("&File"_short_string); + auto& file_menu = parent_window->add_menu("&File"_string); file_menu.add_action(open_settings_action); file_menu.add_action(new_calendar_action); file_menu.add_action(open_calendar_action); @@ -95,14 +95,14 @@ ErrorOr> CalendarWidget::create(GUI::Window* paren GUI::Application::the()->quit(); }))); - auto& event_menu = parent_window->add_menu("&Event"_short_string); + auto& event_menu = parent_window->add_menu("&Event"_string); event_menu.add_action(add_event_action); - auto view_menu = TRY(parent_window->try_add_menu("&View"_short_string)); + auto view_menu = TRY(parent_window->try_add_menu("&View"_string)); TRY(view_menu->try_add_action(*view_month_action)); TRY(view_menu->try_add_action(*view_year_action)); - auto help_menu = TRY(parent_window->try_add_menu("&Help"_short_string)); + auto help_menu = TRY(parent_window->try_add_menu("&Help"_string)); TRY(help_menu->try_add_action(GUI::CommonActions::make_command_palette_action(parent_window))); TRY(help_menu->try_add_action(GUI::CommonActions::make_about_action("Calendar", TRY(GUI::Icon::try_create_default_icon("app-calendar"sv)), parent_window))); diff --git a/Userland/Applications/CertificateSettings/main.cpp b/Userland/Applications/CertificateSettings/main.cpp index 9b1116f1ef3..84aafadf452 100644 --- a/Userland/Applications/CertificateSettings/main.cpp +++ b/Userland/Applications/CertificateSettings/main.cpp @@ -19,7 +19,7 @@ ErrorOr serenity_main(Main::Arguments args) auto app = TRY(GUI::Application::create(args)); - TRY(Core::System::unveil(TRY(String::formatted("{}/.config/certs.pem", Core::StandardPaths::home_directory())), "rwc"_short_string)); + TRY(Core::System::unveil(TRY(String::formatted("{}/.config/certs.pem", Core::StandardPaths::home_directory())), "rwc"_string)); TRY(Core::System::unveil("/tmp/session/%sid/portal/filesystemaccess", "rw")); TRY(Core::System::unveil("/etc/cacert.pem", "r")); TRY(Core::System::unveil("/etc/timezone", "r")); diff --git a/Userland/Applications/CharacterMap/CharacterMapWidget.cpp b/Userland/Applications/CharacterMap/CharacterMapWidget.cpp index 225b6e78c2a..68e826173a5 100644 --- a/Userland/Applications/CharacterMap/CharacterMapWidget.cpp +++ b/Userland/Applications/CharacterMap/CharacterMapWidget.cpp @@ -159,12 +159,12 @@ CharacterMapWidget::CharacterMapWidget() ErrorOr CharacterMapWidget::initialize_menubar(GUI::Window& window) { - auto file_menu = TRY(window.try_add_menu("&File"_short_string)); + auto file_menu = TRY(window.try_add_menu("&File"_string)); TRY(file_menu->try_add_action(GUI::CommonActions::make_quit_action([](GUI::Action&) { GUI::Application::the()->quit(); }))); - auto help_menu = TRY(window.try_add_menu("&Help"_short_string)); + auto help_menu = TRY(window.try_add_menu("&Help"_string)); TRY(help_menu->try_add_action(GUI::CommonActions::make_command_palette_action(&window))); TRY(help_menu->try_add_action(GUI::CommonActions::make_help_action([&](auto&) { Desktop::Launcher::open(URL::create_with_file_scheme("/usr/share/man/man1/Applications/CharacterMap.md"), "/bin/Help"); diff --git a/Userland/Applications/ClockSettings/main.cpp b/Userland/Applications/ClockSettings/main.cpp index 0ba0eb718eb..ec7ec36021c 100644 --- a/Userland/Applications/ClockSettings/main.cpp +++ b/Userland/Applications/ClockSettings/main.cpp @@ -36,7 +36,7 @@ ErrorOr serenity_main(Main::Arguments arguments) auto app_icon = GUI::Icon::default_icon("app-analog-clock"sv); // FIXME: Create a ClockSettings icon. auto window = TRY(GUI::SettingsWindow::create("Clock Settings", GUI::SettingsWindow::ShowDefaultsButton::Yes)); - (void)TRY(window->add_tab("Clock"_short_string, "clock"sv)); + (void)TRY(window->add_tab("Clock"_string, "clock"sv)); auto timezonesettings_widget = TRY(TimeZoneSettingsWidget::create()); TRY(window->add_tab(timezonesettings_widget, "Time Zone"_string, "time-zone"sv)); diff --git a/Userland/Applications/DisplaySettings/main.cpp b/Userland/Applications/DisplaySettings/main.cpp index fe8285fd926..64dcff1ca33 100644 --- a/Userland/Applications/DisplaySettings/main.cpp +++ b/Userland/Applications/DisplaySettings/main.cpp @@ -38,11 +38,11 @@ ErrorOr serenity_main(Main::Arguments arguments) auto window = TRY(GUI::SettingsWindow::create("Display Settings")); (void)TRY(window->add_tab("Background"_string, "background"sv, background_settings_changed)); - (void)TRY(window->add_tab("Themes"_short_string, "themes"sv, background_settings_changed)); - (void)TRY(window->add_tab("Fonts"_short_string, "fonts"sv)); - (void)TRY(window->add_tab("Monitor"_short_string, "monitor"sv)); + (void)TRY(window->add_tab("Themes"_string, "themes"sv, background_settings_changed)); + (void)TRY(window->add_tab("Fonts"_string, "fonts"sv)); + (void)TRY(window->add_tab("Monitor"_string, "monitor"sv)); (void)TRY(window->add_tab("Workspaces"_string, "workspaces"sv)); - (void)TRY(window->add_tab("Effects"_short_string, "effects"sv)); + (void)TRY(window->add_tab("Effects"_string, "effects"sv)); window->set_active_tab(selected_tab); window->set_icon(app_icon.bitmap_for_size(16)); diff --git a/Userland/Applications/FileManager/PropertiesWindow.cpp b/Userland/Applications/FileManager/PropertiesWindow.cpp index 02cca21c19e..860e2642074 100644 --- a/Userland/Applications/FileManager/PropertiesWindow.cpp +++ b/Userland/Applications/FileManager/PropertiesWindow.cpp @@ -84,17 +84,17 @@ ErrorOr PropertiesWindow::create_widgets(bool disable_rename) TRY(button_widget->add_spacer()); - auto ok_button = TRY(make_button("OK"_short_string, button_widget)); + auto ok_button = TRY(make_button("OK"_string, button_widget)); ok_button->on_click = [this](auto) { if (apply_changes()) close(); }; - auto cancel_button = TRY(make_button("Cancel"_short_string, button_widget)); + auto cancel_button = TRY(make_button("Cancel"_string, button_widget)); cancel_button->on_click = [this](auto) { close(); }; - m_apply_button = TRY(make_button("Apply"_short_string, button_widget)); + m_apply_button = TRY(make_button("Apply"_string, button_widget)); m_apply_button->on_click = [this](auto) { apply_changes(); }; m_apply_button->set_enabled(false); @@ -120,7 +120,7 @@ ErrorOr PropertiesWindow::create_widgets(bool disable_rename) ErrorOr PropertiesWindow::create_general_tab(GUI::TabWidget& tab_widget, bool disable_rename) { - auto general_tab = TRY(tab_widget.try_add_tab("General"_short_string)); + auto general_tab = TRY(tab_widget.try_add_tab("General"_string)); TRY(general_tab->load_from_gml(properties_window_general_tab_gml)); m_icon = general_tab->find_descendant_of_type_named("icon"); @@ -260,7 +260,7 @@ ErrorOr PropertiesWindow::create_archive_tab(GUI::TabWidget& tab_widget, N auto statistics = TRY(zip.calculate_statistics()); - tab->find_descendant_of_type_named("archive_format")->set_text("ZIP"_short_string); + tab->find_descendant_of_type_named("archive_format")->set_text("ZIP"_string); tab->find_descendant_of_type_named("archive_file_count")->set_text(TRY(String::number(statistics.file_count()))); tab->find_descendant_of_type_named("archive_directory_count")->set_text(TRY(String::number(statistics.directory_count()))); tab->find_descendant_of_type_named("archive_uncompressed_size")->set_text(TRY(String::from_deprecated_string(AK::human_readable_size(statistics.total_uncompressed_bytes())))); @@ -277,7 +277,7 @@ ErrorOr PropertiesWindow::create_audio_tab(GUI::TabWidget& tab_widget, Non } auto loader = loader_or_error.release_value(); - auto tab = TRY(tab_widget.try_add_tab("Audio"_short_string)); + auto tab = TRY(tab_widget.try_add_tab("Audio"_string)); TRY(tab->load_from_gml(properties_window_audio_tab_gml)); tab->find_descendant_of_type_named("audio_type")->set_text(TRY(String::from_deprecated_string(loader->format_name()))); @@ -359,7 +359,7 @@ ErrorOr PropertiesWindow::create_font_tab(GUI::TabWidget& tab_widget, Nonn auto font_info = font_info_or_error.release_value(); auto& typeface = font_info.typeface; - auto tab = TRY(tab_widget.try_add_tab("Font"_short_string)); + auto tab = TRY(tab_widget.try_add_tab("Font"_string)); TRY(tab->load_from_gml(properties_window_font_tab_gml)); String format_name; @@ -382,7 +382,7 @@ ErrorOr PropertiesWindow::create_font_tab(GUI::TabWidget& tab_widget, Nonn } tab->find_descendant_of_type_named("font_format")->set_text(format_name); tab->find_descendant_of_type_named("font_family")->set_text(TRY(String::from_deprecated_string(typeface->family()))); - tab->find_descendant_of_type_named("font_fixed_width")->set_text(typeface->is_fixed_width() ? "Yes"_short_string : "No"_short_string); + tab->find_descendant_of_type_named("font_fixed_width")->set_text(typeface->is_fixed_width() ? "Yes"_string : "No"_string); tab->find_descendant_of_type_named("font_width")->set_text(TRY(String::from_utf8(Gfx::width_to_name(static_cast(typeface->width()))))); auto nearest_weight_class_name = [](unsigned weight) { @@ -404,7 +404,7 @@ ErrorOr PropertiesWindow::create_image_tab(GUI::TabWidget& tab_widget, Non if (!image_decoder) return {}; - auto tab = TRY(tab_widget.try_add_tab("Image"_short_string)); + auto tab = TRY(tab_widget.try_add_tab("Image"_string)); TRY(tab->load_from_gml(properties_window_image_tab_gml)); tab->find_descendant_of_type_named("image_type")->set_text(TRY(String::from_utf8(mime_type))); @@ -426,7 +426,7 @@ ErrorOr PropertiesWindow::create_image_tab(GUI::TabWidget& tab_widget, Non animation_text = TRY(builder.to_string()); } else { - animation_text = "None"_short_string; + animation_text = "None"_string; } tab->find_descendant_of_type_named("image_animation")->set_text(move(animation_text)); @@ -450,7 +450,7 @@ ErrorOr PropertiesWindow::create_image_tab(GUI::TabWidget& tab_widget, Non } } else { - hide_icc_group("None"_short_string); + hide_icc_group("None"_string); } return {}; @@ -467,7 +467,7 @@ ErrorOr PropertiesWindow::create_pdf_tab(GUI::TabWidget& tab_widget, Nonnu if (auto handler = document->security_handler(); handler && !handler->has_user_password()) { // FIXME: Show a password dialog, once we've switched to lazy-loading - auto tab = TRY(tab_widget.try_add_tab("PDF"_short_string)); + auto tab = TRY(tab_widget.try_add_tab("PDF"_string)); tab->set_text("PDF is password-protected."_string); return {}; } @@ -477,7 +477,7 @@ ErrorOr PropertiesWindow::create_pdf_tab(GUI::TabWidget& tab_widget, Nonnu return {}; } - auto tab = TRY(tab_widget.try_add_tab("PDF"_short_string)); + auto tab = TRY(tab_widget.try_add_tab("PDF"_string)); TRY(tab->load_from_gml(properties_window_pdf_tab_gml)); tab->find_descendant_of_type_named("pdf_version")->set_text(TRY(String::formatted("{}.{}", document->version().major, document->version().minor))); diff --git a/Userland/Applications/FileManager/main.cpp b/Userland/Applications/FileManager/main.cpp index 5b08a493647..79a416b2b16 100644 --- a/Userland/Applications/FileManager/main.cpp +++ b/Userland/Applications/FileManager/main.cpp @@ -993,7 +993,7 @@ ErrorOr run_in_windowed_mode(DeprecatedString const& initial_location, Depr refresh_tree_view(); }); - auto file_menu = TRY(window->try_add_menu("&File"_short_string)); + auto file_menu = TRY(window->try_add_menu("&File"_string)); TRY(file_menu->try_add_action(mkdir_action)); TRY(file_menu->try_add_action(touch_action)); TRY(file_menu->try_add_action(focus_dependent_delete_action)); @@ -1005,7 +1005,7 @@ ErrorOr run_in_windowed_mode(DeprecatedString const& initial_location, Depr GUI::Application::the()->quit(); }))); - auto edit_menu = TRY(window->try_add_menu("&Edit"_short_string)); + auto edit_menu = TRY(window->try_add_menu("&Edit"_string)); TRY(edit_menu->try_add_action(cut_action)); TRY(edit_menu->try_add_action(copy_action)); TRY(edit_menu->try_add_action(paste_action)); @@ -1028,8 +1028,8 @@ ErrorOr run_in_windowed_mode(DeprecatedString const& initial_location, Depr show_dotfiles_action->set_checked(show_dotfiles); show_dotfiles_in_view(show_dotfiles); - auto view_menu = TRY(window->try_add_menu("&View"_short_string)); - auto layout_menu = TRY(view_menu->try_add_submenu("&Layout"_short_string)); + auto view_menu = TRY(window->try_add_menu("&View"_string)); + auto layout_menu = TRY(view_menu->try_add_submenu("&Layout"_string)); TRY(layout_menu->try_add_action(*layout_toolbar_action)); TRY(layout_menu->try_add_action(*layout_location_action)); TRY(layout_menu->try_add_action(*layout_statusbar_action)); @@ -1049,7 +1049,7 @@ ErrorOr run_in_windowed_mode(DeprecatedString const& initial_location, Depr breadcrumbbar.show_location_text_box(); }); - auto go_menu = TRY(window->try_add_menu("&Go"_short_string)); + auto go_menu = TRY(window->try_add_menu("&Go"_string)); TRY(go_menu->try_add_action(go_back_action)); TRY(go_menu->try_add_action(go_forward_action)); TRY(go_menu->try_add_action(open_parent_directory_action)); @@ -1059,7 +1059,7 @@ ErrorOr run_in_windowed_mode(DeprecatedString const& initial_location, Depr TRY(go_menu->try_add_separator()); TRY(go_menu->try_add_action(directory_view->open_terminal_action())); - auto help_menu = TRY(window->try_add_menu("&Help"_short_string)); + auto help_menu = TRY(window->try_add_menu("&Help"_string)); TRY(help_menu->try_add_action(GUI::CommonActions::make_command_palette_action(window))); TRY(help_menu->try_add_action(GUI::CommonActions::make_about_action("File Manager"sv, GUI::Icon::default_icon("app-file-manager"sv), window))); diff --git a/Userland/Applications/FontEditor/MainWidget.cpp b/Userland/Applications/FontEditor/MainWidget.cpp index b3c5ecadd63..28ca867925e 100644 --- a/Userland/Applications/FontEditor/MainWidget.cpp +++ b/Userland/Applications/FontEditor/MainWidget.cpp @@ -733,7 +733,7 @@ ErrorOr MainWidget::initialize(StringView path, RefPtr&& ErrorOr MainWidget::initialize_menubar(GUI::Window& window) { - auto file_menu = TRY(window.try_add_menu("&File"_short_string)); + auto file_menu = TRY(window.try_add_menu("&File"_string)); TRY(file_menu->try_add_action(*m_new_action)); TRY(file_menu->try_add_action(*m_open_action)); TRY(file_menu->try_add_action(*m_save_action)); @@ -755,7 +755,7 @@ ErrorOr MainWidget::initialize_menubar(GUI::Window& window) GUI::Application::the()->quit(); }))); - auto edit_menu = TRY(window.try_add_menu("&Edit"_short_string)); + auto edit_menu = TRY(window.try_add_menu("&Edit"_string)); TRY(edit_menu->try_add_action(*m_undo_action)); TRY(edit_menu->try_add_action(*m_redo_action)); TRY(edit_menu->try_add_separator()); @@ -770,13 +770,13 @@ ErrorOr MainWidget::initialize_menubar(GUI::Window& window) m_context_menu = edit_menu; - auto go_menu = TRY(window.try_add_menu("&Go"_short_string)); + auto go_menu = TRY(window.try_add_menu("&Go"_string)); TRY(go_menu->try_add_action(*m_previous_glyph_action)); TRY(go_menu->try_add_action(*m_next_glyph_action)); TRY(go_menu->try_add_action(*m_go_to_glyph_action)); - auto view_menu = TRY(window.try_add_menu("&View"_short_string)); - auto layout_menu = TRY(view_menu->try_add_submenu("&Layout"_short_string)); + auto view_menu = TRY(window.try_add_menu("&View"_string)); + auto layout_menu = TRY(view_menu->try_add_submenu("&Layout"_string)); TRY(layout_menu->try_add_action(*m_show_toolbar_action)); TRY(layout_menu->try_add_action(*m_show_statusbar_action)); TRY(layout_menu->try_add_action(*m_show_metadata_action)); @@ -787,13 +787,13 @@ ErrorOr MainWidget::initialize_menubar(GUI::Window& window) TRY(view_menu->try_add_action(*m_highlight_modifications_action)); TRY(view_menu->try_add_action(*m_show_system_emoji_action)); TRY(view_menu->try_add_separator()); - auto scale_menu = TRY(view_menu->try_add_submenu("&Scale"_short_string)); + auto scale_menu = TRY(view_menu->try_add_submenu("&Scale"_string)); scale_menu->set_icon(g_resources.scale_editor); TRY(scale_menu->try_add_action(*m_scale_five_action)); TRY(scale_menu->try_add_action(*m_scale_ten_action)); TRY(scale_menu->try_add_action(*m_scale_fifteen_action)); - auto help_menu = TRY(window.try_add_menu("&Help"_short_string)); + auto help_menu = TRY(window.try_add_menu("&Help"_string)); TRY(help_menu->try_add_action(GUI::CommonActions::make_command_palette_action(&window))); TRY(help_menu->try_add_action(GUI::CommonActions::make_help_action([](auto&) { Desktop::Launcher::open(URL::create_with_file_scheme("/usr/share/man/man1/Applications/FontEditor.md"), "/bin/Help"); diff --git a/Userland/Applications/GamesSettings/main.cpp b/Userland/Applications/GamesSettings/main.cpp index 7e22533c777..7f4cb56d6d9 100644 --- a/Userland/Applications/GamesSettings/main.cpp +++ b/Userland/Applications/GamesSettings/main.cpp @@ -35,8 +35,8 @@ ErrorOr serenity_main(Main::Arguments arguments) auto window = TRY(GUI::SettingsWindow::create("Games Settings", GUI::SettingsWindow::ShowDefaultsButton::Yes)); window->set_icon(app_icon.bitmap_for_size(16)); - (void)TRY(window->add_tab("Cards"_short_string, "cards"sv)); - (void)TRY(window->add_tab("Chess"_short_string, "chess"sv)); + (void)TRY(window->add_tab("Cards"_string, "cards"sv)); + (void)TRY(window->add_tab("Chess"_string, "chess"sv)); window->set_active_tab(selected_tab); window->show(); diff --git a/Userland/Applications/Help/MainWidget.cpp b/Userland/Applications/Help/MainWidget.cpp index de0f47a81ba..653d20cb18a 100644 --- a/Userland/Applications/Help/MainWidget.cpp +++ b/Userland/Applications/Help/MainWidget.cpp @@ -205,17 +205,17 @@ ErrorOr MainWidget::initialize_fallibles(GUI::Window& window) (void)TRY(m_toolbar->try_add_action(*m_go_forward_action)); (void)TRY(m_toolbar->try_add_action(*m_go_home_action)); - auto file_menu = TRY(window.try_add_menu("&File"_short_string)); + auto file_menu = TRY(window.try_add_menu("&File"_string)); TRY(file_menu->try_add_action(GUI::CommonActions::make_quit_action([](auto&) { GUI::Application::the()->quit(); }))); - auto go_menu = TRY(window.try_add_menu("&Go"_short_string)); + auto go_menu = TRY(window.try_add_menu("&Go"_string)); TRY(go_menu->try_add_action(*m_go_back_action)); TRY(go_menu->try_add_action(*m_go_forward_action)); TRY(go_menu->try_add_action(*m_go_home_action)); - auto help_menu = TRY(window.try_add_menu("&Help"_short_string)); + auto help_menu = TRY(window.try_add_menu("&Help"_string)); String help_page_path = TRY(TRY(try_make_ref_counted(Manual::sections[1 - 1], "Applications/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&) { diff --git a/Userland/Applications/HexEditor/HexEditorWidget.cpp b/Userland/Applications/HexEditor/HexEditorWidget.cpp index 373e9448df5..fdb8cd7e478 100644 --- a/Userland/Applications/HexEditor/HexEditorWidget.cpp +++ b/Userland/Applications/HexEditor/HexEditorWidget.cpp @@ -412,7 +412,7 @@ void HexEditorWidget::update_inspector_values(size_t position) ErrorOr HexEditorWidget::initialize_menubar(GUI::Window& window) { - auto file_menu = TRY(window.try_add_menu("&File"_short_string)); + auto file_menu = TRY(window.try_add_menu("&File"_string)); TRY(file_menu->try_add_action(*m_new_action)); TRY(file_menu->try_add_action(*m_open_action)); TRY(file_menu->try_add_action(*m_save_action)); @@ -433,7 +433,7 @@ ErrorOr HexEditorWidget::initialize_menubar(GUI::Window& window) GUI::Application::the()->quit(); }))); - auto edit_menu = TRY(window.try_add_menu("&Edit"_short_string)); + auto edit_menu = TRY(window.try_add_menu("&Edit"_string)); TRY(edit_menu->try_add_action(*m_undo_action)); TRY(edit_menu->try_add_action(*m_redo_action)); TRY(edit_menu->try_add_separator()); @@ -480,7 +480,7 @@ ErrorOr HexEditorWidget::initialize_menubar(GUI::Window& window) TRY(edit_menu->try_add_separator()); TRY(edit_menu->try_add_action(*m_goto_offset_action)); - auto view_menu = TRY(window.try_add_menu("&View"_short_string)); + auto view_menu = TRY(window.try_add_menu("&View"_string)); auto show_toolbar = Config::read_bool("HexEditor"sv, "Layout"sv, "ShowToolbar"sv, true); m_layout_toolbar_action->set_checked(show_toolbar); @@ -541,7 +541,7 @@ ErrorOr HexEditorWidget::initialize_menubar(GUI::Window& window) little_endian_mode->set_checked(use_little_endian); big_endian_mode->set_checked(!use_little_endian); - auto help_menu = TRY(window.try_add_menu("&Help"_short_string)); + auto help_menu = TRY(window.try_add_menu("&Help"_string)); TRY(help_menu->try_add_action(GUI::CommonActions::make_command_palette_action(&window))); TRY(help_menu->try_add_action(GUI::CommonActions::make_help_action([](auto&) { Desktop::Launcher::open(URL::create_with_file_scheme("/usr/share/man/man1/Applications/HexEditor.md"), "/bin/Help"); diff --git a/Userland/Applications/HexEditor/SearchResultsModel.h b/Userland/Applications/HexEditor/SearchResultsModel.h index ce4e39c86f0..3074ff65753 100644 --- a/Userland/Applications/HexEditor/SearchResultsModel.h +++ b/Userland/Applications/HexEditor/SearchResultsModel.h @@ -44,9 +44,9 @@ public: { switch (column) { case Column::Offset: - return "Offset"_short_string; + return "Offset"_string; case Column::Value: - return "Value"_short_string; + return "Value"_string; } VERIFY_NOT_REACHED(); } diff --git a/Userland/Applications/HexEditor/ValueInspectorModel.h b/Userland/Applications/HexEditor/ValueInspectorModel.h index 243bdb370fb..58550e7b03c 100644 --- a/Userland/Applications/HexEditor/ValueInspectorModel.h +++ b/Userland/Applications/HexEditor/ValueInspectorModel.h @@ -67,7 +67,7 @@ public: { switch (column) { case Column::Type: - return "Type"_short_string; + return "Type"_string; case Column::Value: return m_is_little_endian ? "Value (Little Endian)"_string : "Value (Big Endian)"_string; } diff --git a/Userland/Applications/ImageViewer/main.cpp b/Userland/Applications/ImageViewer/main.cpp index c805142de43..350568e8ed7 100644 --- a/Userland/Applications/ImageViewer/main.cpp +++ b/Userland/Applications/ImageViewer/main.cpp @@ -306,7 +306,7 @@ ErrorOr serenity_main(Main::Arguments arguments) (void)TRY(main_toolbar->try_add_action(reset_zoom_action)); (void)TRY(main_toolbar->try_add_action(zoom_out_action)); - auto file_menu = TRY(window->try_add_menu("&File"_short_string)); + auto file_menu = TRY(window->try_add_menu("&File"_string)); TRY(file_menu->try_add_action(open_action)); TRY(file_menu->try_add_action(delete_action)); TRY(file_menu->try_add_separator()); @@ -323,7 +323,7 @@ ErrorOr serenity_main(Main::Arguments arguments) TRY(file_menu->try_add_action(quit_action)); - auto image_menu = TRY(window->try_add_menu("&Image"_short_string)); + auto image_menu = TRY(window->try_add_menu("&Image"_string)); TRY(image_menu->try_add_action(rotate_counterclockwise_action)); TRY(image_menu->try_add_action(rotate_clockwise_action)); TRY(image_menu->try_add_action(vertical_flip_action)); @@ -337,7 +337,7 @@ ErrorOr serenity_main(Main::Arguments arguments) TRY(navigate_menu->try_add_action(go_forward_action)); TRY(navigate_menu->try_add_action(go_last_action)); - auto view_menu = TRY(window->try_add_menu("&View"_short_string)); + auto view_menu = TRY(window->try_add_menu("&View"_string)); TRY(view_menu->try_add_action(full_screen_action)); TRY(view_menu->try_add_separator()); TRY(view_menu->try_add_action(zoom_in_action)); @@ -364,7 +364,7 @@ ErrorOr serenity_main(Main::Arguments arguments) TRY(view_menu->try_add_separator()); TRY(view_menu->try_add_action(hide_show_toolbar_action)); - auto help_menu = TRY(window->try_add_menu("&Help"_short_string)); + auto help_menu = TRY(window->try_add_menu("&Help"_string)); TRY(help_menu->try_add_action(GUI::CommonActions::make_command_palette_action(window))); TRY(help_menu->try_add_action(GUI::CommonActions::make_help_action([](auto&) { Desktop::Launcher::open(URL::create_with_file_scheme("/usr/share/man/man1/Applications/ImageViewer.md"), "/bin/Help"); diff --git a/Userland/Applications/KeyboardMapper/KeyboardMapperWidget.cpp b/Userland/Applications/KeyboardMapper/KeyboardMapperWidget.cpp index 4d550aacf4c..65d21482593 100644 --- a/Userland/Applications/KeyboardMapper/KeyboardMapperWidget.cpp +++ b/Userland/Applications/KeyboardMapper/KeyboardMapperWidget.cpp @@ -88,10 +88,10 @@ void KeyboardMapperWidget::create_frame() m_map_group->set_layout(); m_map_group->set_fixed_width(450); - 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("map"sv, "Default"_string); + add_map_radio_button("shift_map"sv, "Shift"_string); + add_map_radio_button("altgr_map"sv, "AltGr"_string); + add_map_radio_button("alt_map"sv, "Alt"_string); add_map_radio_button("shift_altgr_map"sv, "Shift+AltGr"_string); bottom_widget.add_spacer().release_value_but_fixme_should_propagate_errors(); diff --git a/Userland/Applications/KeyboardMapper/main.cpp b/Userland/Applications/KeyboardMapper/main.cpp index 65d34f7e8ed..ed43b95e7df 100644 --- a/Userland/Applications/KeyboardMapper/main.cpp +++ b/Userland/Applications/KeyboardMapper/main.cpp @@ -83,7 +83,7 @@ ErrorOr serenity_main(Main::Arguments arguments) auto_modifier_action->set_checkable(true); auto_modifier_action->set_checked(false); - auto& file_menu = window->add_menu("&File"_short_string); + auto& file_menu = window->add_menu("&File"_string); file_menu.add_action(open_action); file_menu.add_action(save_action); file_menu.add_action(save_as_action); @@ -93,7 +93,7 @@ ErrorOr serenity_main(Main::Arguments arguments) auto& settings_menu = window->add_menu("&Settings"_string); settings_menu.add_action(auto_modifier_action); - auto& help_menu = window->add_menu("&Help"_short_string); + auto& help_menu = window->add_menu("&Help"_string); help_menu.add_action(GUI::CommonActions::make_command_palette_action(window)); help_menu.add_action(GUI::CommonActions::make_about_action("Keyboard Mapper", app_icon, window)); diff --git a/Userland/Applications/Magnifier/main.cpp b/Userland/Applications/Magnifier/main.cpp index 311b48276b8..0400c7d10c8 100644 --- a/Userland/Applications/Magnifier/main.cpp +++ b/Userland/Applications/Magnifier/main.cpp @@ -61,7 +61,7 @@ ErrorOr serenity_main(Main::Arguments arguments) window->set_icon(app_icon.bitmap_for_size(16)); auto magnifier = TRY(window->set_main_widget()); - auto file_menu = TRY(window->try_add_menu("&File"_short_string)); + auto file_menu = TRY(window->try_add_menu("&File"_string)); TRY(file_menu->try_add_action(GUI::CommonActions::make_save_as_action([&](auto&) { AK::DeprecatedString filename = "file for saving"; auto do_save = [&]() -> ErrorOr { @@ -142,7 +142,7 @@ ErrorOr serenity_main(Main::Arguments arguments) size_action_group->add_action(eight_x_action); size_action_group->set_exclusive(true); - auto view_menu = TRY(window->try_add_menu("&View"_short_string)); + auto view_menu = TRY(window->try_add_menu("&View"_string)); TRY(view_menu->try_add_action(two_x_action)); TRY(view_menu->try_add_action(four_x_action)); TRY(view_menu->try_add_action(eight_x_action)); @@ -172,7 +172,7 @@ ErrorOr serenity_main(Main::Arguments arguments) TRY(window->try_add_menu(TRY(GUI::CommonMenus::make_accessibility_menu(magnifier)))); - auto help_menu = TRY(window->try_add_menu("&Help"_short_string)); + auto help_menu = TRY(window->try_add_menu("&Help"_string)); TRY(help_menu->try_add_action(GUI::CommonActions::make_command_palette_action(window))); TRY(help_menu->try_add_action(GUI::CommonActions::make_help_action([](auto&) { Desktop::Launcher::open(URL::create_with_file_scheme("/usr/share/man/man1/Applications/Magnifier.md"), "/bin/Help"); diff --git a/Userland/Applications/Mail/InboxModel.cpp b/Userland/Applications/Mail/InboxModel.cpp index 4519014ffdd..0b779277c40 100644 --- a/Userland/Applications/Mail/InboxModel.cpp +++ b/Userland/Applications/Mail/InboxModel.cpp @@ -21,9 +21,9 @@ ErrorOr InboxModel::column_name(int column_index) const { switch (column_index) { case Column::From: - return "From"_short_string; + return "From"_string; case Subject: - return "Subject"_short_string; + return "Subject"_string; default: VERIFY_NOT_REACHED(); } diff --git a/Userland/Applications/Mail/main.cpp b/Userland/Applications/Mail/main.cpp index 4d7f90fedf6..e27a8b0ddbd 100644 --- a/Userland/Applications/Mail/main.cpp +++ b/Userland/Applications/Mail/main.cpp @@ -45,14 +45,14 @@ ErrorOr serenity_main(Main::Arguments arguments) window->set_title("Mail"); window->resize(640, 400); - auto& file_menu = window->add_menu("&File"_short_string); + auto& file_menu = window->add_menu("&File"_string); file_menu.add_action(GUI::CommonActions::make_quit_action([&](auto&) { mail_widget->on_window_close(); app->quit(); })); - auto& help_menu = window->add_menu("&Help"_short_string); + auto& help_menu = window->add_menu("&Help"_string); help_menu.add_action(GUI::CommonActions::make_command_palette_action(window)); help_menu.add_action(GUI::CommonActions::make_about_action("Mail", app_icon, window)); diff --git a/Userland/Applications/MailSettings/main.cpp b/Userland/Applications/MailSettings/main.cpp index 8e6af3c2807..44e1345883a 100644 --- a/Userland/Applications/MailSettings/main.cpp +++ b/Userland/Applications/MailSettings/main.cpp @@ -34,7 +34,7 @@ ErrorOr serenity_main(Main::Arguments arguments) auto app_icon = GUI::Icon::default_icon("app-mail"sv); auto window = TRY(GUI::SettingsWindow::create("Mail Settings", GUI::SettingsWindow::ShowDefaultsButton::Yes)); - (void)TRY(window->add_tab("Mail"_short_string, "mail"sv)); + (void)TRY(window->add_tab("Mail"_string, "mail"sv)); window->set_icon(app_icon.bitmap_for_size(16)); window->set_active_tab(selected_tab); diff --git a/Userland/Applications/MouseSettings/ThemeWidget.cpp b/Userland/Applications/MouseSettings/ThemeWidget.cpp index 815332eb4c1..c595f23fc58 100644 --- a/Userland/Applications/MouseSettings/ThemeWidget.cpp +++ b/Userland/Applications/MouseSettings/ThemeWidget.cpp @@ -21,7 +21,7 @@ ErrorOr MouseCursorModel::column_name(int column_index) const case Column::Bitmap: return String {}; case Column::Name: - return "Name"_short_string; + return "Name"_string; } VERIFY_NOT_REACHED(); } diff --git a/Userland/Applications/MouseSettings/main.cpp b/Userland/Applications/MouseSettings/main.cpp index dbe13433b2a..df34f981b33 100644 --- a/Userland/Applications/MouseSettings/main.cpp +++ b/Userland/Applications/MouseSettings/main.cpp @@ -34,7 +34,7 @@ ErrorOr serenity_main(Main::Arguments arguments) auto app_icon = GUI::Icon::default_icon("app-mouse"sv); auto window = TRY(GUI::SettingsWindow::create("Mouse Settings", GUI::SettingsWindow::ShowDefaultsButton::Yes)); - (void)TRY(window->add_tab("Mouse"_short_string, "mouse"sv)); + (void)TRY(window->add_tab("Mouse"_string, "mouse"sv)); (void)TRY(window->add_tab("Cursor Theme"_string, "cursor-theme"sv)); (void)TRY(window->add_tab("Cursor Highlight"_string, "cursor-highlight"sv)); diff --git a/Userland/Applications/NetworkSettings/main.cpp b/Userland/Applications/NetworkSettings/main.cpp index b29c96031c5..cdd4998d66f 100644 --- a/Userland/Applications/NetworkSettings/main.cpp +++ b/Userland/Applications/NetworkSettings/main.cpp @@ -36,7 +36,7 @@ ErrorOr serenity_main(Main::Arguments args) auto app_icon = GUI::Icon::default_icon("network"sv); auto window = TRY(GUI::SettingsWindow::create("Network Settings", GUI::SettingsWindow::ShowDefaultsButton::No)); - auto network_settings_widget = TRY(window->add_tab("Network"_short_string, "network"sv)); + auto network_settings_widget = TRY(window->add_tab("Network"_string, "network"sv)); if (!adapter.is_null()) { network_settings_widget->switch_adapter(adapter); } diff --git a/Userland/Applications/PDFViewer/PDFViewerWidget.cpp b/Userland/Applications/PDFViewer/PDFViewerWidget.cpp index 9d6a6f2b2b6..0ce5e73efb3 100644 --- a/Userland/Applications/PDFViewer/PDFViewerWidget.cpp +++ b/Userland/Applications/PDFViewer/PDFViewerWidget.cpp @@ -68,9 +68,9 @@ public: { switch (index) { case 0: - return "Page"_short_string; + return "Page"_string; case 1: - return "Message"_short_string; + return "Message"_string; default: VERIFY_NOT_REACHED(); } @@ -208,7 +208,7 @@ PDFViewerWidget::PDFViewerWidget() ErrorOr PDFViewerWidget::initialize_menubar(GUI::Window& window) { - auto file_menu = TRY(window.try_add_menu("&File"_short_string)); + auto file_menu = TRY(window.try_add_menu("&File"_string)); TRY(file_menu->try_add_action(GUI::CommonActions::make_open_action([&](auto&) { FileSystemAccessClient::OpenFileOptions options { .allowed_file_types = Vector { @@ -230,7 +230,7 @@ ErrorOr PDFViewerWidget::initialize_menubar(GUI::Window& window) GUI::Application::the()->quit(); }))); - auto view_menu = TRY(window.try_add_menu("&View"_short_string)); + auto view_menu = TRY(window.try_add_menu("&View"_string)); TRY(view_menu->try_add_action(*m_toggle_sidebar_action)); TRY(view_menu->try_add_separator()); auto view_mode_menu = TRY(view_menu->try_add_submenu("View &Mode"_string)); @@ -241,7 +241,7 @@ ErrorOr PDFViewerWidget::initialize_menubar(GUI::Window& window) TRY(view_menu->try_add_action(*m_zoom_out_action)); TRY(view_menu->try_add_action(*m_reset_zoom_action)); - auto help_menu = TRY(window.try_add_menu("&Help"_short_string)); + auto help_menu = TRY(window.try_add_menu("&Help"_string)); TRY(help_menu->try_add_action(GUI::CommonActions::make_command_palette_action(&window))); TRY(help_menu->try_add_action(GUI::CommonActions::make_about_action("PDF Viewer", GUI::Icon::default_icon("app-pdf-viewer"sv), &window))); return {}; diff --git a/Userland/Applications/PDFViewer/SidebarWidget.cpp b/Userland/Applications/PDFViewer/SidebarWidget.cpp index dda993343a0..911a55e7dce 100644 --- a/Userland/Applications/PDFViewer/SidebarWidget.cpp +++ b/Userland/Applications/PDFViewer/SidebarWidget.cpp @@ -17,7 +17,7 @@ SidebarWidget::SidebarWidget() auto& tab_bar = add(); - auto& outline_container = tab_bar.add_tab("Outline"_short_string); + auto& outline_container = tab_bar.add_tab("Outline"_string); outline_container.set_layout(4); m_outline_tree_view = outline_container.add(); diff --git a/Userland/Applications/PartitionEditor/PartitionModel.cpp b/Userland/Applications/PartitionEditor/PartitionModel.cpp index 9981de101cb..6f8b53ae7a1 100644 --- a/Userland/Applications/PartitionEditor/PartitionModel.cpp +++ b/Userland/Applications/PartitionEditor/PartitionModel.cpp @@ -29,7 +29,7 @@ ErrorOr PartitionModel::column_name(int column) const case Column::TotalBlocks: return "Total Blocks"_string; case Column::Size: - return "Size"_short_string; + return "Size"_string; default: VERIFY_NOT_REACHED(); } diff --git a/Userland/Applications/PartitionEditor/main.cpp b/Userland/Applications/PartitionEditor/main.cpp index 77a0a2c604a..09eaaa53b43 100644 --- a/Userland/Applications/PartitionEditor/main.cpp +++ b/Userland/Applications/PartitionEditor/main.cpp @@ -80,12 +80,12 @@ ErrorOr serenity_main(Main::Arguments arguments) partition_table_view.set_model(partition_model); partition_table_view.set_focus(true); - auto& file_menu = window->add_menu("&File"_short_string); + auto& file_menu = window->add_menu("&File"_string); file_menu.add_action(GUI::CommonActions::make_quit_action([&](auto&) { app->quit(); })); - auto help_menu = TRY(window->try_add_menu("&Help"_short_string)); + auto help_menu = TRY(window->try_add_menu("&Help"_string)); TRY(help_menu->try_add_action(GUI::CommonActions::make_command_palette_action(window))); TRY(help_menu->try_add_action(GUI::CommonActions::make_about_action("Partition Editor", app_icon, window))); diff --git a/Userland/Applications/Piano/MainWidget.cpp b/Userland/Applications/Piano/MainWidget.cpp index fe121547383..d53aee8a29c 100644 --- a/Userland/Applications/Piano/MainWidget.cpp +++ b/Userland/Applications/Piano/MainWidget.cpp @@ -48,7 +48,7 @@ ErrorOr MainWidget::initialize() m_roll_widget->set_fixed_height(300); - (void)TRY(m_tab_widget->try_add_tab("Sampler"_short_string, m_track_manager)); + (void)TRY(m_tab_widget->try_add_tab("Sampler"_string, m_track_manager)); m_player_widget = TRY(try_add(m_track_manager, *this, m_audio_loop)); m_keys_and_knobs_container = TRY(try_add()); @@ -61,7 +61,7 @@ ErrorOr MainWidget::initialize() m_octave_container = TRY(m_keys_and_knobs_container->try_add()); m_octave_container->set_preferred_width(GUI::SpecialDimension::Fit); TRY(m_octave_container->try_set_layout()); - auto octave_label = TRY(m_octave_container->try_add("Octave"_short_string)); + auto octave_label = TRY(m_octave_container->try_add("Octave"_string)); octave_label->set_preferred_width(GUI::SpecialDimension::Fit); m_octave_value = TRY(m_octave_container->try_add(TRY(String::number(m_track_manager.keyboard()->virtual_keyboard_octave())))); m_octave_value->set_preferred_width(GUI::SpecialDimension::Fit); diff --git a/Userland/Applications/Piano/PlayerWidget.cpp b/Userland/Applications/Piano/PlayerWidget.cpp index d5afb4f8f05..4ba18a50ebe 100644 --- a/Userland/Applications/Piano/PlayerWidget.cpp +++ b/Userland/Applications/Piano/PlayerWidget.cpp @@ -45,7 +45,7 @@ ErrorOr PlayerWidget::initialize() set_fill_with_background_color(true); TRY(m_track_number_choices.try_append("1")); - RefPtr label = TRY(try_add("Track"_short_string)); + RefPtr label = TRY(try_add("Track"_string)); label->set_max_width(75); m_track_dropdown = TRY(try_add()); diff --git a/Userland/Applications/Piano/main.cpp b/Userland/Applications/Piano/main.cpp index a29e64f9e3c..c139090d5a2 100644 --- a/Userland/Applications/Piano/main.cpp +++ b/Userland/Applications/Piano/main.cpp @@ -58,7 +58,7 @@ ErrorOr serenity_main(Main::Arguments arguments) })); main_widget_updater->start(); - auto file_menu = TRY(window->try_add_menu("&File"_short_string)); + auto file_menu = TRY(window->try_add_menu("&File"_string)); TRY(file_menu->try_add_action(GUI::Action::create("Export...", { Mod_Ctrl, Key_E }, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/file-export.png"sv)), [&](const GUI::Action&) { save_path = GUI::FilePicker::get_save_filepath(window, "Untitled", "wav"); if (!save_path.has_value()) @@ -83,10 +83,10 @@ ErrorOr serenity_main(Main::Arguments arguments) return; }))); - auto edit_menu = TRY(window->try_add_menu("&Edit"_short_string)); + auto edit_menu = TRY(window->try_add_menu("&Edit"_string)); TRY(main_widget->add_track_actions(edit_menu)); - auto help_menu = TRY(window->try_add_menu("&Help"_short_string)); + auto help_menu = TRY(window->try_add_menu("&Help"_string)); TRY(help_menu->try_add_action(GUI::CommonActions::make_command_palette_action(window))); TRY(help_menu->try_add_action(GUI::CommonActions::make_about_action("Piano", app_icon, window))); diff --git a/Userland/Applications/PixelPaint/CreateNewImageDialog.cpp b/Userland/Applications/PixelPaint/CreateNewImageDialog.cpp index 551898158b5..f6aa98506af 100644 --- a/Userland/Applications/PixelPaint/CreateNewImageDialog.cpp +++ b/Userland/Applications/PixelPaint/CreateNewImageDialog.cpp @@ -32,7 +32,7 @@ CreateNewImageDialog::CreateNewImageDialog(GUI::Window* parent_window) main_widget->set_layout(4); - auto& name_label = main_widget->add("Name:"_short_string); + auto& name_label = main_widget->add("Name:"_string); name_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); m_name_textbox = main_widget->add(); @@ -42,12 +42,12 @@ CreateNewImageDialog::CreateNewImageDialog(GUI::Window* parent_window) auto default_name = Config::read_string("PixelPaint"sv, "NewImage"sv, "Name"sv); m_name_textbox->set_text(default_name); - auto& width_label = main_widget->add("Width:"_short_string); + auto& width_label = main_widget->add("Width:"_string); width_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); auto& width_spinbox = main_widget->add(); - auto& height_label = main_widget->add("Height:"_short_string); + auto& height_label = main_widget->add("Height:"_string); height_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); auto& height_spinbox = main_widget->add(); @@ -115,7 +115,7 @@ CreateNewImageDialog::CreateNewImageDialog(GUI::Window* parent_window) auto& button_container = main_widget->add(); button_container.set_layout(); - auto& ok_button = button_container.add("OK"_short_string); + auto& ok_button = button_container.add("OK"_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("Cancel"_short_string); + auto& cancel_button = button_container.add("Cancel"_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 ccbe748a554..c6adf81d973 100644 --- a/Userland/Applications/PixelPaint/CreateNewLayerDialog.cpp +++ b/Userland/Applications/PixelPaint/CreateNewLayerDialog.cpp @@ -24,7 +24,7 @@ CreateNewLayerDialog::CreateNewLayerDialog(Gfx::IntSize suggested_size, GUI::Win main_widget->set_fill_with_background_color(true); main_widget->set_layout(4); - auto& name_label = main_widget->add("Name:"_short_string); + auto& name_label = main_widget->add("Name:"_string); name_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); m_name_textbox = main_widget->add(); @@ -34,12 +34,12 @@ CreateNewLayerDialog::CreateNewLayerDialog(Gfx::IntSize suggested_size, GUI::Win m_layer_name = m_name_textbox->text(); }; - auto& width_label = main_widget->add("Width:"_short_string); + auto& width_label = main_widget->add("Width:"_string); width_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); auto& width_spinbox = main_widget->add(); - auto& height_label = main_widget->add("Height:"_short_string); + auto& height_label = main_widget->add("Height:"_string); height_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); auto& height_spinbox = main_widget->add(); @@ -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("OK"_short_string); + auto& ok_button = button_container.add("OK"_string); ok_button.on_click = [this](auto) { done(ExecResult::OK); }; ok_button.set_default(true); - auto& cancel_button = button_container.add("Cancel"_short_string); + auto& cancel_button = button_container.add("Cancel"_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 2aa50e004fa..e4af8ff3749 100644 --- a/Userland/Applications/PixelPaint/FilterParams.h +++ b/Userland/Applications/PixelPaint/FilterParams.h @@ -82,10 +82,10 @@ private: auto& norm_checkbox = main_widget->template add("Normalize"_string); norm_checkbox.set_checked(false); - auto& wrap_checkbox = main_widget->template add("Wrap"_short_string); + auto& wrap_checkbox = main_widget->template add("Wrap"_string); wrap_checkbox.set_checked(m_should_wrap); - auto& button = main_widget->template add("Done"_short_string); + auto& button = main_widget->template add("Done"_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 4c493bddcd6..d2b969b569a 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, "px"_short_string)); + auto radius_slider = TRY(radius_container->try_add(Orientation::Horizontal, "px"_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 6fc0daf11a8..31266dd94b4 100644 --- a/Userland/Applications/PixelPaint/Filters/FastBoxBlur.cpp +++ b/Userland/Applications/PixelPaint/Filters/FastBoxBlur.cpp @@ -88,11 +88,11 @@ ErrorOr> FastBoxBlur::get_settings_widget() m_radius_container->set_fixed_height(20); TRY(m_radius_container->try_set_layout(GUI::Margins { 4, 0, 4, 0 })); - auto radius_label = TRY(m_radius_container->try_add("Radius:"_short_string)); + auto radius_label = TRY(m_radius_container->try_add("Radius:"_string)); 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, "px"_short_string)); + auto radius_slider = TRY(m_radius_container->try_add(Orientation::Horizontal, "px"_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, "px"_short_string)); + m_radius_x_slider = TRY(radius_x_container->try_add(Orientation::Horizontal, "px"_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, "px"_short_string)); + m_radius_y_slider = TRY(radius_y_container->try_add(Orientation::Horizontal, "px"_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) { @@ -146,11 +146,11 @@ ErrorOr> FastBoxBlur::get_settings_widget() angle_container->set_fixed_height(20); TRY(angle_container->try_set_layout()); - auto angle_label = TRY(angle_container->try_add("Angle:"_short_string)); + auto angle_label = TRY(angle_container->try_add("Angle:"_string)); 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, "°"_short_string)); + m_angle_slider = TRY(angle_container->try_add(Orientation::Horizontal, "°"_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, "px"_short_string)); + m_magnitude_slider = TRY(magnitude_container->try_add(Orientation::Horizontal, "px"_string)); m_magnitude_slider->set_range(0, 50); m_magnitude_slider->set_value(m_radius); m_magnitude_slider->on_change = [&](int value) { diff --git a/Userland/Applications/PixelPaint/Filters/Sepia.cpp b/Userland/Applications/PixelPaint/Filters/Sepia.cpp index bb29608f4ab..7cc5c00e12e 100644 --- a/Userland/Applications/PixelPaint/Filters/Sepia.cpp +++ b/Userland/Applications/PixelPaint/Filters/Sepia.cpp @@ -32,11 +32,11 @@ ErrorOr> Sepia::get_settings_widget() amount_container->set_fixed_height(20); TRY(amount_container->try_set_layout(GUI::Margins { 4, 0, 4, 0 })); - auto amount_label = TRY(amount_container->try_add("Amount:"_short_string)); + auto amount_label = TRY(amount_container->try_add("Amount:"_string)); 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, "%"_short_string)); + auto amount_slider = TRY(amount_container->try_add(Orientation::Horizontal, "%"_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 b99fba8ee75..74418c7c7b5 100644 --- a/Userland/Applications/PixelPaint/LayerPropertiesWidget.cpp +++ b/Userland/Applications/PixelPaint/LayerPropertiesWidget.cpp @@ -30,7 +30,7 @@ LayerPropertiesWidget::LayerPropertiesWidget() name_container.set_fixed_height(20); name_container.set_layout(); - auto& name_label = name_container.add("Name:"_short_string); + auto& name_label = name_container.add("Name:"_string); name_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); name_label.set_fixed_size(80, 20); @@ -56,7 +56,7 @@ LayerPropertiesWidget::LayerPropertiesWidget() m_layer->set_opacity_percent(value); }; - m_visibility_checkbox = group_box.add("Visible"_short_string); + m_visibility_checkbox = group_box.add("Visible"_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/MainWidget.cpp b/Userland/Applications/PixelPaint/MainWidget.cpp index 1489023001c..35720dccaf6 100644 --- a/Userland/Applications/PixelPaint/MainWidget.cpp +++ b/Userland/Applications/PixelPaint/MainWidget.cpp @@ -149,7 +149,7 @@ static constexpr int s_zoom_level_fit_image = 10; ErrorOr MainWidget::initialize_menubar(GUI::Window& window) { - auto file_menu = TRY(window.try_add_menu("&File"_short_string)); + auto file_menu = TRY(window.try_add_menu("&File"_string)); m_new_image_action = GUI::Action::create( "&New Image...", { Mod_Ctrl, Key_N }, g_icon_bag.filetype_pixelpaint, [&](auto&) { @@ -223,7 +223,7 @@ ErrorOr MainWidget::initialize_menubar(GUI::Window& window) TRY(file_menu->try_add_action(*m_save_image_action)); TRY(file_menu->try_add_action(*m_save_image_as_action)); - m_export_submenu = TRY(file_menu->try_add_submenu("&Export"_short_string)); + m_export_submenu = TRY(file_menu->try_add_submenu("&Export"_string)); TRY(m_export_submenu->try_add_action( GUI::Action::create( @@ -292,7 +292,7 @@ ErrorOr MainWidget::initialize_menubar(GUI::Window& window) GUI::Application::the()->quit(); }))); - m_edit_menu = TRY(window.try_add_menu("&Edit"_short_string)); + m_edit_menu = TRY(window.try_add_menu("&Edit"_string)); m_cut_action = GUI::CommonActions::make_cut_action([&](auto&) { auto* editor = current_image_editor(); @@ -488,7 +488,7 @@ ErrorOr MainWidget::initialize_menubar(GUI::Window& window) GUI::MessageBox::show_error(&window, MUST(String::formatted("Writing color palette failed: {}", result.release_error()))); }))); - m_view_menu = TRY(window.try_add_menu("&View"_short_string)); + m_view_menu = TRY(window.try_add_menu("&View"_string)); m_zoom_in_action = GUI::CommonActions::make_zoom_in_action( [&](auto&) { @@ -600,18 +600,18 @@ ErrorOr MainWidget::initialize_menubar(GUI::Window& window) vectorscope_action->set_checked(Config::read_bool("PixelPaint"sv, "Scopes"sv, "ShowVectorscope"sv, false)); m_vectorscope_widget->parent_widget()->set_visible(vectorscope_action->is_checked()); - auto scopes_menu = TRY(m_view_menu->try_add_submenu("&Scopes"_short_string)); + auto scopes_menu = TRY(m_view_menu->try_add_submenu("&Scopes"_string)); TRY(scopes_menu->try_add_action(histogram_action)); TRY(scopes_menu->try_add_action(vectorscope_action)); - m_tool_menu = TRY(window.try_add_menu("&Tool"_short_string)); + m_tool_menu = TRY(window.try_add_menu("&Tool"_string)); m_toolbox->for_each_tool([&](auto& tool) { if (tool.action()) m_tool_menu->add_action(*tool.action()); return IterationDecision::Continue; }); - m_image_menu = TRY(window.try_add_menu("&Image"_short_string)); + m_image_menu = TRY(window.try_add_menu("&Image"_string)); TRY(m_image_menu->try_add_action(GUI::Action::create( "Flip Image &Vertically", g_icon_bag.edit_flip_vertical, [&](auto&) { auto* editor = current_image_editor(); @@ -713,7 +713,7 @@ ErrorOr MainWidget::initialize_menubar(GUI::Window& window) editor->did_complete_action("Crop Image to Content"sv); }))); - m_layer_menu = TRY(window.try_add_menu("&Layer"_short_string)); + m_layer_menu = TRY(window.try_add_menu("&Layer"_string)); m_layer_menu->on_visibility_change = [this](bool visible) { if (!visible) @@ -810,7 +810,7 @@ ErrorOr MainWidget::initialize_menubar(GUI::Window& window) }; }; - auto mask_submenu = TRY(m_layer_menu->try_add_submenu("&Masks"_short_string)); + auto mask_submenu = TRY(m_layer_menu->try_add_submenu("&Masks"_string)); m_add_mask_action = GUI::Action::create( "Add M&ask", { Mod_Ctrl | Mod_Shift, Key_M }, g_icon_bag.add_mask, create_layer_mask_callback("Add Mask", [&](Layer* active_layer) { @@ -1140,7 +1140,7 @@ ErrorOr MainWidget::initialize_menubar(GUI::Window& window) editor->did_complete_action("Crop Layer to Content"sv); }))); - m_filter_menu = TRY(window.try_add_menu("&Filter"_short_string)); + m_filter_menu = TRY(window.try_add_menu("&Filter"_string)); TRY(m_filter_menu->try_add_action(GUI::Action::create("Filter &Gallery", g_icon_bag.filter, [&](auto&) { auto* editor = current_image_editor(); @@ -1164,7 +1164,7 @@ ErrorOr MainWidget::initialize_menubar(GUI::Window& window) } }))); - auto help_menu = TRY(window.try_add_menu("&Help"_short_string)); + auto help_menu = TRY(window.try_add_menu("&Help"_string)); TRY(help_menu->try_add_action(GUI::CommonActions::make_command_palette_action(&window))); TRY(help_menu->try_add_action(GUI::CommonActions::make_about_action("Pixel Paint", GUI::Icon::default_icon("app-pixel-paint"sv), &window))); diff --git a/Userland/Applications/PixelPaint/Tools/BrushTool.cpp b/Userland/Applications/PixelPaint/Tools/BrushTool.cpp index e343ff89faa..279f462b689 100644 --- a/Userland/Applications/PixelPaint/Tools/BrushTool.cpp +++ b/Userland/Applications/PixelPaint/Tools/BrushTool.cpp @@ -147,11 +147,11 @@ ErrorOr BrushTool::get_properties_widget() size_container->set_fixed_height(20); (void)TRY(size_container->try_set_layout()); - auto size_label = TRY(size_container->try_add("Size:"_short_string)); + auto size_label = TRY(size_container->try_add("Size:"_string)); 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, "px"_short_string)); + auto size_slider = TRY(size_container->try_add(Orientation::Horizontal, "px"_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, "%"_short_string)); + auto hardness_slider = TRY(hardness_container->try_add(Orientation::Horizontal, "%"_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 76297b54604..c47e20d56d0 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, "%"_short_string)); + auto threshold_slider = TRY(threshold_container->try_add(Orientation::Horizontal, "%"_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 9839383b76f..8e3349bbf7e 100644 --- a/Userland/Applications/PixelPaint/Tools/CloneTool.cpp +++ b/Userland/Applications/PixelPaint/Tools/CloneTool.cpp @@ -135,11 +135,11 @@ ErrorOr CloneTool::get_properties_widget() size_container->set_fixed_height(20); (void)TRY(size_container->try_set_layout()); - auto size_label = TRY(size_container->try_add("Size:"_short_string)); + auto size_label = TRY(size_container->try_add("Size:"_string)); 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, "px"_short_string)); + auto size_slider = TRY(size_container->try_add(Orientation::Horizontal, "px"_string)); size_slider->set_range(1, 100); size_slider->set_value(size()); @@ -158,7 +158,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, "%"_short_string)); + auto hardness_slider = TRY(hardness_container->try_add(Orientation::Horizontal, "%"_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 95fc8ae53b3..2fb632a66ab 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, "px"_short_string)); + auto thickness_slider = TRY(thickness_container->try_add(Orientation::Horizontal, "px"_string)); thickness_slider->set_range(1, 10); thickness_slider->set_value(m_thickness); @@ -152,13 +152,13 @@ ErrorOr EllipseTool::get_properties_widget() auto mode_container = TRY(properties_widget->try_add()); mode_container->set_fixed_height(70); (void)TRY(mode_container->try_set_layout()); - auto mode_label = TRY(mode_container->try_add("Mode:"_short_string)); + auto mode_label = TRY(mode_container->try_add("Mode:"_string)); mode_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); 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("Outline"_short_string)); - auto fill_mode_radio = TRY(mode_radio_container->try_add("Fill"_short_string)); + auto outline_mode_radio = TRY(mode_radio_container->try_add("Outline"_string)); + auto fill_mode_radio = TRY(mode_radio_container->try_add("Fill"_string)); auto aa_enable_checkbox = TRY(mode_radio_container->try_add("Anti-alias"_string)); aa_enable_checkbox->on_checked = [this](bool checked) { @@ -197,7 +197,7 @@ ErrorOr EllipseTool::get_properties_widget() } }; - auto multiply_label = TRY(aspect_container->try_add("x"_short_string)); + auto multiply_label = TRY(aspect_container->try_add("x"_string)); multiply_label->set_text_alignment(Gfx::TextAlignment::Center); multiply_label->set_fixed_size(10, 20); diff --git a/Userland/Applications/PixelPaint/Tools/EraseTool.cpp b/Userland/Applications/PixelPaint/Tools/EraseTool.cpp index 7e08d5edc6f..633df47e6e5 100644 --- a/Userland/Applications/PixelPaint/Tools/EraseTool.cpp +++ b/Userland/Applications/PixelPaint/Tools/EraseTool.cpp @@ -64,11 +64,11 @@ ErrorOr EraseTool::get_properties_widget() size_container->set_fixed_height(20); (void)TRY(size_container->try_set_layout()); - auto size_label = TRY(size_container->try_add("Size:"_short_string)); + auto size_label = TRY(size_container->try_add("Size:"_string)); 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, "px"_short_string)); + auto size_slider = TRY(size_container->try_add(Orientation::Horizontal, "px"_string)); size_slider->set_range(1, 100); size_slider->set_value(size()); @@ -86,7 +86,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, "%"_short_string)); + auto hardness_slider = TRY(hardness_container->try_add(Orientation::Horizontal, "%"_string)); hardness_slider->set_range(1, 100); hardness_slider->set_value(hardness()); @@ -115,8 +115,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("Pencil"_short_string)); - auto brush_mode_radio = TRY(mode_radio_container->try_add("Brush"_short_string)); + auto pencil_mode_radio = TRY(mode_radio_container->try_add("Pencil"_string)); + auto brush_mode_radio = TRY(mode_radio_container->try_add("Brush"_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 4e1b665fcd4..016b110d26a 100644 --- a/Userland/Applications/PixelPaint/Tools/GradientTool.cpp +++ b/Userland/Applications/PixelPaint/Tools/GradientTool.cpp @@ -275,7 +275,7 @@ ErrorOr GradientTool::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, "%"_short_string)); + auto hardness_slider = TRY(hardness_container->try_add(Orientation::Horizontal, "%"_string)); hardness_slider->set_range(1, 99); hardness_slider->set_value(m_hardness); hardness_slider->on_change = [this](int value) { @@ -297,7 +297,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("Apply"_short_string)); + auto apply_button = TRY(button_container->try_add("Apply"_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 10994cffe73..93417d3b106 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, "px"_short_string)); + auto snapping_slider = TRY(snapping_container->try_add(Orientation::Horizontal, "px"_string)); snapping_slider->set_range(0, 50); snapping_slider->set_value(m_snap_size); diff --git a/Userland/Applications/PixelPaint/Tools/LassoSelectTool.cpp b/Userland/Applications/PixelPaint/Tools/LassoSelectTool.cpp index 24aeb6beb2c..6410f2ff270 100644 --- a/Userland/Applications/PixelPaint/Tools/LassoSelectTool.cpp +++ b/Userland/Applications/PixelPaint/Tools/LassoSelectTool.cpp @@ -168,7 +168,7 @@ ErrorOr LassoSelectTool::get_properties_widget() (void)TRY(mode_container->try_set_layout()); auto mode_label = TRY(mode_container->try_add()); - mode_label->set_text("Mode:"_short_string); + mode_label->set_text("Mode:"_string); mode_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); mode_label->set_fixed_size(80, 20); diff --git a/Userland/Applications/PixelPaint/Tools/LineTool.cpp b/Userland/Applications/PixelPaint/Tools/LineTool.cpp index 3e6ba018c7d..1139a17a2ab 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, "px"_short_string)); + auto thickness_slider = TRY(thickness_container->try_add(Orientation::Horizontal, "px"_string)); thickness_slider->set_range(1, 10); thickness_slider->set_value(m_thickness); @@ -146,7 +146,7 @@ ErrorOr LineTool::get_properties_widget() mode_container->set_fixed_height(20); (void)TRY(mode_container->try_set_layout()); - auto mode_label = TRY(mode_container->try_add("Mode:"_short_string)); + auto mode_label = TRY(mode_container->try_add("Mode:"_string)); mode_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); mode_label->set_fixed_size(80, 20); diff --git a/Userland/Applications/PixelPaint/Tools/PenTool.cpp b/Userland/Applications/PixelPaint/Tools/PenTool.cpp index 7f302899e21..c8e06da2c36 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, "px"_short_string)); + auto size_slider = TRY(size_container->try_add(Orientation::Horizontal, "px"_string)); size_slider->set_range(1, 20); size_slider->set_value(size()); diff --git a/Userland/Applications/PixelPaint/Tools/PolygonalSelectTool.cpp b/Userland/Applications/PixelPaint/Tools/PolygonalSelectTool.cpp index 04daeafd4b0..0ad4149d43a 100644 --- a/Userland/Applications/PixelPaint/Tools/PolygonalSelectTool.cpp +++ b/Userland/Applications/PixelPaint/Tools/PolygonalSelectTool.cpp @@ -197,7 +197,7 @@ ErrorOr PolygonalSelectTool::get_properties_widget() (void)TRY(mode_container->try_set_layout()); auto mode_label = TRY(mode_container->try_add()); - mode_label->set_text("Mode:"_short_string); + mode_label->set_text("Mode:"_string); mode_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); mode_label->set_fixed_size(80, 20); diff --git a/Userland/Applications/PixelPaint/Tools/RectangleSelectTool.cpp b/Userland/Applications/PixelPaint/Tools/RectangleSelectTool.cpp index ca842413f2e..797301be9c9 100644 --- a/Userland/Applications/PixelPaint/Tools/RectangleSelectTool.cpp +++ b/Userland/Applications/PixelPaint/Tools/RectangleSelectTool.cpp @@ -170,7 +170,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, "%"_short_string)); + auto feather_slider = TRY(feather_container->try_add(Orientation::Horizontal, "%"_string)); feather_slider->set_range(0, feather_slider_max); feather_slider->set_value((int)floorf(m_edge_feathering * (float)feather_slider_max)); @@ -184,7 +184,7 @@ ErrorOr RectangleSelectTool::get_properties_widget() (void)TRY(mode_container->try_set_layout()); auto mode_label = TRY(mode_container->try_add()); - mode_label->set_text("Mode:"_short_string); + mode_label->set_text("Mode:"_string); mode_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); mode_label->set_fixed_size(80, 20); diff --git a/Userland/Applications/PixelPaint/Tools/RectangleTool.cpp b/Userland/Applications/PixelPaint/Tools/RectangleTool.cpp index 84077f3d74a..f6df5abd615 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, "px"_short_string)); + auto thickness_or_radius_slider = TRY(thickness_or_radius_container->try_add(Orientation::Horizontal, "px"_string)); thickness_or_radius_slider->on_change = [&](int value) { if (m_fill_mode == FillMode::RoundedCorners) { @@ -181,18 +181,18 @@ ErrorOr RectangleTool::get_properties_widget() auto mode_container = TRY(properties_widget->try_add()); mode_container->set_fixed_height(90); (void)TRY(mode_container->try_set_layout()); - auto mode_label = TRY(mode_container->try_add("Mode:"_short_string)); + auto mode_label = TRY(mode_container->try_add("Mode:"_string)); mode_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); mode_label->set_fixed_size(30, 20); 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("Outline"_short_string)); - auto fill_mode_radio = TRY(mode_radio_container->try_add("Fill"_short_string)); + auto outline_mode_radio = TRY(mode_radio_container->try_add("Outline"_string)); + auto fill_mode_radio = TRY(mode_radio_container->try_add("Fill"_string)); auto gradient_mode_radio = TRY(mode_radio_container->try_add("Gradient"_string)); mode_radio_container->set_fixed_width(70); - auto rounded_corners_mode_radio = TRY(mode_radio_container->try_add("Rounded"_short_string)); + auto rounded_corners_mode_radio = TRY(mode_radio_container->try_add("Rounded"_string)); outline_mode_radio->on_checked = [this, update_slider](bool) { m_fill_mode = FillMode::Outline; @@ -246,7 +246,7 @@ ErrorOr RectangleTool::get_properties_widget() } }; - auto multiply_label = TRY(aspect_fields_container->try_add("x"_short_string)); + auto multiply_label = TRY(aspect_fields_container->try_add("x"_string)); multiply_label->set_text_alignment(Gfx::TextAlignment::Center); multiply_label->set_fixed_size(10, 20); diff --git a/Userland/Applications/PixelPaint/Tools/SprayTool.cpp b/Userland/Applications/PixelPaint/Tools/SprayTool.cpp index 98b982e6d48..f347b788258 100644 --- a/Userland/Applications/PixelPaint/Tools/SprayTool.cpp +++ b/Userland/Applications/PixelPaint/Tools/SprayTool.cpp @@ -100,11 +100,11 @@ ErrorOr SprayTool::get_properties_widget() size_container->set_fixed_height(20); (void)TRY(size_container->try_set_layout()); - auto size_label = TRY(size_container->try_add("Size:"_short_string)); + auto size_label = TRY(size_container->try_add("Size:"_string)); 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, "px"_short_string)); + auto size_slider = TRY(size_container->try_add(Orientation::Horizontal, "px"_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, "%"_short_string)); + auto density_slider = TRY(density_container->try_add(Orientation::Horizontal, "%"_string)); density_slider->set_range(1, 100); density_slider->set_value(m_density); diff --git a/Userland/Applications/PixelPaint/Tools/WandSelectTool.cpp b/Userland/Applications/PixelPaint/Tools/WandSelectTool.cpp index 9dc3283aee8..3171b977baf 100644 --- a/Userland/Applications/PixelPaint/Tools/WandSelectTool.cpp +++ b/Userland/Applications/PixelPaint/Tools/WandSelectTool.cpp @@ -83,7 +83,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, "%"_short_string)); + auto threshold_slider = TRY(threshold_container->try_add(Orientation::Horizontal, "%"_string)); threshold_slider->set_range(0, 100); threshold_slider->set_value(m_threshold); @@ -97,7 +97,7 @@ ErrorOr WandSelectTool::get_properties_widget() (void)TRY(mode_container->try_set_layout()); auto mode_label = TRY(mode_container->try_add()); - mode_label->set_text("Mode:"_short_string); + mode_label->set_text("Mode:"_string); mode_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); mode_label->set_fixed_size(80, 20); diff --git a/Userland/Applications/PixelPaint/Tools/ZoomTool.cpp b/Userland/Applications/PixelPaint/Tools/ZoomTool.cpp index bdfc2a5a829..fe3c4bfba41 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, "%"_short_string)); + auto sensitivity_slider = TRY(sensitivity_container->try_add(Orientation::Horizontal, "%"_string)); sensitivity_slider->set_range(1, 100); sensitivity_slider->set_value(100 * m_sensitivity); diff --git a/Userland/Applications/Presenter/PresenterWidget.cpp b/Userland/Applications/Presenter/PresenterWidget.cpp index 4fe6b5a9160..6b0c0d6c3ce 100644 --- a/Userland/Applications/Presenter/PresenterWidget.cpp +++ b/Userland/Applications/Presenter/PresenterWidget.cpp @@ -55,7 +55,7 @@ ErrorOr PresenterWidget::initialize_menubar() { auto* window = this->window(); // Set up the menu bar. - auto file_menu = TRY(window->try_add_menu("&File"_short_string)); + auto file_menu = TRY(window->try_add_menu("&File"_string)); auto open_action = GUI::CommonActions::make_open_action([this](auto&) { FileSystemAccessClient::OpenFileOptions options { .allowed_file_types = { { GUI::FileTypeFilter { "Presentation Files", { { "presenter" } } }, GUI::FileTypeFilter::all_files() } }, @@ -98,7 +98,7 @@ ErrorOr PresenterWidget::initialize_menubar() TRY(presentation_menu->try_add_action(*m_previous_slide_action)); TRY(presentation_menu->try_add_action(*m_present_from_first_slide_action)); - auto view_menu = TRY(window->try_add_menu("&View"_short_string)); + auto view_menu = TRY(window->try_add_menu("&View"_string)); m_full_screen_action = GUI::Action::create("Toggle &Full Screen", { KeyModifier::Mod_Shift, KeyCode::Key_F5 }, { KeyCode::Key_F11 }, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/fullscreen.png"sv)), [this](auto&) { auto* window = this->window(); window->set_fullscreen(!window->is_fullscreen()); @@ -117,7 +117,7 @@ ErrorOr PresenterWidget::initialize_menubar() update_slides_actions(); - auto help_menu = TRY(window->try_add_menu("&Help"_short_string)); + auto help_menu = TRY(window->try_add_menu("&Help"_string)); TRY(help_menu->try_add_action(GUI::CommonActions::make_about_action("Presenter", GUI::Icon::default_icon("app-presenter"sv)))); return {}; diff --git a/Userland/Applications/Settings/main.cpp b/Userland/Applications/Settings/main.cpp index 946b747ed98..dd75e64da87 100644 --- a/Userland/Applications/Settings/main.cpp +++ b/Userland/Applications/Settings/main.cpp @@ -92,12 +92,12 @@ ErrorOr serenity_main(Main::Arguments arguments) window->set_title("Settings"); window->resize(420, 265); - auto file_menu = TRY(window->try_add_menu("&File"_short_string)); + auto file_menu = TRY(window->try_add_menu("&File"_string)); file_menu->add_action(GUI::CommonActions::make_quit_action([&](auto&) { app->quit(); })); - auto help_menu = TRY(window->try_add_menu("&Help"_short_string)); + auto help_menu = TRY(window->try_add_menu("&Help"_string)); TRY(help_menu->try_add_action(GUI::CommonActions::make_command_palette_action(window))); TRY(help_menu->try_add_action(GUI::CommonActions::make_about_action("Settings", app_icon, window))); diff --git a/Userland/Applications/SoundPlayer/PlaylistWidget.cpp b/Userland/Applications/SoundPlayer/PlaylistWidget.cpp index 8f689a55760..8b5fc1157bf 100644 --- a/Userland/Applications/SoundPlayer/PlaylistWidget.cpp +++ b/Userland/Applications/SoundPlayer/PlaylistWidget.cpp @@ -61,15 +61,15 @@ ErrorOr PlaylistModel::column_name(int column) const { switch (column) { case Column::Title: - return "Title"_short_string; + return "Title"_string; case Column::Duration: return "Duration"_string; case Column::Group: - return "Group"_short_string; + return "Group"_string; case Column::Album: - return "Album"_short_string; + return "Album"_string; case Column::Artist: - return "Artist"_short_string; + return "Artist"_string; case Column::Filesize: return "Filesize"_string; } diff --git a/Userland/Applications/SoundPlayer/SoundPlayerWidget.cpp b/Userland/Applications/SoundPlayer/SoundPlayerWidget.cpp index c11085f5fd7..06da8c35835 100644 --- a/Userland/Applications/SoundPlayer/SoundPlayerWidget.cpp +++ b/Userland/Applications/SoundPlayer/SoundPlayerWidget.cpp @@ -253,7 +253,7 @@ void SoundPlayerWidget::file_name_changed(StringView name) DeprecatedString title = name; if (playback_manager().loader()) { auto const& metadata = playback_manager().loader()->metadata(); - if (auto artists_or_error = metadata.all_artists(" / "_short_string); + if (auto artists_or_error = metadata.all_artists(" / "_string); !artists_or_error.is_error() && artists_or_error.value().has_value() && metadata.title.has_value()) { title = DeprecatedString::formatted("{} – {}", metadata.title.value(), artists_or_error.release_value().release_value()); } else if (metadata.title.has_value()) { diff --git a/Userland/Applications/SoundPlayer/main.cpp b/Userland/Applications/SoundPlayer/main.cpp index 6eb04e8349e..3866665d227 100644 --- a/Userland/Applications/SoundPlayer/main.cpp +++ b/Userland/Applications/SoundPlayer/main.cpp @@ -60,7 +60,7 @@ ErrorOr serenity_main(Main::Arguments arguments) player->set_loop_mode(Player::LoopMode::Playlist); } - auto file_menu = TRY(window->try_add_menu("&File"_short_string)); + auto file_menu = TRY(window->try_add_menu("&File"_string)); TRY(file_menu->try_add_action(GUI::CommonActions::make_open_action([&](auto&) { Optional path = GUI::FilePicker::get_open_filepath(window); if (path.has_value()) { @@ -163,7 +163,7 @@ ErrorOr serenity_main(Main::Arguments arguments) selected_visualization_widget->set_checked(true); - auto help_menu = TRY(window->try_add_menu("&Help"_short_string)); + auto help_menu = TRY(window->try_add_menu("&Help"_string)); TRY(help_menu->try_add_action(GUI::CommonActions::make_command_palette_action(window))); TRY(help_menu->try_add_action(GUI::CommonActions::make_about_action("Sound Player", app_icon, window))); diff --git a/Userland/Applications/SpaceAnalyzer/main.cpp b/Userland/Applications/SpaceAnalyzer/main.cpp index a6039397c86..de4cdebfb70 100644 --- a/Userland/Applications/SpaceAnalyzer/main.cpp +++ b/Userland/Applications/SpaceAnalyzer/main.cpp @@ -67,7 +67,7 @@ ErrorOr serenity_main(Main::Arguments arguments) tree_map_widget.set_focus(true); - auto file_menu = TRY(window->try_add_menu("&File"_short_string)); + auto file_menu = TRY(window->try_add_menu("&File"_string)); TRY(file_menu->try_add_action(GUI::Action::create("&Analyze", { KeyCode::Key_F5 }, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/reload.png"sv)), [&](auto&) { // FIXME: Just modify the tree in memory instead of traversing the entire file system if (auto result = tree_map_widget.analyze(statusbar); result.is_error()) { @@ -79,7 +79,7 @@ ErrorOr serenity_main(Main::Arguments arguments) app->quit(); }))); - auto help_menu = TRY(window->try_add_menu("&Help"_short_string)); + auto help_menu = TRY(window->try_add_menu("&Help"_string)); TRY(help_menu->try_add_action(GUI::CommonActions::make_command_palette_action(window))); TRY(help_menu->try_add_action(GUI::CommonActions::make_about_action(APP_NAME, app_icon, window))); diff --git a/Userland/Applications/Spreadsheet/CellTypeDialog.cpp b/Userland/Applications/Spreadsheet/CellTypeDialog.cpp index f6166d0d50e..2f8caf87e19 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("OK"_short_string); + auto& ok_button = buttonbox.add("OK"_string); ok_button.set_fixed_width(80); ok_button.on_click = [&](auto) { done(ExecResult::OK); }; } @@ -132,7 +132,7 @@ void CellTypeDialog::setup_tabs(GUI::TabWidget& tabs, Vector const& po m_conditional_formats = cell.conditional_formats(); } - auto& type_tab = tabs.add_tab("Type"_short_string); + auto& type_tab = tabs.add_tab("Type"_string); type_tab.set_layout(4); { auto& left_side = type_tab.add(); @@ -264,7 +264,7 @@ void CellTypeDialog::setup_tabs(GUI::TabWidget& tabs, Vector const& po } } - auto& colors_tab = tabs.add_tab("Color"_short_string); + auto& colors_tab = tabs.add_tab("Color"_string); colors_tab.set_layout(4); { // Static formatting diff --git a/Userland/Applications/Spreadsheet/HelpWindow.cpp b/Userland/Applications/Spreadsheet/HelpWindow.cpp index 50454774b53..078b72ad8c2 100644 --- a/Userland/Applications/Spreadsheet/HelpWindow.cpp +++ b/Userland/Applications/Spreadsheet/HelpWindow.cpp @@ -123,7 +123,7 @@ HelpWindow::HelpWindow(GUI::Window* parent) widget->add_sheet(sheet.release_nonnull()); window->show(); - } else if (url.host() == "doc"_short_string) { + } else if (url.host() == "doc"_string) { auto entry = LexicalPath::basename(url.serialize_path()); m_webview->load(URL::create_with_data("text/html"sv, render(entry))); } else { diff --git a/Userland/Applications/Spreadsheet/Spreadsheet.cpp b/Userland/Applications/Spreadsheet/Spreadsheet.cpp index 018b26c4916..b41408a1918 100644 --- a/Userland/Applications/Spreadsheet/Spreadsheet.cpp +++ b/Userland/Applications/Spreadsheet/Spreadsheet.cpp @@ -264,7 +264,7 @@ Optional Sheet::position_from_url(const URL& url) const return {}; } - if (url.scheme() != "spreadsheet" || url.host() != "cell"_short_string) { + if (url.scheme() != "spreadsheet" || url.host() != "cell"_string) { dbgln("Bad url: {}", url.to_deprecated_string()); return {}; } @@ -757,7 +757,7 @@ URL Position::to_url(Sheet const& sheet) const { URL url; url.set_scheme("spreadsheet"); - url.set_host("cell"_short_string); + url.set_host("cell"_string); url.set_paths({ DeprecatedString::number(getpid()) }); url.set_fragment(to_cell_identifier(sheet)); return url; diff --git a/Userland/Applications/Spreadsheet/SpreadsheetWidget.cpp b/Userland/Applications/Spreadsheet/SpreadsheetWidget.cpp index d771f5cd2a6..9df83955931 100644 --- a/Userland/Applications/Spreadsheet/SpreadsheetWidget.cpp +++ b/Userland/Applications/Spreadsheet/SpreadsheetWidget.cpp @@ -718,7 +718,7 @@ void SpreadsheetWidget::clipboard_action(bool is_cut) ErrorOr SpreadsheetWidget::initialize_menubar(GUI::Window& window) { - auto file_menu = TRY(window.try_add_menu("&File"_short_string)); + auto file_menu = TRY(window.try_add_menu("&File"_string)); TRY(file_menu->try_add_action(*m_new_action)); TRY(file_menu->try_add_action(*m_open_action)); TRY(file_menu->try_add_action(*m_save_action)); @@ -737,7 +737,7 @@ ErrorOr SpreadsheetWidget::initialize_menubar(GUI::Window& window) })); TRY(file_menu->try_add_action(*m_quit_action)); - auto edit_menu = TRY(window.try_add_menu("&Edit"_short_string)); + auto edit_menu = TRY(window.try_add_menu("&Edit"_string)); TRY(edit_menu->try_add_action(*m_undo_action)); TRY(edit_menu->try_add_action(*m_redo_action)); TRY(edit_menu->try_add_separator()); @@ -746,7 +746,7 @@ ErrorOr SpreadsheetWidget::initialize_menubar(GUI::Window& window) TRY(edit_menu->try_add_action(*m_paste_action)); TRY(edit_menu->try_add_action(*m_insert_emoji_action)); - auto help_menu = TRY(window.try_add_menu("&Help"_short_string)); + auto help_menu = TRY(window.try_add_menu("&Help"_string)); TRY(help_menu->try_add_action(*m_search_action)); TRY(help_menu->try_add_action(*m_functions_help_action)); TRY(help_menu->try_add_action(*m_about_action)); diff --git a/Userland/Applications/SystemMonitor/NetworkStatisticsWidget.cpp b/Userland/Applications/SystemMonitor/NetworkStatisticsWidget.cpp index a5377bd4662..1cb42123e97 100644 --- a/Userland/Applications/SystemMonitor/NetworkStatisticsWidget.cpp +++ b/Userland/Applications/SystemMonitor/NetworkStatisticsWidget.cpp @@ -50,9 +50,9 @@ NetworkStatisticsWidget::NetworkStatisticsWidget() else return object.get_deprecated_string("ipv4_address"sv).value_or("").is_empty() ? *m_network_disconnected_bitmap : *m_network_connected_bitmap; }); - net_adapters_fields.empend("name", "Name"_short_string, Gfx::TextAlignment::CenterLeft); - net_adapters_fields.empend("class_name", "Class"_short_string, Gfx::TextAlignment::CenterLeft); - net_adapters_fields.empend("mac_address", "MAC"_short_string, Gfx::TextAlignment::CenterLeft); + net_adapters_fields.empend("name", "Name"_string, Gfx::TextAlignment::CenterLeft); + net_adapters_fields.empend("class_name", "Class"_string, Gfx::TextAlignment::CenterLeft); + net_adapters_fields.empend("mac_address", "MAC"_string, Gfx::TextAlignment::CenterLeft); net_adapters_fields.empend("Link status"_string, Gfx::TextAlignment::CenterLeft, [](JsonObject const& object) -> DeprecatedString { if (!object.get_bool("link_up"sv).value_or(false)) @@ -61,12 +61,12 @@ NetworkStatisticsWidget::NetworkStatisticsWidget() return DeprecatedString::formatted("{} Mb/s {}-duplex", object.get_i32("link_speed"sv).value_or(0), object.get_bool("link_full_duplex"sv).value_or(false) ? "full"sv : "half"sv); }); - net_adapters_fields.empend("IPv4"_short_string, Gfx::TextAlignment::CenterLeft, + net_adapters_fields.empend("IPv4"_string, Gfx::TextAlignment::CenterLeft, [](JsonObject const& object) -> DeprecatedString { return object.get_deprecated_string("ipv4_address"sv).value_or(""sv); }); - net_adapters_fields.empend("packets_in", "Pkt In"_short_string, Gfx::TextAlignment::CenterRight); - net_adapters_fields.empend("packets_out", "Pkt Out"_short_string, Gfx::TextAlignment::CenterRight); + net_adapters_fields.empend("packets_in", "Pkt In"_string, Gfx::TextAlignment::CenterRight); + net_adapters_fields.empend("packets_out", "Pkt Out"_string, Gfx::TextAlignment::CenterRight); net_adapters_fields.empend("bytes_in", "Bytes In"_string, Gfx::TextAlignment::CenterRight); net_adapters_fields.empend("bytes_out", "Bytes Out"_string, Gfx::TextAlignment::CenterRight); m_adapter_model = GUI::JsonArrayModel::create("/sys/kernel/net/adapters", move(net_adapters_fields)); @@ -97,15 +97,15 @@ NetworkStatisticsWidget::NetworkStatisticsWidget() m_tcp_socket_table_view = tcp_sockets_group_box.add(); Vector net_tcp_fields; - net_tcp_fields.empend("peer_address", "Peer"_short_string, Gfx::TextAlignment::CenterLeft); - net_tcp_fields.empend("peer_port", "Port"_short_string, Gfx::TextAlignment::CenterRight); - net_tcp_fields.empend("local_address", "Local"_short_string, Gfx::TextAlignment::CenterLeft); - net_tcp_fields.empend("local_port", "Port"_short_string, Gfx::TextAlignment::CenterRight); - net_tcp_fields.empend("state", "State"_short_string, Gfx::TextAlignment::CenterLeft); - net_tcp_fields.empend("ack_number", "Ack#"_short_string, Gfx::TextAlignment::CenterRight); - net_tcp_fields.empend("sequence_number", "Seq#"_short_string, Gfx::TextAlignment::CenterRight); - net_tcp_fields.empend("packets_in", "Pkt In"_short_string, Gfx::TextAlignment::CenterRight); - net_tcp_fields.empend("packets_out", "Pkt Out"_short_string, Gfx::TextAlignment::CenterRight); + net_tcp_fields.empend("peer_address", "Peer"_string, Gfx::TextAlignment::CenterLeft); + net_tcp_fields.empend("peer_port", "Port"_string, Gfx::TextAlignment::CenterRight); + net_tcp_fields.empend("local_address", "Local"_string, Gfx::TextAlignment::CenterLeft); + net_tcp_fields.empend("local_port", "Port"_string, Gfx::TextAlignment::CenterRight); + net_tcp_fields.empend("state", "State"_string, Gfx::TextAlignment::CenterLeft); + net_tcp_fields.empend("ack_number", "Ack#"_string, Gfx::TextAlignment::CenterRight); + net_tcp_fields.empend("sequence_number", "Seq#"_string, Gfx::TextAlignment::CenterRight); + net_tcp_fields.empend("packets_in", "Pkt In"_string, Gfx::TextAlignment::CenterRight); + net_tcp_fields.empend("packets_out", "Pkt Out"_string, Gfx::TextAlignment::CenterRight); net_tcp_fields.empend("bytes_in", "Bytes In"_string, Gfx::TextAlignment::CenterRight); net_tcp_fields.empend("bytes_out", "Bytes Out"_string, Gfx::TextAlignment::CenterRight); m_tcp_socket_model = GUI::JsonArrayModel::create("/sys/kernel/net/tcp", move(net_tcp_fields)); @@ -117,10 +117,10 @@ NetworkStatisticsWidget::NetworkStatisticsWidget() m_udp_socket_table_view = udp_sockets_group_box.add(); Vector net_udp_fields; - net_udp_fields.empend("peer_address", "Peer"_short_string, Gfx::TextAlignment::CenterLeft); - net_udp_fields.empend("peer_port", "Port"_short_string, Gfx::TextAlignment::CenterRight); - net_udp_fields.empend("local_address", "Local"_short_string, Gfx::TextAlignment::CenterLeft); - net_udp_fields.empend("local_port", "Port"_short_string, Gfx::TextAlignment::CenterRight); + net_udp_fields.empend("peer_address", "Peer"_string, Gfx::TextAlignment::CenterLeft); + net_udp_fields.empend("peer_port", "Port"_string, Gfx::TextAlignment::CenterRight); + net_udp_fields.empend("local_address", "Local"_string, Gfx::TextAlignment::CenterLeft); + net_udp_fields.empend("local_port", "Port"_string, Gfx::TextAlignment::CenterRight); m_udp_socket_model = GUI::JsonArrayModel::create("/sys/kernel/net/udp", move(net_udp_fields)); m_udp_socket_table_view->set_model(MUST(GUI::SortingProxyModel::create(*m_udp_socket_model))); diff --git a/Userland/Applications/SystemMonitor/ProcessFileDescriptorMapWidget.cpp b/Userland/Applications/SystemMonitor/ProcessFileDescriptorMapWidget.cpp index 0397b857cfb..d8096face21 100644 --- a/Userland/Applications/SystemMonitor/ProcessFileDescriptorMapWidget.cpp +++ b/Userland/Applications/SystemMonitor/ProcessFileDescriptorMapWidget.cpp @@ -22,17 +22,17 @@ ErrorOr> ProcessFileDescriptorMapW widget->m_table_view = TRY(widget->try_add()); Vector pid_fds_fields; - TRY(pid_fds_fields.try_empend("fd", "FD"_short_string, Gfx::TextAlignment::CenterRight)); - TRY(pid_fds_fields.try_empend("class", "Class"_short_string, Gfx::TextAlignment::CenterLeft)); - TRY(pid_fds_fields.try_empend("offset", "Offset"_short_string, Gfx::TextAlignment::CenterRight)); - TRY(pid_fds_fields.try_empend("absolute_path", "Path"_short_string, Gfx::TextAlignment::CenterLeft)); - TRY(pid_fds_fields.try_empend("Access"_short_string, Gfx::TextAlignment::CenterLeft, [](auto& object) { + TRY(pid_fds_fields.try_empend("fd", "FD"_string, Gfx::TextAlignment::CenterRight)); + TRY(pid_fds_fields.try_empend("class", "Class"_string, Gfx::TextAlignment::CenterLeft)); + TRY(pid_fds_fields.try_empend("offset", "Offset"_string, Gfx::TextAlignment::CenterRight)); + TRY(pid_fds_fields.try_empend("absolute_path", "Path"_string, Gfx::TextAlignment::CenterLeft)); + TRY(pid_fds_fields.try_empend("Access"_string, Gfx::TextAlignment::CenterLeft, [](auto& object) { return object.get_bool("seekable"sv).value_or(false) ? "Seekable" : "Sequential"; })); TRY(pid_fds_fields.try_empend("Blocking"_string, Gfx::TextAlignment::CenterLeft, [](auto& object) { return object.get_bool("blocking"sv).value_or(false) ? "Blocking" : "Nonblocking"; })); - TRY(pid_fds_fields.try_empend("On exec"_short_string, Gfx::TextAlignment::CenterLeft, [](auto& object) { + TRY(pid_fds_fields.try_empend("On exec"_string, Gfx::TextAlignment::CenterLeft, [](auto& object) { return object.get_bool("cloexec"sv).value_or(false) ? "Close" : "Keep"; })); TRY(pid_fds_fields.try_empend("Can read"_string, Gfx::TextAlignment::CenterLeft, [](auto& object) { diff --git a/Userland/Applications/SystemMonitor/ProcessMemoryMapWidget.cpp b/Userland/Applications/SystemMonitor/ProcessMemoryMapWidget.cpp index bad4d355741..a24f4679308 100644 --- a/Userland/Applications/SystemMonitor/ProcessMemoryMapWidget.cpp +++ b/Userland/Applications/SystemMonitor/ProcessMemoryMapWidget.cpp @@ -57,13 +57,13 @@ ErrorOr> ProcessMemoryMapWidget::try_creat Vector pid_vm_fields; TRY(pid_vm_fields.try_empend( - "Address"_short_string, Gfx::TextAlignment::CenterLeft, + "Address"_string, Gfx::TextAlignment::CenterLeft, [](auto& object) { return DeprecatedString::formatted("{:p}", object.get_u64("address"sv).value_or(0)); }, [](auto& object) { return object.get_u64("address"sv).value_or(0); })); - TRY(pid_vm_fields.try_empend("size", "Size"_short_string, Gfx::TextAlignment::CenterRight)); + TRY(pid_vm_fields.try_empend("size", "Size"_string, Gfx::TextAlignment::CenterRight)); TRY(pid_vm_fields.try_empend("amount_resident", "Resident"_string, Gfx::TextAlignment::CenterRight)); - TRY(pid_vm_fields.try_empend("amount_dirty", "Dirty"_short_string, Gfx::TextAlignment::CenterRight)); - TRY(pid_vm_fields.try_empend("Access"_short_string, Gfx::TextAlignment::CenterLeft, [](auto& object) { + TRY(pid_vm_fields.try_empend("amount_dirty", "Dirty"_string, Gfx::TextAlignment::CenterRight)); + TRY(pid_vm_fields.try_empend("Access"_string, Gfx::TextAlignment::CenterLeft, [](auto& object) { StringBuilder builder; if (object.get_bool("readable"sv).value_or(false)) builder.append('R'); @@ -102,8 +102,8 @@ ErrorOr> ProcessMemoryMapWidget::try_creat auto pagemap = object.get_deprecated_string("pagemap"sv).value_or({}); return pagemap; })); - TRY(pid_vm_fields.try_empend("cow_pages", "# CoW"_short_string, Gfx::TextAlignment::CenterRight)); - TRY(pid_vm_fields.try_empend("name", "Name"_short_string, Gfx::TextAlignment::CenterLeft)); + TRY(pid_vm_fields.try_empend("cow_pages", "# CoW"_string, Gfx::TextAlignment::CenterRight)); + TRY(pid_vm_fields.try_empend("name", "Name"_string, Gfx::TextAlignment::CenterLeft)); widget->m_json_model = GUI::JsonArrayModel::create({}, move(pid_vm_fields)); widget->m_table_view->set_model(TRY(GUI::SortingProxyModel::create(*widget->m_json_model))); diff --git a/Userland/Applications/SystemMonitor/ProcessModel.cpp b/Userland/Applications/SystemMonitor/ProcessModel.cpp index cc23372570e..45a5bc8055b 100644 --- a/Userland/Applications/SystemMonitor/ProcessModel.cpp +++ b/Userland/Applications/SystemMonitor/ProcessModel.cpp @@ -77,65 +77,65 @@ ErrorOr ProcessModel::column_name(int column) const case Column::Icon: return String {}; case Column::PID: - return "PID"_short_string; + return "PID"_string; case Column::TID: - return "TID"_short_string; + return "TID"_string; case Column::PPID: - return "PPID"_short_string; + return "PPID"_string; case Column::PGID: - return "PGID"_short_string; + return "PGID"_string; case Column::SID: - return "SID"_short_string; + return "SID"_string; case Column::State: - return "State"_short_string; + return "State"_string; case Column::User: - return "User"_short_string; + return "User"_string; case Column::Priority: - return "Pr"_short_string; + return "Pr"_string; case Column::Virtual: - return "Virtual"_short_string; + return "Virtual"_string; case Column::Physical: return "Physical"_string; case Column::DirtyPrivate: - return "Private"_short_string; + return "Private"_string; case Column::CleanInode: - return "CleanI"_short_string; + return "CleanI"_string; case Column::PurgeableVolatile: - return "Purg:V"_short_string; + return "Purg:V"_string; case Column::PurgeableNonvolatile: - return "Purg:N"_short_string; + return "Purg:N"_string; case Column::CPU: - return "CPU"_short_string; + return "CPU"_string; case Column::Processor: return "Processor"_string; case Column::Name: - return "Name"_short_string; + return "Name"_string; case Column::Syscalls: return "Syscalls"_string; case Column::InodeFaults: - return "F:Inode"_short_string; + return "F:Inode"_string; case Column::ZeroFaults: - return "F:Zero"_short_string; + return "F:Zero"_string; case Column::CowFaults: - return "F:CoW"_short_string; + return "F:CoW"_string; case Column::IPv4SocketReadBytes: - return "IPv4 In"_short_string; + return "IPv4 In"_string; case Column::IPv4SocketWriteBytes: return "IPv4 Out"_string; case Column::UnixSocketReadBytes: - return "Unix In"_short_string; + return "Unix In"_string; case Column::UnixSocketWriteBytes: return "Unix Out"_string; case Column::FileReadBytes: - return "File In"_short_string; + return "File In"_string; case Column::FileWriteBytes: return "File Out"_string; case Column::Pledge: - return "Pledge"_short_string; + return "Pledge"_string; case Column::Veil: - return "Veil"_short_string; + return "Veil"_string; case Column::Command: - return "Command"_short_string; + return "Command"_string; default: VERIFY_NOT_REACHED(); } @@ -226,7 +226,7 @@ GUI::Variant ProcessModel::data(GUI::ModelIndex const& index, GUI::ModelRole rol case Column::Name: return thread.current_state.name; case Column::Command: - return thread.current_state.command.visit([](String const& cmdline) { return cmdline; }, [](auto const&) { return ""_short_string; }); + return thread.current_state.command.visit([](String const& cmdline) { return cmdline; }, [](auto const&) { return ""_string; }); case Column::Syscalls: return thread.current_state.syscall_count; case Column::InodeFaults: @@ -296,7 +296,7 @@ GUI::Variant ProcessModel::data(GUI::ModelIndex const& index, GUI::ModelRole rol return DeprecatedString::formatted("{} (*)", thread.current_state.name); return thread.current_state.name; case Column::Command: - return thread.current_state.command.visit([](String const& cmdline) { return cmdline; }, [](auto const&) { return ""_short_string; }); + return thread.current_state.command.visit([](String const& cmdline) { return cmdline; }, [](auto const&) { return ""_string; }); case Column::Syscalls: return thread.current_state.syscall_count; case Column::InodeFaults: diff --git a/Userland/Applications/SystemMonitor/ProcessUnveiledPathsWidget.cpp b/Userland/Applications/SystemMonitor/ProcessUnveiledPathsWidget.cpp index 0f9399da3af..3d13a48aaf3 100644 --- a/Userland/Applications/SystemMonitor/ProcessUnveiledPathsWidget.cpp +++ b/Userland/Applications/SystemMonitor/ProcessUnveiledPathsWidget.cpp @@ -23,7 +23,7 @@ ErrorOr> ProcessUnveiledPathsWidget::t widget->m_table_view = TRY(widget->try_add()); Vector pid_unveil_fields; - TRY(pid_unveil_fields.try_empend("path", "Path"_short_string, Gfx::TextAlignment::CenterLeft)); + TRY(pid_unveil_fields.try_empend("path", "Path"_string, Gfx::TextAlignment::CenterLeft)); TRY(pid_unveil_fields.try_empend("permissions", "Permissions"_string, Gfx::TextAlignment::CenterLeft)); widget->m_model = GUI::JsonArrayModel::create({}, move(pid_unveil_fields)); diff --git a/Userland/Applications/SystemMonitor/ThreadStackWidget.cpp b/Userland/Applications/SystemMonitor/ThreadStackWidget.cpp index 303f5a92753..3bdea84556a 100644 --- a/Userland/Applications/SystemMonitor/ThreadStackWidget.cpp +++ b/Userland/Applications/SystemMonitor/ThreadStackWidget.cpp @@ -34,11 +34,11 @@ public: { switch (column) { case Column::Address: - return "Address"_short_string; + return "Address"_string; case Column::Object: - return "Object"_short_string; + return "Object"_string; case Column::Symbol: - return "Symbol"_short_string; + return "Symbol"_string; default: VERIFY_NOT_REACHED(); } diff --git a/Userland/Applications/SystemMonitor/main.cpp b/Userland/Applications/SystemMonitor/main.cpp index f2f8fb553f4..8c146852ba6 100644 --- a/Userland/Applications/SystemMonitor/main.cpp +++ b/Userland/Applications/SystemMonitor/main.cpp @@ -124,10 +124,10 @@ public: Vector df_fields; df_fields.empend("mount_point", "Mount point"_string, Gfx::TextAlignment::CenterLeft); - df_fields.empend("class_name", "Class"_short_string, Gfx::TextAlignment::CenterLeft); - df_fields.empend("source", "Source"_short_string, Gfx::TextAlignment::CenterLeft); + df_fields.empend("class_name", "Class"_string, Gfx::TextAlignment::CenterLeft); + df_fields.empend("source", "Source"_string, Gfx::TextAlignment::CenterLeft); df_fields.empend( - "Size"_short_string, Gfx::TextAlignment::CenterRight, + "Size"_string, Gfx::TextAlignment::CenterRight, [](JsonObject const& object) { StringBuilder size_builder; size_builder.append(' '); @@ -148,7 +148,7 @@ public: return percentage; }); df_fields.empend( - "Used"_short_string, Gfx::TextAlignment::CenterRight, + "Used"_string, Gfx::TextAlignment::CenterRight, [](JsonObject const& object) { auto total_blocks = object.get_u64("total_block_count"sv).value_or(0); auto free_blocks = object.get_u64("free_block_count"sv).value_or(0); @@ -168,7 +168,7 @@ public: [](JsonObject const& object) { return object.get_u64("free_block_count"sv).value_or(0) * object.get_u64("block_size"sv).value_or(0); }); - df_fields.empend("Access"_short_string, Gfx::TextAlignment::CenterLeft, [](JsonObject const& object) { + df_fields.empend("Access"_string, Gfx::TextAlignment::CenterLeft, [](JsonObject const& object) { bool readonly = object.get_bool("readonly"sv).value_or(false); int mount_flags = object.get_i32("mount_flags"sv).value_or(0); return readonly || (mount_flags & MS_RDONLY) ? "Read-only" : "Read/Write"; @@ -427,7 +427,7 @@ ErrorOr serenity_main(Main::Arguments arguments) }, &process_table_view); - auto file_menu = TRY(window->try_add_menu("&File"_short_string)); + auto file_menu = TRY(window->try_add_menu("&File"_string)); TRY(file_menu->try_add_action(GUI::CommonActions::make_quit_action([](auto&) { GUI::Application::the()->quit(); }))); @@ -466,7 +466,7 @@ ErrorOr serenity_main(Main::Arguments arguments) TRY(make_frequency_action(3)); TRY(make_frequency_action(5)); - auto help_menu = TRY(window->try_add_menu("&Help"_short_string)); + auto help_menu = TRY(window->try_add_menu("&Help"_string)); TRY(help_menu->try_add_action(GUI::CommonActions::make_command_palette_action(window))); TRY(help_menu->try_add_action(GUI::CommonActions::make_about_action("System Monitor", app_icon, window))); diff --git a/Userland/Applications/Terminal/main.cpp b/Userland/Applications/Terminal/main.cpp index bdcf63e50a4..aea401d7af9 100644 --- a/Userland/Applications/Terminal/main.cpp +++ b/Userland/Applications/Terminal/main.cpp @@ -335,7 +335,7 @@ ErrorOr serenity_main(Main::Arguments arguments) TRY(terminal->context_menu().try_add_separator()); TRY(terminal->context_menu().try_add_action(open_settings_action)); - auto file_menu = TRY(window->try_add_menu("&File"_short_string)); + auto file_menu = TRY(window->try_add_menu("&File"_string)); TRY(file_menu->try_add_action(GUI::Action::create("Open New &Terminal", { Mod_Ctrl | Mod_Shift, Key_N }, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/app-terminal.png"sv)), [&](auto&) { GUI::Process::spawn_or_show_error(window, "/bin/Terminal"sv); }))); @@ -384,7 +384,7 @@ ErrorOr serenity_main(Main::Arguments arguments) GUI::Application::the()->quit(); }))); - auto edit_menu = TRY(window->try_add_menu("&Edit"_short_string)); + auto edit_menu = TRY(window->try_add_menu("&Edit"_string)); TRY(edit_menu->try_add_action(terminal->copy_action())); TRY(edit_menu->try_add_action(terminal->paste_action())); TRY(edit_menu->try_add_separator()); @@ -394,7 +394,7 @@ ErrorOr serenity_main(Main::Arguments arguments) find_window->move_to_front(); }))); - auto view_menu = TRY(window->try_add_menu("&View"_short_string)); + auto view_menu = TRY(window->try_add_menu("&View"_string)); TRY(view_menu->try_add_action(GUI::CommonActions::make_fullscreen_action([&](auto&) { window->set_fullscreen(!window->is_fullscreen()); }))); @@ -418,7 +418,7 @@ ErrorOr serenity_main(Main::Arguments arguments) adjust_font_size(-1); }))); - auto help_menu = TRY(window->try_add_menu("&Help"_short_string)); + auto help_menu = TRY(window->try_add_menu("&Help"_string)); TRY(help_menu->try_add_action(GUI::CommonActions::make_command_palette_action(window))); TRY(help_menu->try_add_action(GUI::CommonActions::make_help_action([](auto&) { Desktop::Launcher::open(URL::create_with_file_scheme("/usr/share/man/man1/Applications/Terminal.md"), "/bin/Help"); diff --git a/Userland/Applications/TerminalSettings/main.cpp b/Userland/Applications/TerminalSettings/main.cpp index 6e85e550fdd..aede5e9599b 100644 --- a/Userland/Applications/TerminalSettings/main.cpp +++ b/Userland/Applications/TerminalSettings/main.cpp @@ -32,7 +32,7 @@ ErrorOr serenity_main(Main::Arguments arguments) auto window = TRY(GUI::SettingsWindow::create("Terminal Settings")); window->set_icon(app_icon.bitmap_for_size(16)); - (void)TRY(window->add_tab("View"_short_string, "view"sv)); + (void)TRY(window->add_tab("View"_string, "view"sv)); (void)TRY(window->add_tab("Terminal"_string, "terminal"sv)); window->set_active_tab(selected_tab); diff --git a/Userland/Applications/TextEditor/MainWidget.cpp b/Userland/Applications/TextEditor/MainWidget.cpp index 3b9fe0103ef..836665b25ba 100644 --- a/Userland/Applications/TextEditor/MainWidget.cpp +++ b/Userland/Applications/TextEditor/MainWidget.cpp @@ -365,7 +365,7 @@ WebView::OutOfProcessWebView& MainWidget::ensure_web_view() ErrorOr MainWidget::initialize_menubar(GUI::Window& window) { - auto file_menu = TRY(window.try_add_menu("&File"_short_string)); + auto file_menu = TRY(window.try_add_menu("&File"_string)); TRY(file_menu->try_add_action(*m_new_action)); TRY(file_menu->try_add_action(*m_open_action)); TRY(file_menu->try_add_action(*m_save_action)); @@ -396,7 +396,7 @@ ErrorOr MainWidget::initialize_menubar(GUI::Window& window) GUI::Application::the()->quit(); }))); - auto edit_menu = TRY(window.try_add_menu("&Edit"_short_string)); + auto edit_menu = TRY(window.try_add_menu("&Edit"_string)); TRY(edit_menu->try_add_action(m_editor->undo_action())); TRY(edit_menu->try_add_action(m_editor->redo_action())); TRY(edit_menu->try_add_separator()); @@ -460,8 +460,8 @@ ErrorOr MainWidget::initialize_menubar(GUI::Window& window) m_layout_ruler_action->set_checked(show_ruler); m_editor->set_ruler_visible(show_ruler); - auto view_menu = TRY(window.try_add_menu("&View"_short_string)); - auto layout_menu = TRY(view_menu->try_add_submenu("&Layout"_short_string)); + auto view_menu = TRY(window.try_add_menu("&View"_string)); + auto layout_menu = TRY(view_menu->try_add_submenu("&Layout"_string)); TRY(layout_menu->try_add_action(*m_layout_toolbar_action)); TRY(layout_menu->try_add_action(*m_layout_statusbar_action)); TRY(layout_menu->try_add_action(*m_layout_ruler_action)); @@ -594,7 +594,7 @@ ErrorOr MainWidget::initialize_menubar(GUI::Window& window) syntax_actions.set_exclusive(true); - auto syntax_menu = TRY(view_menu->try_add_submenu("&Syntax"_short_string)); + auto syntax_menu = TRY(view_menu->try_add_submenu("&Syntax"_string)); m_plain_text_highlight = GUI::Action::create_checkable("&Plain Text", [&](auto&) { m_statusbar->set_text(1, "Plain Text"_string); m_editor->set_syntax_highlighter({}); @@ -689,7 +689,7 @@ ErrorOr MainWidget::initialize_menubar(GUI::Window& window) syntax_actions.add_action(*m_sql_highlight); TRY(syntax_menu->try_add_action(*m_sql_highlight)); - auto help_menu = TRY(window.try_add_menu("&Help"_short_string)); + auto help_menu = TRY(window.try_add_menu("&Help"_string)); TRY(help_menu->try_add_action(GUI::CommonActions::make_command_palette_action(&window))); TRY(help_menu->try_add_action(GUI::CommonActions::make_help_action([](auto&) { Desktop::Launcher::open(URL::create_with_file_scheme("/usr/share/man/man1/Applications/TextEditor.md"), "/bin/Help"); diff --git a/Userland/Applications/ThemeEditor/MainWidget.cpp b/Userland/Applications/ThemeEditor/MainWidget.cpp index eb014389b48..991d83de4c0 100644 --- a/Userland/Applications/ThemeEditor/MainWidget.cpp +++ b/Userland/Applications/ThemeEditor/MainWidget.cpp @@ -245,7 +245,7 @@ MainWidget::MainWidget(NonnullRefPtr alignment_model) ErrorOr MainWidget::initialize_menubar(GUI::Window& window) { - auto file_menu = TRY(window.try_add_menu("&File"_short_string)); + auto file_menu = TRY(window.try_add_menu("&File"_string)); TRY(file_menu->try_add_action(GUI::CommonActions::make_open_action([&](auto&) { if (request_close() == GUI::Window::CloseRequestDecision::StayOpen) return; @@ -307,7 +307,7 @@ ErrorOr MainWidget::initialize_menubar(GUI::Window& window) TRY(window.try_add_menu(TRY(GUI::CommonMenus::make_accessibility_menu(*m_preview_widget)))); - auto help_menu = TRY(window.try_add_menu("&Help"_short_string)); + auto help_menu = TRY(window.try_add_menu("&Help"_string)); TRY(help_menu->try_add_action(GUI::CommonActions::make_command_palette_action(&window))); TRY(help_menu->try_add_action(GUI::CommonActions::make_about_action("Theme Editor", GUI::Icon::default_icon("app-theme-editor"sv), &window))); diff --git a/Userland/Applications/VideoPlayer/VideoPlayerWidget.cpp b/Userland/Applications/VideoPlayer/VideoPlayerWidget.cpp index e22a2d1370f..3b07afced2d 100644 --- a/Userland/Applications/VideoPlayer/VideoPlayerWidget.cpp +++ b/Userland/Applications/VideoPlayer/VideoPlayerWidget.cpp @@ -382,7 +382,7 @@ void VideoPlayerWidget::set_sizing_mode(VideoSizingMode sizing_mode) ErrorOr VideoPlayerWidget::initialize_menubar(GUI::Window& window) { // File menu - auto file_menu = TRY(window.try_add_menu("&File"_short_string)); + auto file_menu = TRY(window.try_add_menu("&File"_string)); TRY(file_menu->try_add_action(GUI::CommonActions::make_open_action([&](auto&) { FileSystemAccessClient::OpenFileOptions options { .allowed_file_types = { { GUI::FileTypeFilter { "Video Files", { { "mkv", "webm" } } }, GUI::FileTypeFilter::all_files() } }, @@ -408,7 +408,7 @@ ErrorOr VideoPlayerWidget::initialize_menubar(GUI::Window& window) set_seek_mode(Video::PlaybackManager::DEFAULT_SEEK_MODE); // View menu - auto view_menu = TRY(window.try_add_menu("&View"_short_string)); + auto view_menu = TRY(window.try_add_menu("&View"_string)); TRY(view_menu->try_add_action(*m_toggle_fullscreen_action)); auto sizing_mode_menu = TRY(view_menu->try_add_submenu("&Sizing Mode"_string)); @@ -427,7 +427,7 @@ ErrorOr VideoPlayerWidget::initialize_menubar(GUI::Window& window) TRY(sizing_mode_menu->try_add_action(*m_size_fullsize_action)); // Help menu - auto help_menu = TRY(window.try_add_menu("&Help"_short_string)); + auto help_menu = TRY(window.try_add_menu("&Help"_string)); TRY(help_menu->try_add_action(GUI::CommonActions::make_about_action("Video Player", TRY(GUI::Icon::try_create_default_icon("app-video-player"sv)), &window))); return {}; diff --git a/Userland/Demos/Eyes/main.cpp b/Userland/Demos/Eyes/main.cpp index 218c8c308a7..0bbb066a0d3 100644 --- a/Userland/Demos/Eyes/main.cpp +++ b/Userland/Demos/Eyes/main.cpp @@ -84,12 +84,12 @@ ErrorOr serenity_main(Main::Arguments arguments) set_window_frame_enabled(!hide_window_frame); show_window_frame_action->set_checked(window_frame_enabled); - auto file_menu = TRY(window->try_add_menu("&File"_short_string)); + auto file_menu = TRY(window->try_add_menu("&File"_string)); TRY(file_menu->try_add_action(move(show_window_frame_action))); TRY(file_menu->try_add_separator()); TRY(file_menu->try_add_action(GUI::CommonActions::make_quit_action([&](auto&) { app->quit(); }))); - auto help_menu = TRY(window->try_add_menu("&Help"_short_string)); + auto help_menu = TRY(window->try_add_menu("&Help"_string)); TRY(help_menu->try_add_action(GUI::CommonActions::make_command_palette_action(window))); TRY(help_menu->try_add_action(GUI::CommonActions::make_help_action([](auto&) { Desktop::Launcher::open(URL::create_with_file_scheme("/usr/share/man/man1/Applications/Eyes.md"), "/bin/Help"); diff --git a/Userland/Demos/LibGfxDemo/main.cpp b/Userland/Demos/LibGfxDemo/main.cpp index 3f539cc038c..8897512403d 100644 --- a/Userland/Demos/LibGfxDemo/main.cpp +++ b/Userland/Demos/LibGfxDemo/main.cpp @@ -197,7 +197,7 @@ ErrorOr serenity_main(Main::Arguments arguments) window->set_resizable(false); window->resize(WIDTH, HEIGHT); - auto file_menu = TRY(window->try_add_menu("&File"_short_string)); + auto file_menu = TRY(window->try_add_menu("&File"_string)); TRY(file_menu->try_add_action(GUI::CommonActions::make_quit_action([&](auto&) { app->quit(); }))); auto app_icon = TRY(GUI::Icon::try_create_default_icon("app-libgfx-demo"sv)); diff --git a/Userland/Demos/LibGfxScaleDemo/main.cpp b/Userland/Demos/LibGfxScaleDemo/main.cpp index a1709f3bf3b..9f3625f8db3 100644 --- a/Userland/Demos/LibGfxScaleDemo/main.cpp +++ b/Userland/Demos/LibGfxScaleDemo/main.cpp @@ -116,7 +116,7 @@ ErrorOr serenity_main(Main::Arguments arguments) window->set_resizable(false); window->resize(WIDTH * 2, HEIGHT * 3); - auto file_menu = TRY(window->try_add_menu("&File"_short_string)); + auto file_menu = TRY(window->try_add_menu("&File"_string)); TRY(file_menu->try_add_action(GUI::CommonActions::make_quit_action([&](auto&) { app->quit(); }))); auto app_icon = TRY(GUI::Icon::try_create_default_icon("app-libgfx-demo"sv)); diff --git a/Userland/Demos/Mandelbrot/Mandelbrot.cpp b/Userland/Demos/Mandelbrot/Mandelbrot.cpp index ea59139af21..db06862d69b 100644 --- a/Userland/Demos/Mandelbrot/Mandelbrot.cpp +++ b/Userland/Demos/Mandelbrot/Mandelbrot.cpp @@ -413,9 +413,9 @@ ErrorOr serenity_main(Main::Arguments arguments) window->resize(window->minimum_size() * 2); auto mandelbrot = TRY(window->set_main_widget()); - auto file_menu = TRY(window->try_add_menu("&File"_short_string)); + auto file_menu = TRY(window->try_add_menu("&File"_string)); - auto& export_submenu = file_menu->add_submenu("&Export"_short_string); + auto& export_submenu = file_menu->add_submenu("&Export"_string); TRY(export_submenu.try_add_action(GUI::Action::create("As &BMP...", [&](GUI::Action&) { @@ -469,12 +469,12 @@ ErrorOr serenity_main(Main::Arguments arguments) auto app_icon = GUI::Icon::default_icon("app-mandelbrot"sv); window->set_icon(app_icon.bitmap_for_size(16)); - auto view_menu = TRY(window->try_add_menu("&View"_short_string)); + auto view_menu = TRY(window->try_add_menu("&View"_string)); TRY(view_menu->try_add_action(zoom_in_action)); TRY(view_menu->try_add_action(reset_zoom_action)); TRY(view_menu->try_add_action(zoom_out_action)); - auto help_menu = TRY(window->try_add_menu("&Help"_short_string)); + auto help_menu = TRY(window->try_add_menu("&Help"_string)); TRY(help_menu->try_add_action(GUI::CommonActions::make_command_palette_action(window))); TRY(help_menu->try_add_action(GUI::CommonActions::make_about_action("Mandelbrot Demo", app_icon, window))); diff --git a/Userland/Demos/ModelGallery/BasicModel.h b/Userland/Demos/ModelGallery/BasicModel.h index 91aec979148..6fdd896b24d 100644 --- a/Userland/Demos/ModelGallery/BasicModel.h +++ b/Userland/Demos/ModelGallery/BasicModel.h @@ -20,7 +20,7 @@ public: virtual int row_count(GUI::ModelIndex const& = GUI::ModelIndex()) const override { return m_items.size(); } virtual int column_count(GUI::ModelIndex const& = GUI::ModelIndex()) const override { return 1; } - virtual ErrorOr column_name(int) const override { return "Item"_short_string; } + virtual ErrorOr column_name(int) const override { return "Item"_string; } virtual GUI::Variant data(GUI::ModelIndex const&, GUI::ModelRole = GUI::ModelRole::Display) const override; virtual GUI::Model::MatchResult data_matches(GUI::ModelIndex const&, GUI::Variant const&) const override; diff --git a/Userland/Demos/Screensaver/main.cpp b/Userland/Demos/Screensaver/main.cpp index 403065795be..43970bed0a0 100644 --- a/Userland/Demos/Screensaver/main.cpp +++ b/Userland/Demos/Screensaver/main.cpp @@ -76,12 +76,12 @@ ErrorOr serenity_main(Main::Arguments arguments) window->set_title("Screensaver"); window->resize(360, 240); - auto file_menu = TRY(window->try_add_menu("&File"_short_string)); + auto file_menu = TRY(window->try_add_menu("&File"_string)); file_menu->add_action(GUI::CommonActions::make_quit_action([&](auto&) { app->quit(); })); - auto help_menu = TRY(window->try_add_menu("&Help"_short_string)); + auto help_menu = TRY(window->try_add_menu("&Help"_string)); TRY(help_menu->try_add_action(GUI::CommonActions::make_command_palette_action(window))); TRY(help_menu->try_add_action(GUI::CommonActions::make_about_action("Screensaver", app_icon, window))); diff --git a/Userland/Demos/WidgetGallery/GalleryModels.h b/Userland/Demos/WidgetGallery/GalleryModels.h index dafb3969dea..20d4d403a34 100644 --- a/Userland/Demos/WidgetGallery/GalleryModels.h +++ b/Userland/Demos/WidgetGallery/GalleryModels.h @@ -33,7 +33,7 @@ public: case Column::Bitmap: return String {}; case Column::Name: - return "Name"_short_string; + return "Name"_string; } VERIFY_NOT_REACHED(); } @@ -120,7 +120,7 @@ public: case Column::LittleIcon: return String {}; case Column::Name: - return "Name"_short_string; + return "Name"_string; } VERIFY_NOT_REACHED(); } diff --git a/Userland/Demos/WidgetGallery/GalleryWidget.cpp b/Userland/Demos/WidgetGallery/GalleryWidget.cpp index 184ae494116..86aeb53c7fb 100644 --- a/Userland/Demos/WidgetGallery/GalleryWidget.cpp +++ b/Userland/Demos/WidgetGallery/GalleryWidget.cpp @@ -36,7 +36,7 @@ GalleryWidget::GalleryWidget() auto& tab_widget = *find_descendant_of_type_named("tab_widget"); - auto basics_tab = tab_widget.try_add_tab("Basics"_short_string).release_value_but_fixme_should_propagate_errors(); + auto basics_tab = tab_widget.try_add_tab("Basics"_string).release_value_but_fixme_should_propagate_errors(); basics_tab->load_from_gml(basics_tab_gml).release_value_but_fixme_should_propagate_errors(); m_enabled_label = basics_tab->find_descendant_of_type_named("enabled_label"); @@ -160,7 +160,7 @@ GalleryWidget::GalleryWidget() GUI::MessageBox::show(window(), m_text_editor->text(), "Message"sv, m_msgbox_type, m_msgbox_input_type); }; - auto sliders_tab = tab_widget.try_add_tab("Sliders"_short_string).release_value_but_fixme_should_propagate_errors(); + auto sliders_tab = tab_widget.try_add_tab("Sliders"_string).release_value_but_fixme_should_propagate_errors(); sliders_tab->load_from_gml(sliders_tab_gml).release_value_but_fixme_should_propagate_errors(); m_vertical_progressbar_left = sliders_tab->find_descendant_of_type_named("vertical_progressbar_left"); @@ -221,7 +221,7 @@ GalleryWidget::GalleryWidget() m_opacity_slider->set_value(percent); }; - auto wizards_tab = tab_widget.try_add_tab("Wizards"_short_string).release_value_but_fixme_should_propagate_errors(); + auto wizards_tab = tab_widget.try_add_tab("Wizards"_string).release_value_but_fixme_should_propagate_errors(); wizards_tab->load_from_gml(wizards_tab_gml).release_value_but_fixme_should_propagate_errors(); m_wizard_button = wizards_tab->find_descendant_of_type_named("wizard_button"); @@ -277,7 +277,7 @@ GalleryWidget::GalleryWidget() m_wizard_output->set_text(sb.string_view()); }; - auto cursors_tab = tab_widget.try_add_tab("Cursors"_short_string).release_value_but_fixme_should_propagate_errors(); + auto cursors_tab = tab_widget.try_add_tab("Cursors"_string).release_value_but_fixme_should_propagate_errors(); cursors_tab->load_from_gml(cursors_tab_gml).release_value_but_fixme_should_propagate_errors(); m_cursors_tableview = cursors_tab->find_descendant_of_type_named("cursors_tableview"); @@ -300,7 +300,7 @@ GalleryWidget::GalleryWidget() m_cursors_tableview->set_override_cursor(NonnullRefPtr(icon_index.data().as_bitmap())); }; - auto icons_tab = tab_widget.try_add_tab("Icons"_short_string).release_value_but_fixme_should_propagate_errors(); + auto icons_tab = tab_widget.try_add_tab("Icons"_string).release_value_but_fixme_should_propagate_errors(); icons_tab->load_from_gml(icons_tab_gml).release_value_but_fixme_should_propagate_errors(); m_icons_tableview = icons_tab->find_descendant_of_type_named("icons_tableview"); diff --git a/Userland/DevTools/GMLPlayground/MainWidget.cpp b/Userland/DevTools/GMLPlayground/MainWidget.cpp index bf89548fef6..33c23342661 100644 --- a/Userland/DevTools/GMLPlayground/MainWidget.cpp +++ b/Userland/DevTools/GMLPlayground/MainWidget.cpp @@ -134,7 +134,7 @@ void MainWidget::load_file(FileSystemAccessClient::File file) ErrorOr MainWidget::initialize_menubar(GUI::Window& window) { - auto file_menu = TRY(window.try_add_menu("&File"_short_string)); + auto file_menu = TRY(window.try_add_menu("&File"_string)); m_save_as_action = GUI::CommonActions::make_save_as_action([&](auto&) { LexicalPath initial_path(m_file_path.is_empty() ? "Untitled.gml" : m_file_path); @@ -206,7 +206,7 @@ ErrorOr MainWidget::initialize_menubar(GUI::Window& window) GUI::Application::the()->quit(); }))); - auto edit_menu = TRY(window.try_add_menu("&Edit"_short_string)); + auto edit_menu = TRY(window.try_add_menu("&Edit"_string)); TRY(edit_menu->try_add_action(m_editor->undo_action())); TRY(edit_menu->try_add_action(m_editor->redo_action())); TRY(edit_menu->try_add_separator()); @@ -241,7 +241,7 @@ ErrorOr MainWidget::initialize_menubar(GUI::Window& window) vim_emulation_setting_action->set_checked(false); TRY(edit_menu->try_add_action(vim_emulation_setting_action)); - auto view_menu = TRY(window.try_add_menu("&View"_short_string)); + auto view_menu = TRY(window.try_add_menu("&View"_string)); m_views_group.set_exclusive(true); m_views_group.set_unchecking_allowed(false); @@ -272,7 +272,7 @@ ErrorOr MainWidget::initialize_menubar(GUI::Window& window) m_view_frame_action->activate(); }; - auto help_menu = TRY(window.try_add_menu("&Help"_short_string)); + auto help_menu = TRY(window.try_add_menu("&Help"_string)); TRY(help_menu->try_add_action(GUI::CommonActions::make_command_palette_action(&window))); TRY(help_menu->try_add_action(GUI::CommonActions::make_help_action([](auto&) { Desktop::Launcher::open(URL::create_with_file_scheme("/usr/share/man/man1/Applications/GMLPlayground.md"), "/bin/Help"); diff --git a/Userland/DevTools/HackStudio/Debugger/DisassemblyModel.cpp b/Userland/DevTools/HackStudio/Debugger/DisassemblyModel.cpp index b45cc7c09f3..956a133c8ea 100644 --- a/Userland/DevTools/HackStudio/Debugger/DisassemblyModel.cpp +++ b/Userland/DevTools/HackStudio/Debugger/DisassemblyModel.cpp @@ -77,7 +77,7 @@ ErrorOr DisassemblyModel::column_name(int column) const { switch (column) { case Column::Address: - return "Address"_short_string; + return "Address"_string; case Column::InstructionBytes: return "Insn Bytes"_string; case Column::Disassembly: diff --git a/Userland/DevTools/HackStudio/Debugger/RegistersModel.cpp b/Userland/DevTools/HackStudio/Debugger/RegistersModel.cpp index 66b0c60c6a7..0191dccbe18 100644 --- a/Userland/DevTools/HackStudio/Debugger/RegistersModel.cpp +++ b/Userland/DevTools/HackStudio/Debugger/RegistersModel.cpp @@ -92,7 +92,7 @@ ErrorOr RegistersModel::column_name(int column) const case Column::Register: return "Register"_string; case Column::Value: - return "Value"_short_string; + return "Value"_string; default: VERIFY_NOT_REACHED(); } diff --git a/Userland/DevTools/HackStudio/Dialogs/ProjectTemplatesModel.cpp b/Userland/DevTools/HackStudio/Dialogs/ProjectTemplatesModel.cpp index 9e69fa0498d..2c6c17e51b3 100644 --- a/Userland/DevTools/HackStudio/Dialogs/ProjectTemplatesModel.cpp +++ b/Userland/DevTools/HackStudio/Dialogs/ProjectTemplatesModel.cpp @@ -57,11 +57,11 @@ ErrorOr ProjectTemplatesModel::column_name(int column) const { switch (column) { case Column::Icon: - return "Icon"_short_string; + return "Icon"_string; case Column::Id: - return "ID"_short_string; + return "ID"_string; case Column::Name: - return "Name"_short_string; + return "Name"_string; } VERIFY_NOT_REACHED(); } diff --git a/Userland/DevTools/HackStudio/FindInFilesWidget.cpp b/Userland/DevTools/HackStudio/FindInFilesWidget.cpp index 520f573d0ff..f8977c9b5b7 100644 --- a/Userland/DevTools/HackStudio/FindInFilesWidget.cpp +++ b/Userland/DevTools/HackStudio/FindInFilesWidget.cpp @@ -45,9 +45,9 @@ public: case Column::Filename: return "Filename"_string; case Column::Location: - return "#"_short_string; + return "#"_string; case Column::MatchedText: - return "Text"_short_string; + return "Text"_string; default: VERIFY_NOT_REACHED(); } diff --git a/Userland/DevTools/HackStudio/Git/GitWidget.cpp b/Userland/DevTools/HackStudio/Git/GitWidget.cpp index 1e48bc3885c..0dace80f541 100644 --- a/Userland/DevTools/HackStudio/Git/GitWidget.cpp +++ b/Userland/DevTools/HackStudio/Git/GitWidget.cpp @@ -64,7 +64,7 @@ GitWidget::GitWidget() commit_button.on_click = [this](int) { commit(); }; auto& staged_label = staged_header.add(); - staged_label.set_text("Staged"_short_string); + staged_label.set_text("Staged"_string); staged_header.set_fixed_height(20); m_staged_files = staged.add( diff --git a/Userland/DevTools/HackStudio/HackStudioWidget.cpp b/Userland/DevTools/HackStudio/HackStudioWidget.cpp index 9ea2d23d751..6fde13eca71 100644 --- a/Userland/DevTools/HackStudio/HackStudioWidget.cpp +++ b/Userland/DevTools/HackStudio/HackStudioWidget.cpp @@ -494,7 +494,7 @@ ErrorOr> HackStudioWidget::create_project_tree_view_con }); auto project_tree_view_context_menu = GUI::Menu::construct("Project Files"_string); - auto& new_file_submenu = project_tree_view_context_menu->add_submenu("N&ew..."_short_string); + auto& new_file_submenu = project_tree_view_context_menu->add_submenu("N&ew..."_string); for (auto& new_file_action : m_new_file_actions) { new_file_submenu.add_action(new_file_action); } @@ -1343,10 +1343,10 @@ ErrorOr HackStudioWidget::create_action_tab(GUI::Widget& parent) }; m_find_in_files_widget = m_action_tab_widget->add_tab("Find"_string); - m_todo_entries_widget = m_action_tab_widget->add_tab("TODO"_short_string); - m_terminal_wrapper = m_action_tab_widget->add_tab("Console"_short_string, false); + m_todo_entries_widget = m_action_tab_widget->add_tab("TODO"_string); + m_terminal_wrapper = m_action_tab_widget->add_tab("Console"_string, false); auto debug_info_widget = TRY(DebugInfoWidget::create()); - TRY(m_action_tab_widget->add_tab(debug_info_widget, "Debug"_short_string)); + TRY(m_action_tab_widget->add_tab(debug_info_widget, "Debug"_string)); m_debug_info_widget = debug_info_widget; m_debug_info_widget->on_backtrace_frame_selection = [this](Debug::DebugInfo::SourcePosition const& source_position) { @@ -1354,7 +1354,7 @@ ErrorOr HackStudioWidget::create_action_tab(GUI::Widget& parent) }; m_disassembly_widget = m_action_tab_widget->add_tab("Disassembly"_string); - m_git_widget = m_action_tab_widget->add_tab("Git"_short_string); + m_git_widget = m_action_tab_widget->add_tab("Git"_string); m_git_widget->set_view_diff_callback([this](auto const& original_content, auto const& diff) { m_diff_viewer->set_content(original_content, diff); set_edit_mode(EditMode::Diff); @@ -1373,13 +1373,13 @@ void HackStudioWidget::create_project_tab(GUI::Widget& parent) m_project_tab = parent.add(); m_project_tab->set_tab_position(GUI::TabWidget::TabPosition::Bottom); - auto& tree_view_container = m_project_tab->add_tab("Files"_short_string); + auto& tree_view_container = m_project_tab->add_tab("Files"_string); tree_view_container.set_layout(GUI::Margins {}, 2); m_project_tree_view = tree_view_container.add(); configure_project_tree_view(); - auto& class_view_container = m_project_tab->add_tab("Classes"_short_string); + auto& class_view_container = m_project_tab->add_tab("Classes"_string); class_view_container.set_layout(2); m_class_view = class_view_container.add(); @@ -1414,9 +1414,9 @@ void HackStudioWidget::update_recent_projects_submenu() ErrorOr HackStudioWidget::create_file_menu(GUI::Window& window) { - auto& file_menu = window.add_menu("&File"_short_string); + auto& file_menu = window.add_menu("&File"_string); - auto& new_submenu = file_menu.add_submenu("&New..."_short_string); + auto& new_submenu = file_menu.add_submenu("&New..."_string); new_submenu.add_action(*m_new_project_action); new_submenu.add_separator(); for (auto& new_file_action : m_new_file_actions) { @@ -1449,7 +1449,7 @@ ErrorOr HackStudioWidget::create_file_menu(GUI::Window& window) ErrorOr HackStudioWidget::create_edit_menu(GUI::Window& window) { - auto& edit_menu = window.add_menu("&Edit"_short_string); + auto& edit_menu = window.add_menu("&Edit"_string); auto icon = TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/find.png"sv)); edit_menu.add_action(GUI::Action::create("&Find in Files...", { Mod_Ctrl | Mod_Shift, Key_F }, icon, [this](auto&) { reveal_action_tab(*m_find_in_files_widget); @@ -1477,7 +1477,7 @@ ErrorOr HackStudioWidget::create_edit_menu(GUI::Window& window) void HackStudioWidget::create_build_menu(GUI::Window& window) { - auto& build_menu = window.add_menu("&Build"_short_string); + auto& build_menu = window.add_menu("&Build"_string); build_menu.add_action(*m_build_action); build_menu.add_separator(); build_menu.add_action(*m_run_action); @@ -1500,7 +1500,7 @@ ErrorOr HackStudioWidget::create_view_menu(GUI::Window& window) }); show_dotfiles_action->set_checked(Config::read_bool("HackStudio"sv, "Global"sv, "ShowDotfiles"sv, false)); - auto& view_menu = window.add_menu("&View"_short_string); + auto& view_menu = window.add_menu("&View"_string); view_menu.add_action(hide_action_tabs_action); view_menu.add_action(open_locator_action); view_menu.add_action(show_dotfiles_action); @@ -1581,7 +1581,7 @@ ErrorOr HackStudioWidget::create_view_menu(GUI::Window& window) void HackStudioWidget::create_help_menu(GUI::Window& window) { - auto& help_menu = window.add_menu("&Help"_short_string); + auto& help_menu = window.add_menu("&Help"_string); help_menu.add_action(GUI::CommonActions::make_command_palette_action(&window)); help_menu.add_action(GUI::CommonActions::make_about_action("Hack Studio", GUI::Icon::default_icon("app-hack-studio"sv), &window)); } diff --git a/Userland/DevTools/HackStudio/ToDoEntriesWidget.cpp b/Userland/DevTools/HackStudio/ToDoEntriesWidget.cpp index 6bfa4610697..5c87472ac85 100644 --- a/Userland/DevTools/HackStudio/ToDoEntriesWidget.cpp +++ b/Userland/DevTools/HackStudio/ToDoEntriesWidget.cpp @@ -36,11 +36,11 @@ public: case Column::Filename: return "Filename"_string; case Column::Text: - return "Text"_short_string; + return "Text"_string; case Column::Line: - return "Line"_short_string; + return "Line"_string; case Column::Column: - return "Col"_short_string; + return "Col"_string; default: VERIFY_NOT_REACHED(); } diff --git a/Userland/DevTools/Profiler/DisassemblyModel.cpp b/Userland/DevTools/Profiler/DisassemblyModel.cpp index 58929850503..5b4eab557e8 100644 --- a/Userland/DevTools/Profiler/DisassemblyModel.cpp +++ b/Userland/DevTools/Profiler/DisassemblyModel.cpp @@ -137,7 +137,7 @@ ErrorOr DisassemblyModel::column_name(int column) const case Column::SampleCount: return m_profile.show_percentages() ? "% Samples"_string : "# Samples"_string; case Column::Address: - return "Address"_short_string; + return "Address"_string; case Column::InstructionBytes: return "Insn Bytes"_string; case Column::Disassembly: diff --git a/Userland/DevTools/Profiler/FilesystemEventModel.cpp b/Userland/DevTools/Profiler/FilesystemEventModel.cpp index b07c4120835..906f2590cf9 100644 --- a/Userland/DevTools/Profiler/FilesystemEventModel.cpp +++ b/Userland/DevTools/Profiler/FilesystemEventModel.cpp @@ -146,7 +146,7 @@ ErrorOr FileEventModel::column_name(int column) const { switch (column) { case Column::Path: - return "Path"_short_string; + return "Path"_string; case Column::Count: return "Event Count"_string; case Column::Duration: diff --git a/Userland/DevTools/Profiler/IndividualSampleModel.cpp b/Userland/DevTools/Profiler/IndividualSampleModel.cpp index b25a371d36b..fb3fb06cfe2 100644 --- a/Userland/DevTools/Profiler/IndividualSampleModel.cpp +++ b/Userland/DevTools/Profiler/IndividualSampleModel.cpp @@ -33,11 +33,11 @@ ErrorOr IndividualSampleModel::column_name(int column) const { switch (column) { case Column::Address: - return "Address"_short_string; + return "Address"_string; case Column::ObjectName: - return "Object"_short_string; + return "Object"_string; case Column::Symbol: - return "Symbol"_short_string; + return "Symbol"_string; default: VERIFY_NOT_REACHED(); } diff --git a/Userland/DevTools/Profiler/ProfileModel.cpp b/Userland/DevTools/Profiler/ProfileModel.cpp index c2a01a279d1..cb09e01bdce 100644 --- a/Userland/DevTools/Profiler/ProfileModel.cpp +++ b/Userland/DevTools/Profiler/ProfileModel.cpp @@ -80,9 +80,9 @@ ErrorOr ProfileModel::column_name(int column) const case Column::SampleCount: return m_profile.show_percentages() ? "% Samples"_string : "# Samples"_string; case Column::SelfCount: - return m_profile.show_percentages() ? "% Self"_short_string : "# Self"_short_string; + return m_profile.show_percentages() ? "% Self"_string : "# Self"_string; case Column::ObjectName: - return "Object"_short_string; + return "Object"_string; case Column::StackFrame: return "Stack Frame"_string; case Column::SymbolAddress: diff --git a/Userland/DevTools/Profiler/SamplesModel.cpp b/Userland/DevTools/Profiler/SamplesModel.cpp index be9490a5f3e..a6a0084b482 100644 --- a/Userland/DevTools/Profiler/SamplesModel.cpp +++ b/Userland/DevTools/Profiler/SamplesModel.cpp @@ -32,13 +32,13 @@ ErrorOr SamplesModel::column_name(int column) const { switch (column) { case Column::SampleIndex: - return "#"_short_string; + return "#"_string; case Column::Timestamp: return "Timestamp"_string; case Column::ProcessID: - return "PID"_short_string; + return "PID"_string; case Column::ThreadID: - return "TID"_short_string; + return "TID"_string; case Column::ExecutableName: return "Executable"_string; case Column::LostSamples: @@ -46,7 +46,7 @@ ErrorOr SamplesModel::column_name(int column) const case Column::InnermostStackFrame: return "Innermost Frame"_string; case Column::Path: - return "Path"_short_string; + return "Path"_string; default: VERIFY_NOT_REACHED(); } diff --git a/Userland/DevTools/Profiler/SignpostsModel.cpp b/Userland/DevTools/Profiler/SignpostsModel.cpp index 376383f4b73..aba5e0f561e 100644 --- a/Userland/DevTools/Profiler/SignpostsModel.cpp +++ b/Userland/DevTools/Profiler/SignpostsModel.cpp @@ -30,17 +30,17 @@ ErrorOr SignpostsModel::column_name(int column) const { switch (column) { case Column::SignpostIndex: - return "#"_short_string; + return "#"_string; case Column::Timestamp: return "Timestamp"_string; case Column::ProcessID: - return "PID"_short_string; + return "PID"_string; case Column::ThreadID: - return "TID"_short_string; + return "TID"_string; case Column::ExecutableName: return "Executable"_string; case Column::SignpostString: - return "String"_short_string; + return "String"_string; case Column::SignpostArgument: return "Argument"_string; default: diff --git a/Userland/DevTools/Profiler/SourceModel.cpp b/Userland/DevTools/Profiler/SourceModel.cpp index 551b595accd..ae8bd2043b7 100644 --- a/Userland/DevTools/Profiler/SourceModel.cpp +++ b/Userland/DevTools/Profiler/SourceModel.cpp @@ -132,7 +132,7 @@ ErrorOr SourceModel::column_name(int column) const case Column::Location: return "Location"_string; case Column::LineNumber: - return "Line"_short_string; + return "Line"_string; default: VERIFY_NOT_REACHED(); } diff --git a/Userland/DevTools/Profiler/main.cpp b/Userland/DevTools/Profiler/main.cpp index 633a8efffc2..98ea14583d9 100644 --- a/Userland/DevTools/Profiler/main.cpp +++ b/Userland/DevTools/Profiler/main.cpp @@ -265,10 +265,10 @@ ErrorOr serenity_main(Main::Arguments arguments) filesystem_events_tree_view->set_selection_behavior(GUI::TreeView::SelectionBehavior::SelectRows); filesystem_events_tree_view->set_model(profile->file_event_model()); - auto file_menu = TRY(window->try_add_menu("&File"_short_string)); + auto file_menu = TRY(window->try_add_menu("&File"_string)); TRY(file_menu->try_add_action(GUI::CommonActions::make_quit_action([&](auto&) { app->quit(); }))); - auto view_menu = TRY(window->try_add_menu("&View"_short_string)); + auto view_menu = TRY(window->try_add_menu("&View"_string)); auto invert_action = GUI::Action::create_checkable("&Invert Tree", { Mod_Ctrl, Key_I }, [&](auto& action) { profile->set_inverted(action.is_checked()); @@ -294,7 +294,7 @@ ErrorOr serenity_main(Main::Arguments arguments) TRY(view_menu->try_add_action(disassembly_action)); TRY(view_menu->try_add_action(source_action)); - auto help_menu = TRY(window->try_add_menu("&Help"_short_string)); + auto help_menu = TRY(window->try_add_menu("&Help"_string)); TRY(help_menu->try_add_action(GUI::CommonActions::make_command_palette_action(window))); TRY(help_menu->try_add_action(GUI::CommonActions::make_help_action([](auto&) { Desktop::Launcher::open(URL::create_with_file_scheme("/usr/share/man/man1/Applications/Profiler.md"), "/bin/Help"); @@ -317,7 +317,7 @@ static bool prompt_to_stop_profiling(pid_t pid, DeprecatedString const& process_ widget->set_fill_with_background_color(true); widget->set_layout(GUI::Margins { 0, 0, 16 }); - auto& timer_label = widget->add("..."_short_string); + auto& timer_label = widget->add("..."_string); Core::ElapsedTimer clock; clock.start(); auto update_timer = Core::Timer::create_repeating(100, [&] { @@ -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("Stop"_short_string); + auto& stop_button = widget->add("Stop"_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, "Profile"_short_string, 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"_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/DevTools/SQLStudio/MainWidget.cpp b/Userland/DevTools/SQLStudio/MainWidget.cpp index b24e4b5a964..b0dce5cf098 100644 --- a/Userland/DevTools/SQLStudio/MainWidget.cpp +++ b/Userland/DevTools/SQLStudio/MainWidget.cpp @@ -235,7 +235,7 @@ ErrorOr MainWidget::setup() m_action_tab_widget = find_descendant_of_type_named("action_tab_widget"sv); - m_query_results_widget = m_action_tab_widget->add_tab("Results"_short_string); + m_query_results_widget = m_action_tab_widget->add_tab("Results"_string); m_query_results_widget->set_layout(6); m_query_results_table_view = m_query_results_widget->add(); @@ -301,7 +301,7 @@ ErrorOr MainWidget::setup() ErrorOr MainWidget::initialize_menu(GUI::Window* window) { - auto file_menu = TRY(window->try_add_menu("&File"_short_string)); + auto file_menu = TRY(window->try_add_menu("&File"_string)); TRY(file_menu->try_add_action(*m_new_action)); TRY(file_menu->try_add_action(*m_open_action)); TRY(file_menu->try_add_action(*m_save_action)); @@ -312,7 +312,7 @@ ErrorOr MainWidget::initialize_menu(GUI::Window* window) GUI::Application::the()->quit(); }))); - auto edit_menu = TRY(window->try_add_menu("&Edit"_short_string)); + auto edit_menu = TRY(window->try_add_menu("&Edit"_string)); TRY(edit_menu->try_add_action(*m_copy_action)); TRY(edit_menu->try_add_action(*m_cut_action)); TRY(edit_menu->try_add_action(*m_paste_action)); @@ -322,7 +322,7 @@ ErrorOr MainWidget::initialize_menu(GUI::Window* window) TRY(edit_menu->try_add_separator()); TRY(edit_menu->try_add_action(*m_run_script_action)); - auto help_menu = TRY(window->try_add_menu("&Help"_short_string)); + auto help_menu = TRY(window->try_add_menu("&Help"_string)); TRY(help_menu->try_add_action(GUI::CommonActions::make_command_palette_action(window))); TRY(help_menu->try_add_action(GUI::CommonActions::make_help_action([](auto&) { Desktop::Launcher::open(URL::create_with_file_scheme("/usr/share/man/man1/Applications/SQLStudio.md"), "/bin/Help"); diff --git a/Userland/Games/2048/main.cpp b/Userland/Games/2048/main.cpp index 59984e2a3ec..03312dc5c7b 100644 --- a/Userland/Games/2048/main.cpp +++ b/Userland/Games/2048/main.cpp @@ -165,7 +165,7 @@ ErrorOr serenity_main(Main::Arguments arguments) } }; - auto game_menu = TRY(window->try_add_menu("&Game"_short_string)); + auto game_menu = TRY(window->try_add_menu("&Game"_string)); TRY(game_menu->try_add_action(GUI::Action::create("&New Game", { Mod_None, Key_F2 }, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/reload.png"sv)), [&](auto&) { start_a_new_game(); @@ -197,7 +197,7 @@ ErrorOr serenity_main(Main::Arguments arguments) GUI::Application::the()->quit(); }))); - auto help_menu = TRY(window->try_add_menu("&Help"_short_string)); + auto help_menu = TRY(window->try_add_menu("&Help"_string)); TRY(help_menu->try_add_action(GUI::CommonActions::make_command_palette_action(window))); TRY(help_menu->try_add_action(GUI::CommonActions::make_help_action([](auto&) { Desktop::Launcher::open(URL::create_with_file_scheme("/usr/share/man/man6/2048.md"), "/bin/Help"); diff --git a/Userland/Games/BrickGame/main.cpp b/Userland/Games/BrickGame/main.cpp index 3f3315470bf..19feb34e1a4 100644 --- a/Userland/Games/BrickGame/main.cpp +++ b/Userland/Games/BrickGame/main.cpp @@ -51,7 +51,7 @@ ErrorOr serenity_main(Main::Arguments arguments) auto game = TRY(window->set_main_widget(app_name)); - auto game_menu = TRY(window->try_add_menu("&Game"_short_string)); + auto game_menu = TRY(window->try_add_menu("&Game"_string)); TRY(game_menu->try_add_action(GUI::Action::create("&New Game", { Mod_None, Key_F2 }, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/reload.png"sv)), [&](auto&) { game->reset(); @@ -73,7 +73,7 @@ ErrorOr serenity_main(Main::Arguments arguments) GUI::Application::the()->quit(); }))); - auto help_menu = TRY(window->try_add_menu("&Help"_short_string)); + auto help_menu = TRY(window->try_add_menu("&Help"_string)); TRY(help_menu->try_add_action(GUI::CommonActions::make_command_palette_action(window))); TRY(help_menu->try_add_action(GUI::CommonActions::make_help_action([&man_file](auto&) { Desktop::Launcher::open(URL::create_with_file_scheme(man_file), "/bin/Help"); diff --git a/Userland/Games/Chess/main.cpp b/Userland/Games/Chess/main.cpp index 10c226888c8..987cbf4c8bd 100644 --- a/Userland/Games/Chess/main.cpp +++ b/Userland/Games/Chess/main.cpp @@ -89,7 +89,7 @@ ErrorOr serenity_main(Main::Arguments arguments) widget->set_show_available_moves(Config::read_bool("Games"sv, "Chess"sv, "ShowAvailableMoves"sv, true)); widget->set_highlight_checks(Config::read_bool("Games"sv, "Chess"sv, "HighlightChecks"sv, true)); - auto game_menu = TRY(window->try_add_menu("&Game"_short_string)); + auto game_menu = TRY(window->try_add_menu("&Game"_string)); TRY(game_menu->try_add_action(GUI::Action::create("&Resign", { Mod_None, Key_F3 }, [&](auto&) { widget->resign(); @@ -161,11 +161,11 @@ ErrorOr serenity_main(Main::Arguments arguments) GUI::Application::the()->quit(); }))); - auto engine_menu = TRY(window->try_add_menu("&Engine"_short_string)); + auto engine_menu = TRY(window->try_add_menu("&Engine"_string)); GUI::ActionGroup engines_action_group; engines_action_group.set_exclusive(true); - auto engine_submenu = TRY(engine_menu->try_add_submenu("&Engine"_short_string)); + auto engine_submenu = TRY(engine_menu->try_add_submenu("&Engine"_string)); auto human_engine_checkbox = GUI::Action::create_checkable("Human", [&](auto&) { widget->set_engine(nullptr); }); @@ -193,7 +193,7 @@ ErrorOr serenity_main(Main::Arguments arguments) TRY(engine_submenu->try_add_action(*action)); } - auto help_menu = TRY(window->try_add_menu("&Help"_short_string)); + auto help_menu = TRY(window->try_add_menu("&Help"_string)); TRY(help_menu->try_add_action(GUI::CommonActions::make_command_palette_action(window))); TRY(help_menu->try_add_action(GUI::CommonActions::make_help_action([](auto&) { Desktop::Launcher::open(URL::create_with_file_scheme("/usr/share/man/man6/Chess.md"), "/bin/Help"); diff --git a/Userland/Games/ColorLines/main.cpp b/Userland/Games/ColorLines/main.cpp index 17fc449ba44..947b9830d5b 100644 --- a/Userland/Games/ColorLines/main.cpp +++ b/Userland/Games/ColorLines/main.cpp @@ -50,7 +50,7 @@ ErrorOr serenity_main(Main::Arguments arguments) auto game = TRY(window->set_main_widget(app_name)); - auto game_menu = TRY(window->try_add_menu("&Game"_short_string)); + auto game_menu = TRY(window->try_add_menu("&Game"_string)); TRY(game_menu->try_add_action(GUI::Action::create("&New Game", { Mod_None, Key_F2 }, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/reload.png"sv)), [&](auto&) { game->reset(); @@ -60,7 +60,7 @@ ErrorOr serenity_main(Main::Arguments arguments) GUI::Application::the()->quit(); }))); - auto help_menu = TRY(window->try_add_menu("&Help"_short_string)); + auto help_menu = TRY(window->try_add_menu("&Help"_string)); TRY(help_menu->try_add_action(GUI::CommonActions::make_command_palette_action(window))); TRY(help_menu->try_add_action(GUI::CommonActions::make_help_action([&man_file](auto&) { Desktop::Launcher::open(URL::create_with_file_scheme(man_file), "/bin/Help"); diff --git a/Userland/Games/FlappyBug/main.cpp b/Userland/Games/FlappyBug/main.cpp index e390aec4e9b..cb092c6144e 100644 --- a/Userland/Games/FlappyBug/main.cpp +++ b/Userland/Games/FlappyBug/main.cpp @@ -55,12 +55,12 @@ ErrorOr serenity_main(Main::Arguments arguments) return high_score; }; - auto game_menu = TRY(window->try_add_menu("&Game"_short_string)); + auto game_menu = TRY(window->try_add_menu("&Game"_string)); TRY(game_menu->try_add_action(GUI::CommonActions::make_quit_action([](auto&) { GUI::Application::the()->quit(); }))); - auto help_menu = TRY(window->try_add_menu("&Help"_short_string)); + auto help_menu = TRY(window->try_add_menu("&Help"_string)); TRY(help_menu->try_add_action(GUI::CommonActions::make_command_palette_action(window))); TRY(help_menu->try_add_action(GUI::CommonActions::make_help_action([](auto&) { Desktop::Launcher::open(URL::create_with_file_scheme("/usr/share/man/man6/FlappyBug.md"), "/bin/Help"); diff --git a/Userland/Games/Flood/main.cpp b/Userland/Games/Flood/main.cpp index 554d4004f98..853898a355f 100644 --- a/Userland/Games/Flood/main.cpp +++ b/Userland/Games/Flood/main.cpp @@ -164,7 +164,7 @@ ErrorOr serenity_main(Main::Arguments arguments) } }; - auto game_menu = TRY(window->try_add_menu("&Game"_short_string)); + auto game_menu = TRY(window->try_add_menu("&Game"_string)); TRY(game_menu->try_add_action(GUI::Action::create("&New Game", { Mod_None, Key_F2 }, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/reload.png"sv)), [&](auto&) { start_a_new_game(); @@ -180,7 +180,7 @@ ErrorOr serenity_main(Main::Arguments arguments) GUI::Application::the()->quit(); }))); - auto help_menu = TRY(window->try_add_menu("&Help"_short_string)); + auto help_menu = TRY(window->try_add_menu("&Help"_string)); TRY(help_menu->try_add_action(GUI::CommonActions::make_command_palette_action(window))); TRY(help_menu->try_add_action(GUI::CommonActions::make_help_action([](auto&) { Desktop::Launcher::open(URL::create_with_file_scheme("/usr/share/man/man6/Flood.md"), "/bin/Help"); diff --git a/Userland/Games/GameOfLife/main.cpp b/Userland/Games/GameOfLife/main.cpp index 86ef83db37e..ea08079efdd 100644 --- a/Userland/Games/GameOfLife/main.cpp +++ b/Userland/Games/GameOfLife/main.cpp @@ -132,7 +132,7 @@ ErrorOr serenity_main(Main::Arguments arguments) rotate_pattern_action->set_enabled(false); (void)TRY(main_toolbar.try_add_action(rotate_pattern_action)); - auto game_menu = TRY(window->try_add_menu("&Game"_short_string)); + auto game_menu = TRY(window->try_add_menu("&Game"_string)); TRY(game_menu->try_add_action(clear_board_action)); TRY(game_menu->try_add_action(randomize_cells_action)); @@ -144,7 +144,7 @@ ErrorOr serenity_main(Main::Arguments arguments) GUI::Application::the()->quit(); }))); - auto help_menu = TRY(window->try_add_menu("&Help"_short_string)); + auto help_menu = TRY(window->try_add_menu("&Help"_string)); TRY(help_menu->try_add_action(GUI::CommonActions::make_command_palette_action(window))); TRY(help_menu->try_add_action(GUI::CommonActions::make_help_action([](auto&) { Desktop::Launcher::open(URL::create_with_file_scheme("/usr/share/man/man6/GameOfLife.md"), "/bin/Help"); diff --git a/Userland/Games/Hearts/Game.cpp b/Userland/Games/Hearts/Game.cpp index 05885e3d5c6..f9e803973d5 100644 --- a/Userland/Games/Hearts/Game.cpp +++ b/Userland/Games/Hearts/Game.cpp @@ -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("OK"_short_string); + auto& close_button = button_container.add("OK"_string); close_button.on_click = [&score_dialog](auto) { score_dialog->done(GUI::Dialog::ExecResult::OK); }; @@ -869,7 +869,7 @@ void Game::pass_cards() } m_state = State::PassingAccept; - m_passing_button->set_text("OK"_short_string); + m_passing_button->set_text("OK"_string); m_passing_button->set_enabled(true); } diff --git a/Userland/Games/Hearts/SettingsDialog.cpp b/Userland/Games/Hearts/SettingsDialog.cpp index e819928f912..abbb51d8251 100644 --- a/Userland/Games/Hearts/SettingsDialog.cpp +++ b/Userland/Games/Hearts/SettingsDialog.cpp @@ -27,7 +27,7 @@ SettingsDialog::SettingsDialog(GUI::Window* parent, DeprecatedString player_name auto& name_box = main_widget->add(); name_box.set_layout(GUI::Margins {}, 4); - auto& name_label = name_box.add("Name:"_short_string); + auto& name_label = name_box.add("Name:"_string); name_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); auto& textbox = name_box.add(); @@ -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("Cancel"_short_string).on_click = [this](auto) { + button_box.add("Cancel"_string).on_click = [this](auto) { done(ExecResult::Cancel); }; - button_box.add("OK"_short_string).on_click = [this](auto) { + button_box.add("OK"_string).on_click = [this](auto) { done(ExecResult::OK); }; } diff --git a/Userland/Games/Hearts/main.cpp b/Userland/Games/Hearts/main.cpp index 240ec569b0a..28de5b50b61 100644 --- a/Userland/Games/Hearts/main.cpp +++ b/Userland/Games/Hearts/main.cpp @@ -85,7 +85,7 @@ ErrorOr serenity_main(Main::Arguments arguments) GUI::MessageBox::show(settings_dialog, "Settings have been successfully saved and will take effect in the next game."sv, "Settings Changed Successfully"sv, GUI::MessageBox::Type::Information); }; - auto game_menu = TRY(window->try_add_menu("&Game"_short_string)); + auto game_menu = TRY(window->try_add_menu("&Game"_string)); TRY(game_menu->try_add_action(GUI::Action::create("&New Game", { Mod_None, Key_F2 }, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/reload.png"sv)), [&](auto&) { game.setup(player_name); @@ -98,7 +98,7 @@ ErrorOr serenity_main(Main::Arguments arguments) TRY(game_menu->try_add_separator()); TRY(game_menu->try_add_action(GUI::CommonActions::make_quit_action([&](auto&) { app->quit(); }))); - auto help_menu = TRY(window->try_add_menu("&Help"_short_string)); + auto help_menu = TRY(window->try_add_menu("&Help"_string)); TRY(help_menu->try_add_action(GUI::CommonActions::make_command_palette_action(window))); TRY(help_menu->try_add_action(GUI::CommonActions::make_help_action([](auto&) { Desktop::Launcher::open(URL::create_with_file_scheme("/usr/share/man/man6/Hearts.md"), "/bin/Help"); diff --git a/Userland/Games/MasterWord/main.cpp b/Userland/Games/MasterWord/main.cpp index b0608b62dcb..26d61a9c6b0 100644 --- a/Userland/Games/MasterWord/main.cpp +++ b/Userland/Games/MasterWord/main.cpp @@ -66,7 +66,7 @@ ErrorOr serenity_main(Main::Arguments arguments) window->set_focused_widget(&game); - auto game_menu = TRY(window->try_add_menu("&Game"_short_string)); + auto game_menu = TRY(window->try_add_menu("&Game"_string)); TRY(game_menu->try_add_action(GUI::Action::create("&New Game", { Mod_None, Key_F2 }, [&](auto&) { game.reset(); @@ -104,7 +104,7 @@ ErrorOr serenity_main(Main::Arguments arguments) toggle_check_guesses->set_checked(game.is_checking_guesses()); TRY(settings_menu->try_add_action(toggle_check_guesses)); - auto theme_menu = TRY(window->try_add_menu("&Theme"_short_string)); + auto theme_menu = TRY(window->try_add_menu("&Theme"_string)); auto system_theme_action = GUI::Action::create("&System", [&](auto&) { game.set_use_system_theme(true); Config::write_bool("MasterWord"sv, ""sv, "use_system_theme"sv, true); @@ -127,7 +127,7 @@ ErrorOr serenity_main(Main::Arguments arguments) theme_actions.add_action(system_theme_action); theme_actions.add_action(wordle_theme_action); - auto help_menu = TRY(window->try_add_menu("&Help"_short_string)); + auto help_menu = TRY(window->try_add_menu("&Help"_string)); TRY(help_menu->try_add_action(GUI::CommonActions::make_command_palette_action(window))); TRY(help_menu->try_add_action(GUI::CommonActions::make_help_action([](auto&) { Desktop::Launcher::open(URL::create_with_file_scheme("/usr/share/man/man6/MasterWord.md"), "/bin/Help"); diff --git a/Userland/Games/Minesweeper/Field.cpp b/Userland/Games/Minesweeper/Field.cpp index 0b47c98d500..e7ddc75a32c 100644 --- a/Userland/Games/Minesweeper/Field.cpp +++ b/Userland/Games/Minesweeper/Field.cpp @@ -214,7 +214,7 @@ void Field::reset() m_first_click = true; set_updates_enabled(false); m_time_elapsed = 0; - m_time_label.set_text("00:00"_short_string); + m_time_label.set_text("00:00"_string); m_flags_left = m_mine_count; m_flag_label.set_text(String::number(m_flags_left).release_value_but_fixme_should_propagate_errors()); m_timer->stop(); diff --git a/Userland/Games/Minesweeper/main.cpp b/Userland/Games/Minesweeper/main.cpp index 9850c463796..34e5957c50e 100644 --- a/Userland/Games/Minesweeper/main.cpp +++ b/Userland/Games/Minesweeper/main.cpp @@ -58,7 +58,7 @@ ErrorOr serenity_main(Main::Arguments arguments) auto field = TRY(Field::create(flag_label, time_label, face_button)); TRY(widget->try_add_child(field)); - auto game_menu = TRY(window->try_add_menu("&Game"_short_string)); + auto game_menu = TRY(window->try_add_menu("&Game"_string)); TRY(game_menu->try_add_action(GUI::Action::create("&New Game", { Mod_None, Key_F2 }, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/reload.png"sv)), [&](auto&) { field->reset(); @@ -118,7 +118,7 @@ ErrorOr serenity_main(Main::Arguments arguments) TRY(difficulty_menu->try_add_action(action)); difficulty_actions.add_action(action); - auto help_menu = TRY(window->try_add_menu("&Help"_short_string)); + auto help_menu = TRY(window->try_add_menu("&Help"_string)); TRY(help_menu->try_add_action(GUI::CommonActions::make_command_palette_action(window))); TRY(help_menu->try_add_action(GUI::CommonActions::make_help_action([](auto&) { Desktop::Launcher::open(URL::create_with_file_scheme("/usr/share/man/man6/Minesweeper.md"), "/bin/Help"); diff --git a/Userland/Games/Snake/main.cpp b/Userland/Games/Snake/main.cpp index f6f1651081d..57eb37371b5 100644 --- a/Userland/Games/Snake/main.cpp +++ b/Userland/Games/Snake/main.cpp @@ -83,7 +83,7 @@ ErrorOr serenity_main(Main::Arguments arguments) return true; }; - auto game_menu = TRY(window->try_add_menu("&Game"_short_string)); + auto game_menu = TRY(window->try_add_menu("&Game"_string)); TRY(game_menu->try_add_action(GUI::Action::create("&New Game", { Mod_None, Key_F2 }, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/reload.png"sv)), [&](auto&) { game.reset(); @@ -123,7 +123,7 @@ ErrorOr serenity_main(Main::Arguments arguments) GUI::ActionGroup skin_action_group; skin_action_group.set_exclusive(true); - auto skin_menu = TRY(game_menu->try_add_submenu("&Skin"_short_string)); + auto skin_menu = TRY(game_menu->try_add_submenu("&Skin"_string)); skin_menu->set_icon(app_icon.bitmap_for_size(16)); auto add_skin_action = [&](StringView name, bool enable_color) -> ErrorOr { @@ -151,7 +151,7 @@ ErrorOr serenity_main(Main::Arguments arguments) GUI::Application::the()->quit(); }))); - auto help_menu = TRY(window->try_add_menu("&Help"_short_string)); + auto help_menu = TRY(window->try_add_menu("&Help"_string)); TRY(help_menu->try_add_action(GUI::CommonActions::make_command_palette_action(window))); TRY(help_menu->try_add_action(GUI::CommonActions::make_help_action([](auto&) { Desktop::Launcher::open(URL::create_with_file_scheme("/usr/share/man/man6/Snake.md"), "/bin/Help"); diff --git a/Userland/Games/Solitaire/main.cpp b/Userland/Games/Solitaire/main.cpp index 0e6c3868282..ea8a6dfd673 100644 --- a/Userland/Games/Solitaire/main.cpp +++ b/Userland/Games/Solitaire/main.cpp @@ -197,7 +197,7 @@ ErrorOr serenity_main(Main::Arguments arguments) toggle_auto_collect_action->set_checked(game.is_auto_collecting()); toggle_auto_collect_action->set_status_tip("Auto-collect to foundation piles"_string); - auto game_menu = TRY(window->try_add_menu("&Game"_short_string)); + auto game_menu = TRY(window->try_add_menu("&Game"_string)); TRY(game_menu->try_add_action(GUI::Action::create("&New Game", { Mod_None, Key_F2 }, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/reload.png"sv)), [&](auto&) { if (!confirm_end_current_game()) @@ -220,7 +220,7 @@ ErrorOr serenity_main(Main::Arguments arguments) TRY(game_menu->try_add_separator()); TRY(game_menu->try_add_action(GUI::CommonActions::make_quit_action([&](auto&) { app->quit(); }))); - auto help_menu = TRY(window->try_add_menu("&Help"_short_string)); + auto help_menu = TRY(window->try_add_menu("&Help"_string)); TRY(help_menu->try_add_action(GUI::CommonActions::make_command_palette_action(window))); TRY(help_menu->try_add_action(GUI::CommonActions::make_about_action("Solitaire", app_icon, window))); diff --git a/Userland/Games/Spider/main.cpp b/Userland/Games/Spider/main.cpp index 70eefa2b1c8..85448c6a6f4 100644 --- a/Userland/Games/Spider/main.cpp +++ b/Userland/Games/Spider/main.cpp @@ -235,7 +235,7 @@ ErrorOr serenity_main(Main::Arguments arguments) two_suit_action->set_checked(mode == Spider::Mode::TwoSuit); suit_actions.add_action(two_suit_action); - auto game_menu = TRY(window->try_add_menu("&Game"_short_string)); + auto game_menu = TRY(window->try_add_menu("&Game"_string)); TRY(game_menu->try_add_action(GUI::Action::create("&New Game", { Mod_None, Key_F2 }, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/reload.png"sv)), [&](auto&) { if (!confirm_end_current_game()) return; @@ -255,7 +255,7 @@ ErrorOr serenity_main(Main::Arguments arguments) TRY(game_menu->try_add_separator()); TRY(game_menu->try_add_action(GUI::CommonActions::make_quit_action([&](auto&) { app->quit(); }))); - auto view_menu = TRY(window->try_add_menu("&View"_short_string)); + auto view_menu = TRY(window->try_add_menu("&View"_string)); GUI::ActionGroup statistic_display_actions; statistic_display_actions.set_exclusive(true); @@ -277,7 +277,7 @@ ErrorOr serenity_main(Main::Arguments arguments) TRY(view_menu->try_add_action(high_score_action)); TRY(view_menu->try_add_action(best_time_actions)); - auto help_menu = TRY(window->try_add_menu("&Help"_short_string)); + auto help_menu = TRY(window->try_add_menu("&Help"_string)); help_menu->add_action(GUI::CommonActions::make_command_palette_action(window)); help_menu->add_action(GUI::CommonActions::make_about_action("Spider", app_icon, window)); diff --git a/Userland/Libraries/LibC/termcap.cpp b/Userland/Libraries/LibC/termcap.cpp index da3a1c5dd87..86ab25d537b 100644 --- a/Userland/Libraries/LibC/termcap.cpp +++ b/Userland/Libraries/LibC/termcap.cpp @@ -34,40 +34,40 @@ static void ensure_caps() if (caps) return; caps = new HashMap; - caps->set("DC"_short_string, "\033[%p1%dP"); - caps->set("IC"_short_string, "\033[%p1%d@"); - caps->set("ce"_short_string, "\033[K"); - caps->set("cl"_short_string, "\033[H\033[J"); - caps->set("cr"_short_string, "\015"); - caps->set("dc"_short_string, "\033[P"); - caps->set("ei"_short_string, ""); - caps->set("ic"_short_string, ""); - caps->set("im"_short_string, ""); - caps->set("kd"_short_string, "\033[B"); - caps->set("kl"_short_string, "\033[D"); - caps->set("kr"_short_string, "\033[C"); - caps->set("ku"_short_string, "\033[A"); - caps->set("ks"_short_string, ""); - caps->set("ke"_short_string, ""); - caps->set("le"_short_string, "\033[D"); - caps->set("mm"_short_string, ""); - caps->set("mo"_short_string, ""); - caps->set("pc"_short_string, ""); - caps->set("up"_short_string, "\033[A"); - caps->set("vb"_short_string, ""); - caps->set("am"_short_string, ""); - caps->set("@7"_short_string, ""); - caps->set("kH"_short_string, ""); - caps->set("kI"_short_string, "\033[L"); - caps->set("kh"_short_string, "\033[H"); - caps->set("vs"_short_string, ""); - caps->set("ve"_short_string, ""); - caps->set("E3"_short_string, ""); - caps->set("kD"_short_string, ""); - caps->set("nd"_short_string, "\033[C"); + caps->set("DC"_string, "\033[%p1%dP"); + caps->set("IC"_string, "\033[%p1%d@"); + caps->set("ce"_string, "\033[K"); + caps->set("cl"_string, "\033[H\033[J"); + caps->set("cr"_string, "\015"); + caps->set("dc"_string, "\033[P"); + caps->set("ei"_string, ""); + caps->set("ic"_string, ""); + caps->set("im"_string, ""); + caps->set("kd"_string, "\033[B"); + caps->set("kl"_string, "\033[D"); + caps->set("kr"_string, "\033[C"); + caps->set("ku"_string, "\033[A"); + caps->set("ks"_string, ""); + caps->set("ke"_string, ""); + caps->set("le"_string, "\033[D"); + caps->set("mm"_string, ""); + caps->set("mo"_string, ""); + caps->set("pc"_string, ""); + caps->set("up"_string, "\033[A"); + caps->set("vb"_string, ""); + caps->set("am"_string, ""); + caps->set("@7"_string, ""); + caps->set("kH"_string, ""); + caps->set("kI"_string, "\033[L"); + caps->set("kh"_string, "\033[H"); + caps->set("vs"_string, ""); + caps->set("ve"_string, ""); + caps->set("E3"_string, ""); + caps->set("kD"_string, ""); + caps->set("nd"_string, "\033[C"); - caps->set("co"_short_string, "80"); - caps->set("li"_short_string, "25"); + caps->set("co"_string, "80"); + caps->set("li"_string, "25"); } // Unfortunately, tgetstr() doesn't accept a size argument for the buffer diff --git a/Userland/Libraries/LibChess/Chess.cpp b/Userland/Libraries/LibChess/Chess.cpp index ccb703bb37a..245606a9282 100644 --- a/Userland/Libraries/LibChess/Chess.cpp +++ b/Userland/Libraries/LibChess/Chess.cpp @@ -196,9 +196,9 @@ ErrorOr Move::to_algebraic() const { if (piece.type == Type::King && from.file == 4) { if (to.file == 2) - return "O-O-O"_short_string; + return "O-O-O"_string; if (to.file == 6) - return "O-O"_short_string; + return "O-O"_string; } StringBuilder builder; diff --git a/Userland/Libraries/LibChess/UCICommand.cpp b/Userland/Libraries/LibChess/UCICommand.cpp index c849a17140f..c969617683f 100644 --- a/Userland/Libraries/LibChess/UCICommand.cpp +++ b/Userland/Libraries/LibChess/UCICommand.cpp @@ -21,7 +21,7 @@ ErrorOr> UCICommand::from_string(StringView command) ErrorOr UCICommand::to_string() const { - return "uci\n"_short_string; + return "uci\n"_string; } ErrorOr> DebugCommand::from_string(StringView command) @@ -244,7 +244,7 @@ ErrorOr> StopCommand::from_string(StringView command) ErrorOr StopCommand::to_string() const { - return "stop\n"_short_string; + return "stop\n"_string; } ErrorOr> IdCommand::from_string(StringView command) @@ -291,7 +291,7 @@ ErrorOr> UCIOkCommand::from_string(StringView comman ErrorOr UCIOkCommand::to_string() const { - return "uciok\n"_short_string; + return "uciok\n"_string; } ErrorOr> ReadyOkCommand::from_string(StringView command) @@ -519,7 +519,7 @@ ErrorOr> QuitCommand::from_string(StringView command) ErrorOr QuitCommand::to_string() const { - return "quit\n"_short_string; + return "quit\n"_string; } ErrorOr> UCINewGameCommand::from_string(StringView command) diff --git a/Userland/Libraries/LibCore/Process.cpp b/Userland/Libraries/LibCore/Process.cpp index f755f2e8200..2a923bbbda7 100644 --- a/Userland/Libraries/LibCore/Process.cpp +++ b/Userland/Libraries/LibCore/Process.cpp @@ -124,7 +124,7 @@ ErrorOr Process::get_name() return String::from_utf8(StringView { progname, strlen(progname) }); #else // FIXME: Implement Process::get_name() for other platforms. - return "???"_short_string; + return "???"_string; #endif } diff --git a/Userland/Libraries/LibCrypto/BigInt/UnsignedBigInteger.cpp b/Userland/Libraries/LibCrypto/BigInt/UnsignedBigInteger.cpp index f643b6dee8f..7b35a7451e0 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 "0"_short_string; + return "0"_string; StringBuilder builder; UnsignedBigInteger temp(*this); diff --git a/Userland/Libraries/LibDSP/Effects.cpp b/Userland/Libraries/LibDSP/Effects.cpp index 48f3e2b58d8..33d19f145c6 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("Decay"_short_string, 0.01, 0.99, 0.33, Logarithmic::No) + , m_delay_decay("Decay"_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_dry_gain("Dry"_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("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_pan("Pan"_string, -1, 1, 0, Logarithmic::No) + , m_volume("Volume"_string, 0, 1, 1, Logarithmic::No) + , m_muted("Mute"_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 44df72e4354..387747ad5a7 100644 --- a/Userland/Libraries/LibDSP/Synthesizers.cpp +++ b/Userland/Libraries/LibDSP/Synthesizers.cpp @@ -20,10 +20,10 @@ namespace DSP::Synthesizers { Classic::Classic(NonnullRefPtr transport) : DSP::SynthesizerProcessor(move(transport)) , 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_attack("Attack"_string, 0.01, 2000, 5, Logarithmic::Yes) + , m_decay("Decay"_string, 0.01, 20'000, 80, Logarithmic::Yes) + , m_sustain("Sustain"_string, 0.001, 1, 0.725, Logarithmic::No) + , m_release("Release"_string, 0.01, 6'000, 120, Logarithmic::Yes) { m_parameters.append(m_waveform); m_parameters.append(m_attack); diff --git a/Userland/Libraries/LibGUI/ColorPicker.cpp b/Userland/Libraries/LibGUI/ColorPicker.cpp index 3804412f15a..0a697fc4e5d 100644 --- a/Userland/Libraries/LibGUI/ColorPicker.cpp +++ b/Userland/Libraries/LibGUI/ColorPicker.cpp @@ -213,7 +213,7 @@ void ColorPicker::build_ui() auto& tab_widget = root_container->add(); - auto& tab_palette = tab_widget.add_tab("Palette"_short_string); + auto& tab_palette = tab_widget.add_tab("Palette"_string); tab_palette.set_layout(4, 4); build_ui_palette(tab_palette); @@ -229,7 +229,7 @@ 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("OK"_short_string); + ok_button.set_text("OK"_string); ok_button.on_click = [this](auto) { if (on_color_changed) on_color_changed(m_color); @@ -238,7 +238,7 @@ void ColorPicker::build_ui() ok_button.set_default(true); auto& cancel_button = button_container.add(); - cancel_button.set_text("Cancel"_short_string); + cancel_button.set_text("Cancel"_string); cancel_button.on_click = [this](auto) { if (on_color_changed) on_color_changed(m_original_color); @@ -337,7 +337,7 @@ void ColorPicker::build_ui_custom(Widget& root_container) auto& html_label = html_container.add(); html_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); html_label.set_preferred_width(48); - html_label.set_text("HTML:"_short_string); + html_label.set_text("HTML:"_string); m_html_text = html_container.add(); m_html_text->set_text(m_color_has_alpha_channel ? m_color.to_deprecated_string() : m_color.to_deprecated_string_without_alpha()); @@ -393,16 +393,16 @@ void ColorPicker::build_ui_custom(Widget& root_container) }; if (component == Red) { - rgb_label.set_text("Red:"_short_string); + rgb_label.set_text("Red:"_string); m_red_spinbox = spinbox; } else if (component == Green) { - rgb_label.set_text("Green:"_short_string); + rgb_label.set_text("Green:"_string); m_green_spinbox = spinbox; } else if (component == Blue) { - rgb_label.set_text("Blue:"_short_string); + rgb_label.set_text("Blue:"_string); m_blue_spinbox = spinbox; } else if (component == Alpha) { - rgb_label.set_text("Alpha:"_short_string); + rgb_label.set_text("Alpha:"_string); m_alpha_spinbox = spinbox; } }; diff --git a/Userland/Libraries/LibGUI/FilePicker.cpp b/Userland/Libraries/LibGUI/FilePicker.cpp index 9e974e9b06b..5073625007c 100644 --- a/Userland/Libraries/LibGUI/FilePicker.cpp +++ b/Userland/Libraries/LibGUI/FilePicker.cpp @@ -257,7 +257,7 @@ FilePicker::FilePicker(Window* parent_window, Mode mode, StringView filename, St }; auto& cancel_button = *widget->find_descendant_of_type_named("cancel_button"); - cancel_button.set_text("Cancel"_short_string); + cancel_button.set_text("Cancel"_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 7a958a4e7fd..e5763913f63 100644 --- a/Userland/Libraries/LibGUI/FilePicker.h +++ b/Userland/Libraries/LibGUI/FilePicker.h @@ -62,11 +62,11 @@ private: case Mode::Open: case Mode::OpenMultiple: case Mode::OpenFolder: - return "Open"_short_string; + return "Open"_string; case Mode::Save: - return "Save"_short_string; + return "Save"_string; default: - return "OK"_short_string; + return "OK"_string; } } diff --git a/Userland/Libraries/LibGUI/FileSystemModel.cpp b/Userland/Libraries/LibGUI/FileSystemModel.cpp index 24366419c8e..8b8d42e82fb 100644 --- a/Userland/Libraries/LibGUI/FileSystemModel.cpp +++ b/Userland/Libraries/LibGUI/FileSystemModel.cpp @@ -768,19 +768,19 @@ ErrorOr FileSystemModel::column_name(int column) const case Column::Icon: return String {}; case Column::Name: - return "Name"_short_string; + return "Name"_string; case Column::Size: - return "Size"_short_string; + return "Size"_string; case Column::User: - return "User"_short_string; + return "User"_string; case Column::Group: - return "Group"_short_string; + return "Group"_string; case Column::Permissions: - return "Mode"_short_string; + return "Mode"_string; case Column::ModificationTime: return "Modified"_string; case Column::Inode: - return "Inode"_short_string; + return "Inode"_string; case Column::SymlinkTarget: return "Symlink target"_string; } diff --git a/Userland/Libraries/LibGUI/IncrementalSearchBanner.cpp b/Userland/Libraries/LibGUI/IncrementalSearchBanner.cpp index e369c4cfe08..6060721a11b 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