mirror of
https://github.com/fergalmoran/ladybird.git
synced 2026-02-22 23:55:12 +00:00
Everywhere: Rename {Deprecated => Byte}String
This commit un-deprecates DeprecatedString, and repurposes it as a byte
string.
As the null state has already been removed, there are no other
particularly hairy blockers in repurposing this type as a byte string
(what it _really_ is).
This commit is auto-generated:
$ xs=$(ack -l \bDeprecatedString\b\|deprecated_string AK Userland \
Meta Ports Ladybird Tests Kernel)
$ perl -pie 's/\bDeprecatedString\b/ByteString/g;
s/deprecated_string/byte_string/g' $xs
$ clang-format --style=file -i \
$(git diff --name-only | grep \.cpp\|\.h)
$ gn format $(git ls-files '*.gn' '*.gni')
This commit is contained in:
committed by
Ali Mohammad Pur
parent
38d62563b3
commit
5e1499d104
@@ -11,7 +11,7 @@
|
||||
|
||||
namespace Keyboard {
|
||||
|
||||
ErrorOr<CharacterMapData> CharacterMapFile::load_from_file(DeprecatedString const& filename)
|
||||
ErrorOr<CharacterMapData> CharacterMapFile::load_from_file(ByteString const& filename)
|
||||
{
|
||||
auto path = filename;
|
||||
if (!path.ends_with(".json"sv)) {
|
||||
@@ -19,7 +19,7 @@ ErrorOr<CharacterMapData> CharacterMapFile::load_from_file(DeprecatedString cons
|
||||
full_path.append("/res/keymaps/"sv);
|
||||
full_path.append(filename);
|
||||
full_path.append(".json"sv);
|
||||
path = full_path.to_deprecated_string();
|
||||
path = full_path.to_byte_string();
|
||||
}
|
||||
|
||||
auto file = TRY(Core::File::open(path, Core::File::OpenMode::Read));
|
||||
@@ -55,7 +55,7 @@ ErrorOr<CharacterMapData> CharacterMapFile::load_from_file(DeprecatedString cons
|
||||
return character_map;
|
||||
}
|
||||
|
||||
Vector<u32> CharacterMapFile::read_map(JsonObject const& json, DeprecatedString const& name)
|
||||
Vector<u32> CharacterMapFile::read_map(JsonObject const& json, ByteString const& name)
|
||||
{
|
||||
if (!json.has(name))
|
||||
return {};
|
||||
|
||||
Reference in New Issue
Block a user