diff options
author | sin-ack <sin-ack@users.noreply.github.com> | 2022-07-11 17:32:29 +0000 |
---|---|---|
committer | Andreas Kling <kling@serenityos.org> | 2022-07-12 23:11:35 +0200 |
commit | 3f3f45580ab7266258e97cb3cecf1e24716d61c5 (patch) | |
tree | 152c7a187c98184d58bf91a326357e0af435edcf /Userland/Services/Taskbar | |
parent | e5f09ea1703bacfbb79a4ad3c587a7d5d3d7bb13 (diff) | |
download | serenity-3f3f45580ab7266258e97cb3cecf1e24716d61c5.zip |
Everywhere: Add sv suffix to strings relying on StringView(char const*)
Each of these strings would previously rely on StringView's char const*
constructor overload, which would call __builtin_strlen on the string.
Since we now have operator ""sv, we can replace these with much simpler
versions. This opens the door to being able to remove
StringView(char const*).
No functional changes.
Diffstat (limited to 'Userland/Services/Taskbar')
-rw-r--r-- | Userland/Services/Taskbar/ClockWidget.cpp | 14 | ||||
-rw-r--r-- | Userland/Services/Taskbar/QuickLaunchWidget.cpp | 14 | ||||
-rw-r--r-- | Userland/Services/Taskbar/ShutdownDialog.cpp | 6 | ||||
-rw-r--r-- | Userland/Services/Taskbar/TaskbarWindow.cpp | 6 | ||||
-rw-r--r-- | Userland/Services/Taskbar/main.cpp | 12 |
5 files changed, 26 insertions, 26 deletions
diff --git a/Userland/Services/Taskbar/ClockWidget.cpp b/Userland/Services/Taskbar/ClockWidget.cpp index 4858105247..1089b87b1e 100644 --- a/Userland/Services/Taskbar/ClockWidget.cpp +++ b/Userland/Services/Taskbar/ClockWidget.cpp @@ -21,7 +21,7 @@ ClockWidget::ClockWidget() set_frame_shadow(Gfx::FrameShadow::Sunken); set_frame_thickness(1); - update_format(Config::read_string("Taskbar", "Clock", "TimeFormat", "%T")); + update_format(Config::read_string("Taskbar"sv, "Clock"sv, "TimeFormat"sv, "%T"sv)); m_timer = add<Core::Timer>(1000, [this] { static time_t last_update_time; @@ -29,7 +29,7 @@ ClockWidget::ClockWidget() if (now != last_update_time) { tick_clock(); last_update_time = now; - set_tooltip(Core::DateTime::now().to_string("%Y-%m-%d")); + set_tooltip(Core::DateTime::now().to_string("%Y-%m-%d"sv)); } }); @@ -58,7 +58,7 @@ ClockWidget::ClockWidget() m_prev_date = navigation_container.add<GUI::Button>(); m_prev_date->set_button_style(Gfx::ButtonStyle::Coolbar); m_prev_date->set_fixed_size(24, 24); - m_prev_date->set_icon(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/go-back.png").release_value_but_fixme_should_propagate_errors()); + m_prev_date->set_icon(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/go-back.png"sv).release_value_but_fixme_should_propagate_errors()); m_prev_date->on_click = [&](auto) { unsigned view_month = m_calendar->view_month(); unsigned view_year = m_calendar->view_year(); @@ -92,7 +92,7 @@ ClockWidget::ClockWidget() m_next_date = navigation_container.add<GUI::Button>(); m_next_date->set_button_style(Gfx::ButtonStyle::Coolbar); m_next_date->set_fixed_size(24, 24); - m_next_date->set_icon(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/go-forward.png").release_value_but_fixme_should_propagate_errors()); + m_next_date->set_icon(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/go-forward.png"sv).release_value_but_fixme_should_propagate_errors()); m_next_date->on_click = [&](auto) { unsigned view_month = m_calendar->view_month(); unsigned view_year = m_calendar->view_year(); @@ -142,7 +142,7 @@ ClockWidget::ClockWidget() m_jump_to_button = settings_container.add<GUI::Button>(); m_jump_to_button->set_button_style(Gfx::ButtonStyle::Coolbar); m_jump_to_button->set_fixed_size(24, 24); - m_jump_to_button->set_icon(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/calendar-date.png").release_value_but_fixme_should_propagate_errors()); + m_jump_to_button->set_icon(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/calendar-date.png"sv).release_value_but_fixme_should_propagate_errors()); m_jump_to_button->set_tooltip("Jump to today"); m_jump_to_button->on_click = [this](auto) { jump_to_current_date(); @@ -151,10 +151,10 @@ ClockWidget::ClockWidget() m_calendar_launcher = settings_container.add<GUI::Button>(); m_calendar_launcher->set_button_style(Gfx::ButtonStyle::Coolbar); m_calendar_launcher->set_fixed_size(24, 24); - m_calendar_launcher->set_icon(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/app-calendar.png").release_value_but_fixme_should_propagate_errors()); + m_calendar_launcher->set_icon(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/app-calendar.png"sv).release_value_but_fixme_should_propagate_errors()); m_calendar_launcher->set_tooltip("Calendar"); m_calendar_launcher->on_click = [this](auto) { - GUI::Process::spawn_or_show_error(window(), "/bin/Calendar"); + GUI::Process::spawn_or_show_error(window(), "/bin/Calendar"sv); }; } diff --git a/Userland/Services/Taskbar/QuickLaunchWidget.cpp b/Userland/Services/Taskbar/QuickLaunchWidget.cpp index b2f443e16d..e262297aef 100644 --- a/Userland/Services/Taskbar/QuickLaunchWidget.cpp +++ b/Userland/Services/Taskbar/QuickLaunchWidget.cpp @@ -92,7 +92,7 @@ QuickLaunchWidget::QuickLaunchWidget() m_context_menu = GUI::Menu::construct(); m_context_menu_default_action = GUI::Action::create("&Remove", [this](auto&) { - Config::remove_key("Taskbar", quick_launch, m_context_menu_app_name); + Config::remove_key("Taskbar"sv, quick_launch, m_context_menu_app_name); auto button = find_child_of_type_named<GUI::Button>(m_context_menu_app_name); if (button) { remove_child(*button); @@ -100,9 +100,9 @@ QuickLaunchWidget::QuickLaunchWidget() }); m_context_menu->add_action(*m_context_menu_default_action); - auto keys = Config::list_keys("Taskbar", quick_launch); + auto keys = Config::list_keys("Taskbar"sv, quick_launch); for (auto& name : keys) { - auto value = Config::read_string("Taskbar", quick_launch, name); + auto value = Config::read_string("Taskbar"sv, quick_launch, name); auto entry = QuickLaunchEntry::create_from_config_value(value); if (!entry) continue; @@ -112,7 +112,7 @@ QuickLaunchWidget::QuickLaunchWidget() OwnPtr<QuickLaunchEntry> QuickLaunchEntry::create_from_config_value(StringView value) { - if (!value.starts_with("/") && value.ends_with(".af")) { + if (!value.starts_with("/") && value.ends_with(".af"sv)) { auto af_path = String::formatted("{}/{}", Desktop::AppFile::APP_FILES_DIRECTORY, value); return make<QuickLaunchEntryAppFile>(Desktop::AppFile::open(af_path)); } @@ -121,7 +121,7 @@ OwnPtr<QuickLaunchEntry> QuickLaunchEntry::create_from_config_value(StringView v OwnPtr<QuickLaunchEntry> QuickLaunchEntry::create_from_path(StringView path) { - if (path.ends_with(".af")) + if (path.ends_with(".af"sv)) return make<QuickLaunchEntryAppFile>(Desktop::AppFile::open(path)); auto stat_or_error = Core::System::stat(path); if (stat_or_error.is_error()) { @@ -137,7 +137,7 @@ OwnPtr<QuickLaunchEntry> QuickLaunchEntry::create_from_path(StringView path) static String sanitize_entry_name(String const& name) { - return name.replace(" ", "", ReplaceMode::All).replace("=", "", ReplaceMode::All); + return name.replace(" "sv, ""sv, ReplaceMode::All).replace("="sv, ""sv, ReplaceMode::All); } void QuickLaunchWidget::add_or_adjust_button(String const& button_name, NonnullOwnPtr<QuickLaunchEntry>&& entry) @@ -212,7 +212,7 @@ void QuickLaunchWidget::drop_event(GUI::DropEvent& event) if (entry) { auto item_name = sanitize_entry_name(entry->name()); add_or_adjust_button(item_name, entry.release_nonnull()); - Config::write_string("Taskbar", quick_launch, item_name, url.path()); + Config::write_string("Taskbar"sv, quick_launch, item_name, url.path()); } } } diff --git a/Userland/Services/Taskbar/ShutdownDialog.cpp b/Userland/Services/Taskbar/ShutdownDialog.cpp index daf31a6121..1364eea969 100644 --- a/Userland/Services/Taskbar/ShutdownDialog.cpp +++ b/Userland/Services/Taskbar/ShutdownDialog.cpp @@ -48,7 +48,7 @@ ShutdownDialog::ShutdownDialog() widget.layout()->set_spacing(0); auto& banner_image = widget.add<GUI::ImageWidget>(); - banner_image.load_from_file("/res/graphics/brand-banner.png"); + banner_image.load_from_file("/res/graphics/brand-banner.png"sv); auto& content_container = widget.add<GUI::Widget>(); content_container.set_layout<GUI::HorizontalBoxLayout>(); @@ -63,7 +63,7 @@ ShutdownDialog::ShutdownDialog() icon_wrapper.set_layout<GUI::VerticalBoxLayout>(); auto& icon_image = icon_wrapper.add<GUI::ImageWidget>(); - icon_image.set_bitmap(Gfx::Bitmap::try_load_from_file("/res/icons/32x32/shutdown.png").release_value_but_fixme_should_propagate_errors()); + icon_image.set_bitmap(Gfx::Bitmap::try_load_from_file("/res/icons/32x32/shutdown.png"sv).release_value_but_fixme_should_propagate_errors()); auto& right_container = content_container.add<GUI::Widget>(); right_container.set_layout<GUI::VerticalBoxLayout>(); @@ -113,7 +113,7 @@ ShutdownDialog::ShutdownDialog() center_on_screen(); set_resizable(false); set_title("Exit SerenityOS"); - set_icon(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/power.png").release_value_but_fixme_should_propagate_errors()); + set_icon(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/power.png"sv).release_value_but_fixme_should_propagate_errors()); // Request WindowServer to re-update us on the current theme as we might've not been alive for the last notification. refresh_system_theme(); diff --git a/Userland/Services/Taskbar/TaskbarWindow.cpp b/Userland/Services/Taskbar/TaskbarWindow.cpp index 5b615936d7..952dd07493 100644 --- a/Userland/Services/Taskbar/TaskbarWindow.cpp +++ b/Userland/Services/Taskbar/TaskbarWindow.cpp @@ -67,7 +67,7 @@ TaskbarWindow::TaskbarWindow(NonnullRefPtr<GUI::Menu> start_menu) m_start_button = GUI::Button::construct("Serenity"); set_start_button_font(Gfx::FontDatabase::default_font().bold_variant()); m_start_button->set_icon_spacing(0); - auto app_icon = GUI::Icon::default_icon("ladyball"); + auto app_icon = GUI::Icon::default_icon("ladyball"sv); m_start_button->set_icon(app_icon.bitmap_for_size(16)); m_start_button->set_menu(m_start_menu); @@ -78,7 +78,7 @@ TaskbarWindow::TaskbarWindow(NonnullRefPtr<GUI::Menu> start_menu) m_task_button_container->set_layout<GUI::HorizontalBoxLayout>(); m_task_button_container->layout()->set_spacing(3); - m_default_icon = Gfx::Bitmap::try_load_from_file("/res/icons/16x16/window.png").release_value_but_fixme_should_propagate_errors(); + m_default_icon = Gfx::Bitmap::try_load_from_file("/res/icons/16x16/window.png"sv).release_value_but_fixme_should_propagate_errors(); m_applet_area_container = main_widget.add<GUI::Frame>(); m_applet_area_container->set_frame_thickness(1); @@ -89,7 +89,7 @@ TaskbarWindow::TaskbarWindow(NonnullRefPtr<GUI::Menu> start_menu) m_show_desktop_button = GUI::Button::construct(); m_show_desktop_button->set_tooltip("Show Desktop"); - m_show_desktop_button->set_icon(GUI::Icon::default_icon("desktop").bitmap_for_size(16)); + m_show_desktop_button->set_icon(GUI::Icon::default_icon("desktop"sv).bitmap_for_size(16)); m_show_desktop_button->set_button_style(Gfx::ButtonStyle::Coolbar); m_show_desktop_button->set_fixed_size(24, 24); m_show_desktop_button->on_click = TaskbarWindow::show_desktop_button_clicked; diff --git a/Userland/Services/Taskbar/main.cpp b/Userland/Services/Taskbar/main.cpp index 7988c8f2ea..009479cb0e 100644 --- a/Userland/Services/Taskbar/main.cpp +++ b/Userland/Services/Taskbar/main.cpp @@ -123,7 +123,7 @@ ErrorOr<NonnullRefPtr<GUI::Menu>> build_system_menu(WindowRefence& window_ref) Vector<String> const sorted_app_categories = TRY(discover_apps_and_categories()); auto system_menu = TRY(GUI::Menu::try_create("\xE2\x9A\xA1")); // HIGH VOLTAGE SIGN - system_menu->add_action(GUI::Action::create("&About SerenityOS", Gfx::Bitmap::try_load_from_file("/res/icons/16x16/ladyball.png").release_value_but_fixme_should_propagate_errors(), [&](auto&) { + system_menu->add_action(GUI::Action::create("&About SerenityOS", Gfx::Bitmap::try_load_from_file("/res/icons/16x16/ladyball.png"sv).release_value_but_fixme_should_propagate_errors(), [&](auto&) { GUI::Process::spawn_or_show_error(window_ref.get(), "/bin/About"sv); })); @@ -221,7 +221,7 @@ ErrorOr<NonnullRefPtr<GUI::Menu>> build_system_menu(WindowRefence& window_ref) g_themes_group.set_unchecking_allowed(false); g_themes_menu = &system_menu->add_submenu("&Themes"); - g_themes_menu->set_icon(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/themes.png").release_value_but_fixme_should_propagate_errors()); + g_themes_menu->set_icon(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/themes.png"sv).release_value_but_fixme_should_propagate_errors()); g_themes = Gfx::list_installed_system_themes(); auto current_theme_name = GUI::ConnectionToWindowServer::the().get_system_theme(); @@ -254,15 +254,15 @@ ErrorOr<NonnullRefPtr<GUI::Menu>> build_system_menu(WindowRefence& window_ref) } }; - system_menu->add_action(GUI::Action::create("&Settings", Gfx::Bitmap::try_load_from_file("/res/icons/16x16/app-settings.png").release_value_but_fixme_should_propagate_errors(), [&](auto&) { + system_menu->add_action(GUI::Action::create("&Settings", Gfx::Bitmap::try_load_from_file("/res/icons/16x16/app-settings.png"sv).release_value_but_fixme_should_propagate_errors(), [&](auto&) { GUI::Process::spawn_or_show_error(window_ref.get(), "/bin/Settings"sv); })); system_menu->add_separator(); - system_menu->add_action(GUI::Action::create("&Help", Gfx::Bitmap::try_load_from_file("/res/icons/16x16/app-help.png").release_value_but_fixme_should_propagate_errors(), [&](auto&) { + system_menu->add_action(GUI::Action::create("&Help", Gfx::Bitmap::try_load_from_file("/res/icons/16x16/app-help.png"sv).release_value_but_fixme_should_propagate_errors(), [&](auto&) { GUI::Process::spawn_or_show_error(window_ref.get(), "/bin/Help"sv); })); - system_menu->add_action(GUI::Action::create("&Run...", Gfx::Bitmap::try_load_from_file("/res/icons/16x16/app-run.png").release_value_but_fixme_should_propagate_errors(), [](auto&) { + system_menu->add_action(GUI::Action::create("&Run...", Gfx::Bitmap::try_load_from_file("/res/icons/16x16/app-run.png"sv).release_value_but_fixme_should_propagate_errors(), [](auto&) { posix_spawn_file_actions_t spawn_actions; posix_spawn_file_actions_init(&spawn_actions); auto home_directory = Core::StandardPaths::home_directory(); @@ -280,7 +280,7 @@ ErrorOr<NonnullRefPtr<GUI::Menu>> build_system_menu(WindowRefence& window_ref) posix_spawn_file_actions_destroy(&spawn_actions); })); system_menu->add_separator(); - system_menu->add_action(GUI::Action::create("E&xit...", Gfx::Bitmap::try_load_from_file("/res/icons/16x16/power.png").release_value_but_fixme_should_propagate_errors(), [](auto&) { + system_menu->add_action(GUI::Action::create("E&xit...", Gfx::Bitmap::try_load_from_file("/res/icons/16x16/power.png"sv).release_value_but_fixme_should_propagate_errors(), [](auto&) { auto command = ShutdownDialog::show(); if (command.size() == 0) |