1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-28 07:37:35 +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

@ -12,7 +12,7 @@ namespace PDF {
String OutlineItem::to_string(int indent) const
{
auto indent_str = String::repeated(" ", indent + 1);
auto indent_str = String::repeated(" "sv, indent + 1);
StringBuilder child_builder;
child_builder.append('[');
@ -21,7 +21,7 @@ String OutlineItem::to_string(int indent) const
child_builder.appendff("{}]", indent_str);
StringBuilder builder;
builder.append("OutlineItem {{\n");
builder.append("OutlineItem {{\n"sv);
builder.appendff("{}title={}\n", indent_str, title);
builder.appendff("{}count={}\n", indent_str, count);
builder.appendff("{}dest={}\n", indent_str, dest);
@ -29,7 +29,7 @@ String OutlineItem::to_string(int indent) const
builder.appendff("{}italic={}\n", indent_str, italic);
builder.appendff("{}bold={}\n", indent_str, bold);
builder.appendff("{}children={}\n", indent_str, child_builder.to_string());
builder.appendff("{}}}", String::repeated(" ", indent));
builder.appendff("{}}}", String::repeated(" "sv, indent));
return builder.to_string();
}
@ -51,7 +51,7 @@ PDFErrorOr<NonnullRefPtr<Document>> Document::create(ReadonlyBytes bytes)
// Automatically attempt to unencrypt the document with the empty string. The
// result is not important; it is the caller's responsibility to ensure the
// document is unencrypted before calling initialize().
document->m_security_handler->try_provide_user_password("");
document->m_security_handler->try_provide_user_password(""sv);
}
return document;

View file

@ -248,7 +248,7 @@ struct Formatter<PDF::OutlineDict> : Formatter<FormatString> {
child_builder.append('[');
for (auto& child : dict.children)
child_builder.appendff("{}\n", child.to_string(2));
child_builder.append(" ]");
child_builder.append(" ]"sv);
return Formatter<FormatString>::format(builder,
"OutlineDict {{\n count={}\n children={}\n}}"sv, dict.count, child_builder.to_string());

View file

@ -79,7 +79,7 @@ NonnullRefPtr<Encoding> Encoding::standard_encoding()
static NonnullRefPtr<Encoding> encoding = adopt_ref(*new Encoding());
if (encoding->m_descriptors.is_empty()) {
#define ENUMERATE(string, name, standard_code, mac_code, win_code, pdf_code) \
auto name##_code_point = *Utf8View(StringView(string)).begin(); \
auto name##_code_point = *Utf8View(string##sv).begin(); \
encoding->m_descriptors.set(standard_code, { string, name##_code_point });
ENUMERATE_LATIN_CHARACTER_SET(ENUMERATE)
#undef ENUMERATE
@ -93,7 +93,7 @@ NonnullRefPtr<Encoding> Encoding::mac_encoding()
static NonnullRefPtr<Encoding> encoding = adopt_ref(*new Encoding());
if (encoding->m_descriptors.is_empty()) {
#define ENUMERATE(string, name, standard_code, mac_code, win_code, pdf_code) \
auto name##_code_point = *Utf8View(StringView(string)).begin(); \
auto name##_code_point = *Utf8View(string##sv).begin(); \
encoding->m_descriptors.set(mac_code, { string, name##_code_point });
ENUMERATE_LATIN_CHARACTER_SET(ENUMERATE)
#undef ENUMERATE
@ -107,7 +107,7 @@ NonnullRefPtr<Encoding> Encoding::windows_encoding()
static NonnullRefPtr<Encoding> encoding = adopt_ref(*new Encoding());
if (encoding->m_descriptors.is_empty()) {
#define ENUMERATE(string, name, standard_code, mac_code, win_code, pdf_code) \
auto name##_code_point = *Utf8View(StringView(string)).begin(); \
auto name##_code_point = *Utf8View(string##sv).begin(); \
encoding->m_descriptors.set(win_code, { string, name##_code_point });
ENUMERATE_LATIN_CHARACTER_SET(ENUMERATE)
#undef ENUMERATE
@ -121,7 +121,7 @@ NonnullRefPtr<Encoding> Encoding::pdf_doc_encoding()
static NonnullRefPtr<Encoding> encoding = adopt_ref(*new Encoding());
if (encoding->m_descriptors.is_empty()) {
#define ENUMERATE(string, name, standard_code, mac_code, win_code, pdf_code) \
auto name##_code_point = *Utf8View(StringView(string)).begin(); \
auto name##_code_point = *Utf8View(string##sv).begin(); \
encoding->m_descriptors.set(pdf_code, { string, name##_code_point });
ENUMERATE_LATIN_CHARACTER_SET(ENUMERATE)
#undef ENUMERATE
@ -134,8 +134,8 @@ NonnullRefPtr<Encoding> Encoding::symbol_encoding()
{
static NonnullRefPtr<Encoding> encoding = adopt_ref(*new Encoding());
if (encoding->m_descriptors.is_empty()) {
#define ENUMERATE(string, name, code) \
auto name##_code_point = *Utf8View(StringView(string)).begin(); \
#define ENUMERATE(string, name, code) \
auto name##_code_point = *Utf8View(string##sv).begin(); \
encoding->m_descriptors.set(code, { string, name##_code_point });
ENUMERATE_SYMBOL_CHARACTER_SET(ENUMERATE)
#undef ENUMERATE
@ -148,8 +148,8 @@ NonnullRefPtr<Encoding> Encoding::zapf_encoding()
{
static NonnullRefPtr<Encoding> encoding = adopt_ref(*new Encoding());
if (encoding->m_descriptors.is_empty()) {
#define ENUMERATE(string, name, code) \
auto name##_code_point = *Utf8View(StringView(string)).begin(); \
#define ENUMERATE(string, name, code) \
auto name##_code_point = *Utf8View(string##sv).begin(); \
encoding->m_descriptors.set(code, { string, name##_code_point });
ENUMERATE_ZAPF_DINGBATS_CHARACTER_SET(ENUMERATE)
#undef ENUMERATE

View file

@ -33,7 +33,7 @@ ENUMERATE_OBJECT_TYPES(DEFINE_ACCESSORS)
static void append_indent(StringBuilder& builder, int indent)
{
for (int i = 0; i < indent; i++)
builder.append(" ");
builder.append(" "sv);
}
String StringObject::to_string(int) const
@ -53,12 +53,12 @@ String NameObject::to_string(int) const
String ArrayObject::to_string(int indent) const
{
StringBuilder builder;
builder.append("[\n");
builder.append("[\n"sv);
bool first = true;
for (auto& element : elements()) {
if (!first)
builder.append(",\n");
builder.append(",\n"sv);
first = false;
append_indent(builder, indent + 1);
builder.appendff("{}", element.to_string(indent));
@ -73,12 +73,12 @@ String ArrayObject::to_string(int indent) const
String DictObject::to_string(int indent) const
{
StringBuilder builder;
builder.append("<<\n");
builder.append("<<\n"sv);
bool first = true;
for (auto& [key, value] : map()) {
if (!first)
builder.append(",\n");
builder.append(",\n"sv);
first = false;
append_indent(builder, indent + 1);
builder.appendff("/{} ", key);
@ -87,14 +87,14 @@ String DictObject::to_string(int indent) const
builder.append('\n');
append_indent(builder, indent);
builder.append(">>");
builder.append(">>"sv);
return builder.to_string();
}
String StreamObject::to_string(int indent) const
{
StringBuilder builder;
builder.append("stream\n");
builder.append("stream\n"sv);
append_indent(builder, indent);
builder.appendff("{}\n", dict()->to_string(indent + 1));
append_indent(builder, indent + 1);
@ -113,7 +113,7 @@ String StreamObject::to_string(int indent) const
}
append_indent(builder, indent);
builder.append("endstream");
builder.append("endstream"sv);
return builder.to_string();
}
@ -125,7 +125,7 @@ String IndirectValue::to_string(int indent) const
builder.append(value().to_string(indent + 1));
builder.append('\n');
append_indent(builder, indent);
builder.append("endobj");
builder.append("endobj"sv);
return builder.to_string();
}

View file

@ -174,10 +174,10 @@ struct Formatter<PDF::Operator> : Formatter<StringView> {
PDF::Operator::operator_symbol(op.type()));
if (!op.arguments().is_empty()) {
builder.append(" [");
builder.append(" ["sv);
for (auto& argument : op.arguments())
builder.appendff(" {}", argument);
builder.append(" ]");
builder.append(" ]"sv);
}
return Formatter<StringView>::format(format_builder, builder.to_string());

View file

@ -1155,7 +1155,7 @@ struct Formatter<PDF::Parser::LinearizationDictionary> : Formatter<StringView> {
ErrorOr<void> format(FormatBuilder& format_builder, PDF::Parser::LinearizationDictionary const& dict)
{
StringBuilder builder;
builder.append("{\n");
builder.append("{\n"sv);
builder.appendff(" length_of_file={}\n", dict.length_of_file);
builder.appendff(" primary_hint_stream_offset={}\n", dict.primary_hint_stream_offset);
builder.appendff(" primary_hint_stream_length={}\n", dict.primary_hint_stream_length);
@ -1176,7 +1176,7 @@ struct Formatter<PDF::Parser::PageOffsetHintTable> : Formatter<StringView> {
ErrorOr<void> format(FormatBuilder& format_builder, PDF::Parser::PageOffsetHintTable const& table)
{
StringBuilder builder;
builder.append("{\n");
builder.append("{\n"sv);
builder.appendff(" least_number_of_objects_in_a_page={}\n", table.least_number_of_objects_in_a_page);
builder.appendff(" location_of_first_page_object={}\n", table.location_of_first_page_object);
builder.appendff(" bits_required_for_object_number={}\n", table.bits_required_for_object_number);
@ -1200,18 +1200,18 @@ struct Formatter<PDF::Parser::PageOffsetHintTableEntry> : Formatter<StringView>
ErrorOr<void> format(FormatBuilder& format_builder, PDF::Parser::PageOffsetHintTableEntry const& entry)
{
StringBuilder builder;
builder.append("{\n");
builder.append("{\n"sv);
builder.appendff(" objects_in_page_number={}\n", entry.objects_in_page_number);
builder.appendff(" page_length_number={}\n", entry.page_length_number);
builder.appendff(" number_of_shared_objects={}\n", entry.number_of_shared_objects);
builder.append(" shared_object_identifiers=[");
builder.append(" shared_object_identifiers=["sv);
for (auto& identifier : entry.shared_object_identifiers)
builder.appendff(" {}", identifier);
builder.append(" ]\n");
builder.append(" shared_object_location_numerators=[");
builder.append(" ]\n"sv);
builder.append(" shared_object_location_numerators=["sv);
for (auto& numerator : entry.shared_object_location_numerators)
builder.appendff(" {}", numerator);
builder.append(" ]\n");
builder.append(" ]\n"sv);
builder.appendff(" page_content_stream_offset_number={}\n", entry.page_content_stream_offset_number);
builder.appendff(" page_content_stream_length_number={}\n", entry.page_content_stream_length_number);
builder.append('}');

View file

@ -355,8 +355,8 @@ RENDERER_HANDLER(text_set_font)
auto font_name = MUST(font_dictionary->get_name(m_document, CommonNames::BaseFont))->name().to_lowercase();
auto font_view = font_name.view();
bool is_bold = font_view.contains("bold");
bool is_italic = font_view.contains("italic");
bool is_bold = font_view.contains("bold"sv);
bool is_italic = font_view.contains("italic"sv);
String font_variant;

View file

@ -177,7 +177,7 @@ struct Formatter<PDF::LineDashPattern> : Formatter<StringView> {
for (auto& i : pattern.pattern) {
if (!first)
builder.append(", ");
builder.append(", "sv);
first = false;
builder.appendff("{}", i);
}
@ -217,7 +217,7 @@ struct Formatter<PDF::TextState> : Formatter<StringView> {
ErrorOr<void> format(FormatBuilder& format_builder, PDF::TextState const& state)
{
StringBuilder builder;
builder.append("TextState {\n");
builder.append("TextState {\n"sv);
builder.appendff(" character_spacing={}\n", state.character_spacing);
builder.appendff(" word_spacing={}\n", state.word_spacing);
builder.appendff(" horizontal_scaling={}\n", state.horizontal_scaling);
@ -228,7 +228,7 @@ struct Formatter<PDF::TextState> : Formatter<StringView> {
builder.appendff(" rendering_mode={}\n", state.rendering_mode);
builder.appendff(" rise={}\n", state.rise);
builder.appendff(" knockout={}\n", state.knockout);
builder.append(" }");
builder.append(" }"sv);
return format_builder.put_string(builder.to_string());
}
};
@ -238,7 +238,7 @@ struct Formatter<PDF::GraphicsState> : Formatter<StringView> {
ErrorOr<void> format(FormatBuilder& format_builder, PDF::GraphicsState const& state)
{
StringBuilder builder;
builder.append("GraphicsState {\n");
builder.append("GraphicsState {\n"sv);
builder.appendff(" ctm={}\n", state.ctm);
builder.appendff(" stroke_color={}\n", state.stroke_color);
builder.appendff(" paint_color={}\n", state.paint_color);

View file

@ -116,10 +116,10 @@ struct Formatter<PDF::XRefTable> : Formatter<StringView> {
ErrorOr<void> format(FormatBuilder& format_builder, PDF::XRefTable const& table)
{
StringBuilder builder;
builder.append("XRefTable {");
builder.append("XRefTable {"sv);
for (auto& entry : table.m_entries)
builder.appendff("\n {}", entry);
builder.append("\n}");
builder.append("\n}"sv);
return Formatter<StringView>::format(format_builder, builder.to_string());
}
};