From 446c600d093059dd2af3b357ea1c0c698c66d27d Mon Sep 17 00:00:00 2001 From: Karol Kosek Date: Fri, 10 Mar 2023 19:04:13 +0100 Subject: [PATCH] LibGUI+Applications: Port SettingsWindow::add_tab() to the new string --- Userland/Applications/BrowserSettings/main.cpp | 4 ++-- Userland/Applications/CalendarSettings/main.cpp | 2 +- Userland/Applications/ClockSettings/main.cpp | 4 ++-- Userland/Applications/DisplaySettings/main.cpp | 12 ++++++------ Userland/Applications/GamesSettings/main.cpp | 4 ++-- Userland/Applications/KeyboardSettings/main.cpp | 2 +- Userland/Applications/MailSettings/main.cpp | 2 +- Userland/Applications/MouseSettings/main.cpp | 6 +++--- Userland/Applications/NetworkSettings/main.cpp | 2 +- Userland/Applications/TerminalSettings/main.cpp | 4 ++-- Userland/Libraries/LibGUI/SettingsWindow.h | 8 ++++---- 11 files changed, 25 insertions(+), 25 deletions(-) diff --git a/Userland/Applications/BrowserSettings/main.cpp b/Userland/Applications/BrowserSettings/main.cpp index bfcbf26b54..4115546bb6 100644 --- a/Userland/Applications/BrowserSettings/main.cpp +++ b/Userland/Applications/BrowserSettings/main.cpp @@ -34,8 +34,8 @@ 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("Browser"sv, "browser"sv)); - (void)TRY(window->add_tab("Content Filtering"sv, "content-filtering"sv)); + (void)TRY(window->add_tab("Browser"_short_string, "browser"sv)); + (void)TRY(window->add_tab(TRY("Content Filtering"_string), "content-filtering"sv)); window->set_active_tab(selected_tab); window->show(); diff --git a/Userland/Applications/CalendarSettings/main.cpp b/Userland/Applications/CalendarSettings/main.cpp index 1ff2cf5fec..bbe1bd314b 100644 --- a/Userland/Applications/CalendarSettings/main.cpp +++ b/Userland/Applications/CalendarSettings/main.cpp @@ -33,7 +33,7 @@ ErrorOr serenity_main(Main::Arguments arguments) auto app_icon = GUI::Icon::default_icon("app-calendar"sv); auto window = TRY(GUI::SettingsWindow::create("Calendar Settings", GUI::SettingsWindow::ShowDefaultsButton::Yes)); - (void)TRY(window->add_tab("Calendar"sv, "Calendar"sv)); + (void)TRY(window->add_tab(TRY("Calendar"_string), "Calendar"sv)); window->set_icon(app_icon.bitmap_for_size(16)); window->set_active_tab(selected_tab); diff --git a/Userland/Applications/ClockSettings/main.cpp b/Userland/Applications/ClockSettings/main.cpp index 84fc48ddad..9b480d6ebf 100644 --- a/Userland/Applications/ClockSettings/main.cpp +++ b/Userland/Applications/ClockSettings/main.cpp @@ -36,9 +36,9 @@ 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"sv, "clock"sv)); + (void)TRY(window->add_tab("Clock"_short_string, "clock"sv)); auto timezonesettings_widget = TRY(TimeZoneSettingsWidget::create()); - TRY(window->add_tab(timezonesettings_widget, "Time Zone"sv, "time-zone"sv)); + TRY(window->add_tab(timezonesettings_widget, TRY("Time Zone"_string), "time-zone"sv)); window->set_icon(app_icon.bitmap_for_size(16)); window->resize(540, 570); diff --git a/Userland/Applications/DisplaySettings/main.cpp b/Userland/Applications/DisplaySettings/main.cpp index 907a34b688..2985a2d407 100644 --- a/Userland/Applications/DisplaySettings/main.cpp +++ b/Userland/Applications/DisplaySettings/main.cpp @@ -37,12 +37,12 @@ ErrorOr serenity_main(Main::Arguments arguments) bool background_settings_changed = false; auto window = TRY(GUI::SettingsWindow::create("Display Settings")); - (void)TRY(window->add_tab("Background"sv, "background"sv, background_settings_changed)); - (void)TRY(window->add_tab("Themes"sv, "themes"sv, background_settings_changed)); - (void)TRY(window->add_tab("Fonts"sv, "fonts"sv)); - (void)TRY(window->add_tab("Monitor"sv, "monitor"sv)); - (void)TRY(window->add_tab("Workspaces"sv, "workspaces"sv)); - (void)TRY(window->add_tab("Effects"sv, "effects"sv)); + (void)TRY(window->add_tab(TRY("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(TRY("Workspaces"_string), "workspaces"sv)); + (void)TRY(window->add_tab("Effects"_short_string, "effects"sv)); window->set_active_tab(selected_tab); window->set_icon(app_icon.bitmap_for_size(16)); diff --git a/Userland/Applications/GamesSettings/main.cpp b/Userland/Applications/GamesSettings/main.cpp index 3e887f9495..f15e3f50bf 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"sv, "cards"sv)); - (void)TRY(window->add_tab("Chess"sv, "chess"sv)); + (void)TRY(window->add_tab("Cards"_short_string, "cards"sv)); + (void)TRY(window->add_tab("Chess"_short_string, "chess"sv)); window->set_active_tab(selected_tab); window->show(); diff --git a/Userland/Applications/KeyboardSettings/main.cpp b/Userland/Applications/KeyboardSettings/main.cpp index 7d36b7db9d..3d8fcb491e 100644 --- a/Userland/Applications/KeyboardSettings/main.cpp +++ b/Userland/Applications/KeyboardSettings/main.cpp @@ -35,7 +35,7 @@ ErrorOr serenity_main(Main::Arguments arguments) auto window = TRY(GUI::SettingsWindow::create("Keyboard Settings")); window->set_icon(app_icon.bitmap_for_size(16)); - auto keyboard_settings_widget = TRY(window->add_tab("Keyboard"sv, "keyboard"sv)); + auto keyboard_settings_widget = TRY(window->add_tab(TRY("Keyboard"_string), "keyboard"sv)); window->set_active_tab(selected_tab); window->on_active_window_change = [&](bool is_active_window) { diff --git a/Userland/Applications/MailSettings/main.cpp b/Userland/Applications/MailSettings/main.cpp index 75dc3c57a8..6146d81885 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"sv, "mail"sv)); + (void)TRY(window->add_tab("Mail"_short_string, "mail"sv)); window->set_icon(app_icon.bitmap_for_size(16)); window->set_active_tab(selected_tab); diff --git a/Userland/Applications/MouseSettings/main.cpp b/Userland/Applications/MouseSettings/main.cpp index 9564f996e2..852e77429e 100644 --- a/Userland/Applications/MouseSettings/main.cpp +++ b/Userland/Applications/MouseSettings/main.cpp @@ -34,9 +34,9 @@ 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"sv, "mouse"sv)); - (void)TRY(window->add_tab("Cursor Theme"sv, "cursor-theme"sv)); - (void)TRY(window->add_tab("Cursor Highlight"sv, "cursor-highlight"sv)); + (void)TRY(window->add_tab("Mouse"_short_string, "mouse"sv)); + (void)TRY(window->add_tab(TRY("Cursor Theme"_string), "cursor-theme"sv)); + (void)TRY(window->add_tab(TRY("Cursor Highlight"_string), "cursor-highlight"sv)); window->set_icon(app_icon.bitmap_for_size(16)); window->set_active_tab(selected_tab); diff --git a/Userland/Applications/NetworkSettings/main.cpp b/Userland/Applications/NetworkSettings/main.cpp index 63270f49cf..2c78fdc633 100644 --- a/Userland/Applications/NetworkSettings/main.cpp +++ b/Userland/Applications/NetworkSettings/main.cpp @@ -44,7 +44,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"sv, "network"sv)); + auto network_settings_widget = TRY(window->add_tab("Network"_short_string, "network"sv)); if (!adapter.is_null()) { network_settings_widget->switch_adapter(adapter); } diff --git a/Userland/Applications/TerminalSettings/main.cpp b/Userland/Applications/TerminalSettings/main.cpp index af899f825c..22d79fe1c2 100644 --- a/Userland/Applications/TerminalSettings/main.cpp +++ b/Userland/Applications/TerminalSettings/main.cpp @@ -32,8 +32,8 @@ 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"sv, "view"sv)); - (void)TRY(window->add_tab("Terminal"sv, "terminal"sv)); + (void)TRY(window->add_tab("View"_short_string, "view"sv)); + (void)TRY(window->add_tab(TRY("Terminal"_string), "terminal"sv)); window->set_active_tab(selected_tab); window->show(); diff --git a/Userland/Libraries/LibGUI/SettingsWindow.h b/Userland/Libraries/LibGUI/SettingsWindow.h index 495f17e0e1..49ac2f1956 100644 --- a/Userland/Libraries/LibGUI/SettingsWindow.h +++ b/Userland/Libraries/LibGUI/SettingsWindow.h @@ -47,17 +47,17 @@ public: virtual ~SettingsWindow() override = default; template - ErrorOr> add_tab(DeprecatedString title, StringView id, Args&&... args) + ErrorOr> add_tab(String title, StringView id, Args&&... args) { - auto tab = TRY(m_tab_widget->try_add_tab(TRY(String::from_deprecated_string(title)), forward(args)...)); + auto tab = TRY(m_tab_widget->try_add_tab(move(title), forward(args)...)); TRY(m_tabs.try_set(id, tab)); tab->set_settings_window(*this); return tab; } - ErrorOr add_tab(NonnullRefPtr const& tab, DeprecatedString title, StringView id) + ErrorOr add_tab(NonnullRefPtr const& tab, String title, StringView id) { - tab->set_title(TRY(String::from_deprecated_string(title))); + tab->set_title(move(title)); TRY(m_tab_widget->try_add_widget(*tab)); TRY(m_tabs.try_set(id, tab)); tab->set_settings_window(*this);