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

Everywhere: Add sv suffix to strings relying on StringView(char const*)

Browse source 
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.
This commit is contained in:
sin-ack 2022-07-11 17:32:29 +00:00 • committed by Andreas Kling
parent e5f09ea170
commit 3f3f45580a
762 changed files with 8315 additions and 8316 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Userland/Applets/Audio/main.cpp
View file

@ -37,11 +37,11 @@ public:
static ErrorOr<NonnullRefPtr<AudioWidget>> try_create()
{
Array<VolumeBitmapPair, 5> volume_level_bitmaps = {
{ { 66, TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/audio-volume-high.png")) },
{ 33, TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/audio-volume-medium.png")) },
{ 1, TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/audio-volume-low.png")) },
{ 0, TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/audio-volume-zero.png")) },
{ 0, TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/audio-volume-muted.png")) } }
{ { 66, TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/audio-volume-high.png"sv)) },
{ 33, TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/audio-volume-medium.png"sv)) },
{ 1, TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/audio-volume-low.png"sv)) },
{ 0, TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/audio-volume-zero.png"sv)) },
{ 0, TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/audio-volume-muted.png"sv)) } }
};
auto audio_client = TRY(Audio::ConnectionFromClient::try_create());
NonnullRefPtr<AudioWidget> audio_widget = TRY(adopt_nonnull_ref_or_enomem(new (nothrow) AudioWidget(move(audio_client), move(volume_level_bitmaps))));
@ -53,7 +53,7 @@ private:
AudioWidget(NonnullRefPtr<Audio::ConnectionFromClient> audio_client, Array<VolumeBitmapPair, 5> volume_level_bitmaps)
: m_audio_client(move(audio_client))
, m_volume_level_bitmaps(move(volume_level_bitmaps))
, m_show_percent(Config::read_bool("AudioApplet", "Applet", "ShowPercent", false))
, m_show_percent(Config::read_bool("AudioApplet"sv, "Applet"sv, "ShowPercent"sv, false))
{
m_audio_volume = static_cast<int>(m_audio_client->get_main_mix_volume() * 100);
m_audio_muted = m_audio_client->is_main_mix_muted();
@ -102,7 +102,7 @@ private:
m_percent_box->set_tooltip(m_show_percent ? "Hide percent" : "Show percent");
GUI::Application::the()->hide_tooltip();
Config::write_bool("AudioApplet", "Applet", "ShowPercent", m_show_percent);
Config::write_bool("AudioApplet"sv, "Applet"sv, "ShowPercent"sv, m_show_percent);
};
m_slider = m_root_container->add<GUI::VerticalSlider>();
@ -254,7 +254,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
window->show();
// This positioning code depends on the window actually existing.
static_cast<AudioWidget*>(window->main_widget())->set_audio_widget_size(Config::read_bool("AudioApplet", "Applet", "ShowPercent", false));
static_cast<AudioWidget*>(window->main_widget())->set_audio_widget_size(Config::read_bool("AudioApplet"sv, "Applet"sv, "ShowPercent"sv, false));
TRY(Core::System::pledge("stdio recvfd sendfd rpath"));

22
Userland/Applets/ClipboardHistory/ClipboardHistoryModel.cpp
View file

@ -17,7 +17,7 @@ NonnullRefPtr<ClipboardHistoryModel> ClipboardHistoryModel::create()
}
ClipboardHistoryModel::ClipboardHistoryModel()
: m_history_limit(Config::read_i32("ClipboardHistory", "ClipboardHistory", "NumHistoryItems", 20))
: m_history_limit(Config::read_i32("ClipboardHistory"sv, "ClipboardHistory"sv, "NumHistoryItems"sv, 20))
{
}
@ -37,26 +37,26 @@ String ClipboardHistoryModel::column_name(int column) const
}
}
static char const* bpp_for_format_resilient(String format)
static StringView bpp_for_format_resilient(String format)
{
unsigned format_uint = format.to_uint().value_or(static_cast<unsigned>(Gfx::BitmapFormat::Invalid));
// Cannot use Gfx::Bitmap::bpp_for_format here, as we have to accept invalid enum values.
switch (static_cast<Gfx::BitmapFormat>(format_uint)) {
case Gfx::BitmapFormat::Indexed1:
return "1";
return "1"sv;
case Gfx::BitmapFormat::Indexed2:
return "2";
return "2"sv;
case Gfx::BitmapFormat::Indexed4:
return "4";
return "4"sv;
case Gfx::BitmapFormat::Indexed8:
return "8";
return "8"sv;
case Gfx::BitmapFormat::BGRx8888:
case Gfx::BitmapFormat::BGRA8888:
return "32";
return "32"sv;
case Gfx::BitmapFormat::Invalid:
/* fall-through */
default:
return "?";
return "?"sv;
}
}
@ -69,7 +69,7 @@ GUI::Variant ClipboardHistoryModel::data(const GUI::ModelIndex& index, GUI::Mode
auto& time = item.time;
switch (index.column()) {
case Column::Data:
if (data_and_type.mime_type.starts_with("text/"))
if (data_and_type.mime_type.starts_with("text/"sv))
return String::copy(data_and_type.data);
if (data_and_type.mime_type == "image/x-serenityos") {
StringBuilder builder;
@ -79,11 +79,11 @@ GUI::Variant ClipboardHistoryModel::data(const GUI::ModelIndex& index, GUI::Mode
builder.append(data_and_type.metadata.get("height").value_or("?"));
builder.append('x');
builder.append(bpp_for_format_resilient(data_and_type.metadata.get("format").value_or("0")));
builder.append(" bitmap");
builder.append("]");
builder.append(" bitmap"sv);
return builder.to_string();
}
if (data_and_type.mime_type.starts_with("glyph/")) {
if (data_and_type.mime_type.starts_with("glyph/"sv)) {
StringBuilder builder;
auto count = data_and_type.metadata.get("count").value().to_uint().value_or(0);
auto start = data_and_type.metadata.get("start").value().to_uint().value_or(0);

4
Userland/Applets/ClipboardHistory/main.cpp
View file

@ -26,7 +26,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
TRY(Core::System::pledge("stdio recvfd sendfd rpath"));
TRY(Core::System::unveil("/res", "r"));
TRY(Core::System::unveil(nullptr, nullptr));
auto app_icon = TRY(GUI::Icon::try_create_default_icon("edit-copy"));
auto app_icon = TRY(GUI::Icon::try_create_default_icon("edit-copy"sv));
auto main_window = TRY(GUI::Window::try_create());
main_window->set_title("Clipboard history");
@ -67,7 +67,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
applet_window->set_has_alpha_channel(true);
auto icon_widget = TRY(applet_window->try_set_main_widget<GUI::ImageWidget>());
icon_widget->set_tooltip("Clipboard History");
icon_widget->load_from_file("/res/icons/16x16/edit-copy.png");
icon_widget->load_from_file("/res/icons/16x16/edit-copy.png"sv);
icon_widget->on_click = [&main_window = *main_window] {
main_window.show();
main_window.move_to_front();

2
Userland/Applets/Keymap/KeymapStatusWindow.cpp
View file

@ -16,7 +16,7 @@ void KeymapStatusWidget::mousedown_event(GUI::MouseEvent& event)
if (event.button() != GUI::MouseButton::Primary)
return;
GUI::Process::spawn_or_show_error(window(), "/bin/KeyboardSettings");
GUI::Process::spawn_or_show_error(window(), "/bin/KeyboardSettings"sv);
}
KeymapStatusWindow::KeymapStatusWindow()

16
Userland/Applets/Network/main.cpp
View file

@ -26,8 +26,8 @@ class NetworkWidget final : public GUI::ImageWidget {
public:
static ErrorOr<NonnullRefPtr<NetworkWidget>> try_create(bool notifications)
{
NonnullRefPtr<Gfx::Bitmap> connected_icon = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/network.png"));
NonnullRefPtr<Gfx::Bitmap> disconnected_icon = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/network-disconnected.png"));
NonnullRefPtr<Gfx::Bitmap> connected_icon = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/network.png"sv));
NonnullRefPtr<Gfx::Bitmap> disconnected_icon = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/network-disconnected.png"sv));
return adopt_nonnull_ref_or_enomem(new (nothrow) NetworkWidget(notifications, move(connected_icon), move(disconnected_icon)));
}
@ -50,7 +50,7 @@ private:
{
if (event.button() != GUI::MouseButton::Primary)
return;
GUI::Process::spawn_or_show_error(window(), "/bin/SystemMonitor", Array { "-t", "network" });
GUI::Process::spawn_or_show_error(window(), "/bin/SystemMonitor"sv, Array { "-t", "network" });
}
virtual void update_widget()
@ -124,10 +124,10 @@ private:
int connected_adapters = 0;
json.value().as_array().for_each([&adapter_info, include_loopback, &connected_adapters](auto& value) {
auto& if_object = value.as_object();
auto ip_address = if_object.get("ipv4_address").as_string_or("no IP");
auto ifname = if_object.get("name").to_string();
auto link_up = if_object.get("link_up").as_bool();
auto link_speed = if_object.get("link_speed").to_i32();
auto ip_address = if_object.get("ipv4_address"sv).as_string_or("no IP");
auto ifname = if_object.get("name"sv).to_string();
auto link_up = if_object.get("link_up"sv).as_bool();
auto link_speed = if_object.get("link_speed"sv).to_i32();
if (!include_loopback)
if (ifname == "loop")
@ -185,7 +185,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
window->set_has_alpha_channel(true);
window->resize(16, 16);
auto icon = TRY(window->try_set_main_widget<NetworkWidget>(display_notifications));
icon->load_from_file("/res/icons/16x16/network.png");
icon->load_from_file("/res/icons/16x16/network.png"sv);
window->resize(16, 16);
window->show();

30
Userland/Applets/ResourceGraph/main.cpp
View file

@ -58,7 +58,7 @@ private:
m_tooltip = String::formatted("CPU usage: {:.1}%", 100 * cpu);
} else {
m_history.enqueue(-1);
m_tooltip = StringView("Unable to determine CPU usage");
m_tooltip = "Unable to determine CPU usage"sv;
}
break;
}
@ -71,7 +71,7 @@ private:
m_tooltip = String::formatted("Memory: {} MiB of {:.1} MiB in use", allocated / MiB, total_memory / MiB);
} else {
m_history.enqueue(-1);
m_tooltip = StringView("Unable to determine memory usage");
m_tooltip = "Unable to determine memory usage"sv;
}
break;
}
@ -102,7 +102,7 @@ private:
m_tooltip = String::formatted("Network: TX {} / RX {} ({:.1} kbit/s)", tx, rx, static_cast<double>(recent_tx) * 8.0 / 1000.0);
} else {
m_history.enqueue(-1);
m_tooltip = StringView("Unable to determine network usage");
m_tooltip = "Unable to determine network usage"sv;
}
break;
}
@ -142,7 +142,7 @@ private:
{
if (event.button() != GUI::MouseButton::Primary)
return;
GUI::Process::spawn_or_show_error(window(), "/bin/SystemMonitor", Array { "-t", m_graph_type == GraphType::Network ? "network" : "graphs" });
GUI::Process::spawn_or_show_error(window(), "/bin/SystemMonitor"sv, Array { "-t", m_graph_type == GraphType::Network ? "network" : "graphs" });
}
bool get_cpu_usage(u64& total, u64& idle)
@ -167,8 +167,8 @@ private:
return false;
auto json = json_or_error.release_value();
auto const& obj = json.as_object();
total = obj.get("total_time").to_u64();
idle = obj.get("idle_time").to_u64();
total = obj.get("total_time"sv).to_u64();
idle = obj.get("idle_time"sv).to_u64();
return true;
}
@ -191,11 +191,11 @@ private:
return false;
auto json = json_or_error.release_value();
auto const& obj = json.as_object();
unsigned kmalloc_allocated = obj.get("kmalloc_allocated").to_u32();
unsigned kmalloc_available = obj.get("kmalloc_available").to_u32();
auto user_physical_allocated = obj.get("user_physical_allocated").to_u64();
auto user_physical_committed = obj.get("user_physical_committed").to_u64();
auto user_physical_uncommitted = obj.get("user_physical_uncommitted").to_u64();
unsigned kmalloc_allocated = obj.get("kmalloc_allocated"sv).to_u32();
unsigned kmalloc_available = obj.get("kmalloc_available"sv).to_u32();
auto user_physical_allocated = obj.get("user_physical_allocated"sv).to_u64();
auto user_physical_committed = obj.get("user_physical_committed"sv).to_u64();
auto user_physical_uncommitted = obj.get("user_physical_uncommitted"sv).to_u64();
unsigned kmalloc_bytes_total = kmalloc_allocated + kmalloc_available;
unsigned kmalloc_pages_total = (kmalloc_bytes_total + PAGE_SIZE - 1) / PAGE_SIZE;
u64 total_userphysical_and_swappable_pages = kmalloc_pages_total + user_physical_allocated + user_physical_committed + user_physical_uncommitted;
@ -226,13 +226,13 @@ private:
auto const& array = json.as_array();
for (auto const& adapter_value : array.values()) {
auto const& adapter_obj = adapter_value.as_object();
if (!adapter_obj.has_string("ipv4_address") || !adapter_obj.get("link_up").as_bool())
if (!adapter_obj.has_string("ipv4_address"sv) || !adapter_obj.get("link_up"sv).as_bool())
continue;
tx += adapter_obj.get("bytes_in").to_u64();
rx += adapter_obj.get("bytes_out").to_u64();
tx += adapter_obj.get("bytes_in"sv).to_u64();
rx += adapter_obj.get("bytes_out"sv).to_u64();
// Link speed data is given in megabits, but we want all return values to be in bytes.
link_speed += adapter_obj.get("link_speed").to_u64() * 8'000'000;
link_speed += adapter_obj.get("link_speed"sv).to_u64() * 8'000'000;
}
link_speed /= 8;
return tx != 0;