RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-14 09:04:59 +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

8
Userland/Utilities/zip.cpp
View file

@ -37,7 +37,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
}
TRY(Core::System::unveil(nullptr, nullptr));
String zip_file_path { zip_path };
DeprecatedString zip_file_path { zip_path };
if (Core::File::exists(zip_file_path)) {
if (force) {
outln("{} already exists, overwriting...", zip_file_path);
@ -53,7 +53,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
Archive::ZipOutputStream zip_stream { file_stream };
auto add_file = [&](String path) {
auto add_file = [&](DeprecatedString path) {
auto file = Core::File::construct(path);
if (!file->open(Core::OpenMode::ReadOnly)) {
warnln("Failed to open {}: {}", path, file->error_string());
@ -83,8 +83,8 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
zip_stream.add_member(member);
};
auto add_directory = [&](String path, auto handle_directory) -> void {
auto canonicalized_path = String::formatted("{}/", LexicalPath::canonicalized_path(path));
auto add_directory = [&](DeprecatedString path, auto handle_directory) -> void {
auto canonicalized_path = DeprecatedString::formatted("{}/", LexicalPath::canonicalized_path(path));
Archive::ZipMember member {};
member.name = canonicalized_path;
member.compressed_data = {};