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

Everywhere: Rename {Deprecated => Byte}String

Browse source 
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:
Ali Mohammad Pur 2023-12-16 17:49:34 +03:30 • committed by Ali Mohammad Pur
parent 38d62563b3
commit 5e1499d104
1615 changed files with 10257 additions and 10257 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Userland/Libraries/LibKeyboard/CharacterMap.cpp
View file

@ -12,14 +12,14 @@
namespace Keyboard {
ErrorOr<CharacterMap> CharacterMap::load_from_file(DeprecatedString const& map_name)
ErrorOr<CharacterMap> CharacterMap::load_from_file(ByteString const& map_name)
{
auto result = TRY(CharacterMapFile::load_from_file(map_name));
return CharacterMap(map_name, result);
}
CharacterMap::CharacterMap(DeprecatedString const& map_name, CharacterMapData const& map_data)
CharacterMap::CharacterMap(ByteString const& map_name, CharacterMapData const& map_data)
: m_character_map_data(map_data)
, m_character_map_name(map_name)
{
@ -41,7 +41,7 @@ ErrorOr<CharacterMap> CharacterMap::fetch_system_map()
return CharacterMap { keymap_name, map_data };
}
DeprecatedString const& CharacterMap::character_map_name() const
ByteString const& CharacterMap::character_map_name() const
{
return m_character_map_name;
}

10
Userland/Libraries/LibKeyboard/CharacterMap.h
View file

@ -6,7 +6,7 @@
#pragma once
#include <AK/DeprecatedString.h>
#include <AK/ByteString.h>
#include <AK/Error.h>
#include <LibKeyboard/CharacterMapData.h>
@ -15,18 +15,18 @@ namespace Keyboard {
class CharacterMap {
public:
CharacterMap(DeprecatedString const& map_name, CharacterMapData const& map_data);
static ErrorOr<CharacterMap> load_from_file(DeprecatedString const& filename);
CharacterMap(ByteString const& map_name, CharacterMapData const& map_data);
static ErrorOr<CharacterMap> load_from_file(ByteString const& filename);
int set_system_map();
static ErrorOr<CharacterMap> fetch_system_map();
CharacterMapData const& character_map_data() const { return m_character_map_data; }
DeprecatedString const& character_map_name() const;
ByteString const& character_map_name() const;
private:
CharacterMapData m_character_map_data;
DeprecatedString m_character_map_name;
ByteString m_character_map_name;
};
}

6
Userland/Libraries/LibKeyboard/CharacterMapFile.cpp
View file

@ -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 {};

4
Userland/Libraries/LibKeyboard/CharacterMapFile.h
View file

@ -14,10 +14,10 @@ namespace Keyboard {
class CharacterMapFile {
public:
static ErrorOr<CharacterMapData> load_from_file(DeprecatedString const& filename);
static ErrorOr<CharacterMapData> load_from_file(ByteString const& filename);
private:
static Vector<u32> read_map(JsonObject const& json, DeprecatedString const& name);
static Vector<u32> read_map(JsonObject const& json, ByteString const& name);
};
}