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

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

@ -12,14 +12,14 @@
namespace Keyboard {
ErrorOr<CharacterMap> CharacterMap::load_from_file(String const& map_name)
ErrorOr<CharacterMap> CharacterMap::load_from_file(DeprecatedString const& map_name)
{
auto result = TRY(CharacterMapFile::load_from_file(map_name));
return CharacterMap(map_name, result);
}
CharacterMap::CharacterMap(String const& map_name, CharacterMapData const& map_data)
CharacterMap::CharacterMap(DeprecatedString 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 };
}
String const& CharacterMap::character_map_name() const
DeprecatedString const& CharacterMap::character_map_name() const
{
return m_character_map_name;
}

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

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

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

@ -11,7 +11,7 @@
namespace Keyboard {
ErrorOr<CharacterMapData> CharacterMapFile::load_from_file(String const& filename)
ErrorOr<CharacterMapData> CharacterMapFile::load_from_file(DeprecatedString const& filename)
{
auto path = filename;
if (!path.ends_with(".json"sv)) {
@ -55,7 +55,7 @@ ErrorOr<CharacterMapData> CharacterMapFile::load_from_file(String const& filenam
return character_map;
}
Vector<u32> CharacterMapFile::read_map(JsonObject const& json, String const& name)
Vector<u32> CharacterMapFile::read_map(JsonObject const& json, DeprecatedString 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(String const& filename);
static ErrorOr<CharacterMapData> load_from_file(DeprecatedString const& filename);
private:
static Vector<u32> read_map(JsonObject const& json, String const& name);
static Vector<u32> read_map(JsonObject const& json, DeprecatedString const& name);
};
}