mirror of
https://github.com/RGBCube/serenity
synced 2025-07-28 06:57:45 +00:00
Userland: Prefer _string
over _short_string
As `_string` can't fail anymore (since 3434412
), there are no real
benefits to use the short variant in most cases.
This commit is contained in:
parent
a5edc9cdfc
commit
3f35ffb648
198 changed files with 684 additions and 684 deletions
|
@ -56,7 +56,7 @@ CellTypeDialog::CellTypeDialog(Vector<Position> const& positions, Sheet& sheet,
|
|||
buttonbox.set_shrink_to_fit(true);
|
||||
buttonbox.set_layout<GUI::HorizontalBoxLayout>(GUI::Margins {}, 10);
|
||||
buttonbox.add_spacer().release_value_but_fixme_should_propagate_errors();
|
||||
auto& ok_button = buttonbox.add<GUI::Button>("OK"_short_string);
|
||||
auto& ok_button = buttonbox.add<GUI::Button>("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<Position> const& po
|
|||
m_conditional_formats = cell.conditional_formats();
|
||||
}
|
||||
|
||||
auto& type_tab = tabs.add_tab<GUI::Widget>("Type"_short_string);
|
||||
auto& type_tab = tabs.add_tab<GUI::Widget>("Type"_string);
|
||||
type_tab.set_layout<GUI::HorizontalBoxLayout>(4);
|
||||
{
|
||||
auto& left_side = type_tab.add<GUI::Widget>();
|
||||
|
@ -264,7 +264,7 @@ void CellTypeDialog::setup_tabs(GUI::TabWidget& tabs, Vector<Position> const& po
|
|||
}
|
||||
}
|
||||
|
||||
auto& colors_tab = tabs.add_tab<GUI::Widget>("Color"_short_string);
|
||||
auto& colors_tab = tabs.add_tab<GUI::Widget>("Color"_string);
|
||||
colors_tab.set_layout<GUI::VerticalBoxLayout>(4);
|
||||
{
|
||||
// Static formatting
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -264,7 +264,7 @@ Optional<Position> 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;
|
||||
|
|
|
@ -718,7 +718,7 @@ void SpreadsheetWidget::clipboard_action(bool is_cut)
|
|||
|
||||
ErrorOr<void> 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<void> 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<void> 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));
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue