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

Userland: Prefer _string over _short_string

Browse source 
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:
Lucas CHOLLET 2023-08-07 22:26:17 -04:00 • committed by Andreas Kling
parent a5edc9cdfc
commit 3f35ffb648
198 changed files with 684 additions and 684 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Userland/DevTools/GMLPlayground/MainWidget.cpp
View file

@ -134,7 +134,7 @@ void MainWidget::load_file(FileSystemAccessClient::File file)
ErrorOr<void> 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<void> 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<void> 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<void> 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");

2
Userland/DevTools/HackStudio/Debugger/DisassemblyModel.cpp
View file

@ -77,7 +77,7 @@ ErrorOr<String> 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:

2
Userland/DevTools/HackStudio/Debugger/RegistersModel.cpp
View file

@ -92,7 +92,7 @@ ErrorOr<String> 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();
}

6
Userland/DevTools/HackStudio/Dialogs/ProjectTemplatesModel.cpp
View file

@ -57,11 +57,11 @@ ErrorOr<String> 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();
}

4
Userland/DevTools/HackStudio/FindInFilesWidget.cpp
View file

@ -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();
}

2
Userland/DevTools/HackStudio/Git/GitWidget.cpp
View file

@ -64,7 +64,7 @@ GitWidget::GitWidget()
commit_button.on_click = [this](int) { commit(); };
auto& staged_label = staged_header.add<GUI::Label>();
staged_label.set_text("Staged"_short_string);
staged_label.set_text("Staged"_string);
staged_header.set_fixed_height(20);
m_staged_files = staged.add<GitFilesView>(

26
Userland/DevTools/HackStudio/HackStudioWidget.cpp
View file

@ -494,7 +494,7 @@ ErrorOr<NonnullRefPtr<GUI::Menu>> 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<void> HackStudioWidget::create_action_tab(GUI::Widget& parent)
};
m_find_in_files_widget = m_action_tab_widget->add_tab<FindInFilesWidget>("Find"_string);
m_todo_entries_widget = m_action_tab_widget->add_tab<ToDoEntriesWidget>("TODO"_short_string);
m_terminal_wrapper = m_action_tab_widget->add_tab<TerminalWrapper>("Console"_short_string, false);
m_todo_entries_widget = m_action_tab_widget->add_tab<ToDoEntriesWidget>("TODO"_string);
m_terminal_wrapper = m_action_tab_widget->add_tab<TerminalWrapper>("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<void> HackStudioWidget::create_action_tab(GUI::Widget& parent)
};
m_disassembly_widget = m_action_tab_widget->add_tab<DisassemblyWidget>("Disassembly"_string);
m_git_widget = m_action_tab_widget->add_tab<GitWidget>("Git"_short_string);
m_git_widget = m_action_tab_widget->add_tab<GitWidget>("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<GUI::TabWidget>();
m_project_tab->set_tab_position(GUI::TabWidget::TabPosition::Bottom);
auto& tree_view_container = m_project_tab->add_tab<GUI::Widget>("Files"_short_string);
auto& tree_view_container = m_project_tab->add_tab<GUI::Widget>("Files"_string);
tree_view_container.set_layout<GUI::VerticalBoxLayout>(GUI::Margins {}, 2);
m_project_tree_view = tree_view_container.add<GUI::TreeView>();
configure_project_tree_view();
auto& class_view_container = m_project_tab->add_tab<GUI::Widget>("Classes"_short_string);
auto& class_view_container = m_project_tab->add_tab<GUI::Widget>("Classes"_string);
class_view_container.set_layout<GUI::VerticalBoxLayout>(2);
m_class_view = class_view_container.add<ClassViewWidget>();
@ -1414,9 +1414,9 @@ void HackStudioWidget::update_recent_projects_submenu()
ErrorOr<void> 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<void> HackStudioWidget::create_file_menu(GUI::Window& window)
ErrorOr<void> 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<void> 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<void> 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<void> 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));
}

6
Userland/DevTools/HackStudio/ToDoEntriesWidget.cpp
View file

@ -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();
}

2
Userland/DevTools/Profiler/DisassemblyModel.cpp
View file

@ -137,7 +137,7 @@ ErrorOr<String> 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:

2
Userland/DevTools/Profiler/FilesystemEventModel.cpp
View file

@ -146,7 +146,7 @@ ErrorOr<String> 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:

6
Userland/DevTools/Profiler/IndividualSampleModel.cpp
View file

@ -33,11 +33,11 @@ ErrorOr<String> 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();
}

4
Userland/DevTools/Profiler/ProfileModel.cpp
View file

@ -80,9 +80,9 @@ ErrorOr<String> 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:

8
Userland/DevTools/Profiler/SamplesModel.cpp
View file

@ -32,13 +32,13 @@ ErrorOr<String> 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<String> 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();
}

8
Userland/DevTools/Profiler/SignpostsModel.cpp
View file

@ -30,17 +30,17 @@ ErrorOr<String> 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:

2
Userland/DevTools/Profiler/SourceModel.cpp
View file

@ -132,7 +132,7 @@ ErrorOr<String> 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();
}

12
Userland/DevTools/Profiler/main.cpp
View file

@ -265,10 +265,10 @@ ErrorOr<int> 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<int> 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::VerticalBoxLayout>(GUI::Margins { 0, 0, 16 });
auto& timer_label = widget->add<GUI::Label>("..."_short_string);
auto& timer_label = widget->add<GUI::Label>("..."_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<GUI::Button>("Stop"_short_string);
auto& stop_button = widget->add<GUI::Button>("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();

8
Userland/DevTools/SQLStudio/MainWidget.cpp
View file

@ -235,7 +235,7 @@ ErrorOr<void> MainWidget::setup()
m_action_tab_widget = find_descendant_of_type_named<GUI::TabWidget>("action_tab_widget"sv);
m_query_results_widget = m_action_tab_widget->add_tab<GUI::Widget>("Results"_short_string);
m_query_results_widget = m_action_tab_widget->add_tab<GUI::Widget>("Results"_string);
m_query_results_widget->set_layout<GUI::VerticalBoxLayout>(6);
m_query_results_table_view = m_query_results_widget->add<GUI::TableView>();
@ -301,7 +301,7 @@ ErrorOr<void> MainWidget::setup()
ErrorOr<void> 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<void> 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<void> 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");