mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 05:57:45 +00:00
AK+Everywhere: Rename String to DeprecatedString
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:
parent
f74251606d
commit
6e19ab2bbc
2006 changed files with 11635 additions and 11636 deletions
|
@ -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;
|
||||
};
|
||||
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue