1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-28 13:47:46 +00:00

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.
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

View file

@ -21,7 +21,7 @@ static constexpr Gfx::CharacterBitmap s_diamond {
" ####### "
" ##### "
" ### "
" # ",
" # "sv,
9, 9
};
@ -34,7 +34,7 @@ static constexpr Gfx::CharacterBitmap s_heart {
" ####### "
" ##### "
" ### "
" # ",
" # "sv,
9, 9
};
@ -47,7 +47,7 @@ static constexpr Gfx::CharacterBitmap s_spade {
"#########"
" ## # ## "
" ### "
" ### ",
" ### "sv,
9, 9
};
@ -60,7 +60,7 @@ static constexpr Gfx::CharacterBitmap s_club {
"###########"
"#### # ####"
" ## ### ## "
" ### ",
" ### "sv,
11, 9
};
@ -80,7 +80,7 @@ Card::Card(Suit suit, uint8_t value)
s_background = Gfx::Bitmap::try_create(Gfx::BitmapFormat::BGRA8888, { width, height }).release_value_but_fixme_should_propagate_errors();
Gfx::Painter bg_painter(*s_background);
auto image = Gfx::Bitmap::try_load_from_file("/res/icons/cards/buggie-deck.png").release_value_but_fixme_should_propagate_errors();
auto image = Gfx::Bitmap::try_load_from_file("/res/icons/cards/buggie-deck.png"sv).release_value_but_fixme_should_propagate_errors();
float aspect_ratio = image->width() / static_cast<float>(image->height());
auto target_size = Gfx::IntSize(static_cast<int>(aspect_ratio * (height - 5)), height - 5);
@ -107,7 +107,7 @@ Card::Card(Suit suit, uint8_t value)
paint_rect.set_height(paint_rect.height() / 2);
paint_rect.shrink(10, 6);
auto text_rect = Gfx::IntRect { 4, 6, font.width("10"), font.glyph_height() };
auto text_rect = Gfx::IntRect { 4, 6, font.width("10"sv), font.glyph_height() };
painter.draw_text(text_rect, label, font, Gfx::TextAlignment::Center, color());
auto const& symbol = [&]() -> Gfx::CharacterBitmap const& {

View file

@ -26,7 +26,7 @@ public:
static constexpr int card_count = 13;
static constexpr int card_radius = 5;
static constexpr Array<StringView, card_count> labels = {
"A", "2", "3", "4", "5", "6", "7", "8", "9", "10", "J", "Q", "K"
"A"sv, "2"sv, "3"sv, "4"sv, "5"sv, "6"sv, "7"sv, "8"sv, "9"sv, "10"sv, "J"sv, "Q"sv, "K"sv
};
enum class Suit {
@ -104,6 +104,6 @@ struct AK::Formatter<Cards::Card> : Formatter<FormatString> {
VERIFY_NOT_REACHED();
}
return Formatter<FormatString>::format(builder, "{:>2}{}", Cards::Card::labels[card.value()], suit);
return Formatter<FormatString>::format(builder, "{:>2}{}"sv, Cards::Card::labels[card.value()], suit);
}
};

View file

@ -130,6 +130,6 @@ struct AK::Formatter<Cards::CardStack> : Formatter<FormatString> {
first_card = false;
}
return Formatter<FormatString>::format(builder, "{:<10} {:>16}: {}", type, stack.bounding_box(), cards.build());
return Formatter<FormatString>::format(builder, "{:<10} {:>16}: {}"sv, type, stack.bounding_box(), cards.build());
}
};