RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 00:27:43 +00:00
Code Issues Activity Actions

AK+Everywhere: Rename String to DeprecatedString

Browse source 
We have a new, improved string type coming up in AK (OOM aware, no null
state), and while it's going to use UTF-8, the name UTF8String is a
mouthful - so let's free up the String name by renaming the existing
class.
Making the old one have an annoying name will hopefully also help with
quick adoption :^)
This commit is contained in:
Linus Groh 2022-12-04 18:02:33 +00:00 • committed by Andreas Kling
parent f74251606d
commit 6e19ab2bbc
2006 changed files with 11635 additions and 11636 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Userland/Utilities/xargs.cpp
View file

@ -28,9 +28,9 @@ bool read_items(FILE* fp, char entry_separator, Function<Decision(StringView)>);
class ParsedInitialArguments {
public:
ParsedInitialArguments(Vector<String>&, StringView placeholder);
ParsedInitialArguments(Vector<DeprecatedString>&, StringView placeholder);
void for_each_joined_argument(StringView, Function<void(String const&)>) const;
void for_each_joined_argument(StringView, Function<void(DeprecatedString const&)>) const;
size_t size() const { return m_all_parts.size(); }
@ -45,7 +45,7 @@ ErrorOr<int> serenity_main(Main::Arguments main_arguments)
StringView placeholder;
bool split_with_nulls = false;
char const* specified_delimiter = "\n";
Vector<String> arguments;
Vector<DeprecatedString> arguments;
bool verbose = false;
char const* file_to_read = "-";
int max_lines_for_one_command = 0;
@ -121,7 +121,7 @@ ErrorOr<int> serenity_main(Main::Arguments main_arguments)
if (items_used_for_this_command == 0) {
child_argv.ensure_capacity(initial_arguments.size());
initial_arguments.for_each_joined_argument(item, [&](const String& string) {
initial_arguments.for_each_joined_argument(item, [&](const DeprecatedString& string) {
total_command_length += string.length();
child_argv.append(strdup(string.characters()));
});
@ -236,7 +236,7 @@ bool run_command(Vector<char*>&& child_argv, bool verbose, bool is_stdin, int de
return true;
}
ParsedInitialArguments::ParsedInitialArguments(Vector<String>& arguments, StringView placeholder)
ParsedInitialArguments::ParsedInitialArguments(Vector<DeprecatedString>& arguments, StringView placeholder)
{
m_all_parts.ensure_capacity(arguments.size());
bool some_argument_has_placeholder = false;
@ -260,7 +260,7 @@ ParsedInitialArguments::ParsedInitialArguments(Vector<String>& arguments, String
}
}
void ParsedInitialArguments::for_each_joined_argument(StringView separator, Function<void(String const&)> callback) const
void ParsedInitialArguments::for_each_joined_argument(StringView separator, Function<void(DeprecatedString const&)> callback) const
{
StringBuilder builder;
for (auto& parts : m_all_parts) {