mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 13:07:46 +00:00
Everywhere: Run clang-format
This commit is contained in:
parent
0376c127f6
commit
086969277e
1665 changed files with 8479 additions and 8479 deletions
|
@ -12,14 +12,14 @@
|
|||
|
||||
namespace Keyboard {
|
||||
|
||||
ErrorOr<CharacterMap> CharacterMap::load_from_file(const String& map_name)
|
||||
ErrorOr<CharacterMap> CharacterMap::load_from_file(String const& map_name)
|
||||
{
|
||||
auto result = TRY(CharacterMapFile::load_from_file(map_name));
|
||||
|
||||
return CharacterMap(map_name, result);
|
||||
}
|
||||
|
||||
CharacterMap::CharacterMap(const String& map_name, const CharacterMapData& map_data)
|
||||
CharacterMap::CharacterMap(String 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 };
|
||||
}
|
||||
|
||||
const String& CharacterMap::character_map_name() const
|
||||
String const& CharacterMap::character_map_name() const
|
||||
{
|
||||
return m_character_map_name;
|
||||
}
|
||||
|
|
|
@ -15,14 +15,14 @@ namespace Keyboard {
|
|||
class CharacterMap {
|
||||
|
||||
public:
|
||||
CharacterMap(const String& map_name, const CharacterMapData& map_data);
|
||||
static ErrorOr<CharacterMap> load_from_file(const String& filename);
|
||||
CharacterMap(String const& map_name, CharacterMapData const& map_data);
|
||||
static ErrorOr<CharacterMap> load_from_file(String const& filename);
|
||||
|
||||
int set_system_map();
|
||||
static ErrorOr<CharacterMap> fetch_system_map();
|
||||
|
||||
const CharacterMapData& character_map_data() const { return m_character_map_data; };
|
||||
const String& character_map_name() const;
|
||||
CharacterMapData const& character_map_data() const { return m_character_map_data; };
|
||||
String const& character_map_name() const;
|
||||
|
||||
private:
|
||||
CharacterMapData m_character_map_data;
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
namespace Keyboard {
|
||||
|
||||
ErrorOr<CharacterMapData> CharacterMapFile::load_from_file(const String& filename)
|
||||
ErrorOr<CharacterMapData> CharacterMapFile::load_from_file(String const& filename)
|
||||
{
|
||||
auto path = filename;
|
||||
if (!path.ends_with(".json")) {
|
||||
|
@ -25,7 +25,7 @@ ErrorOr<CharacterMapData> CharacterMapFile::load_from_file(const String& filenam
|
|||
auto file = TRY(Core::File::open(path, Core::OpenMode::ReadOnly));
|
||||
auto file_contents = file->read_all();
|
||||
auto json_result = TRY(JsonValue::from_string(file_contents));
|
||||
const auto& json = json_result.as_object();
|
||||
auto const& json = json_result.as_object();
|
||||
|
||||
Vector<u32> map = read_map(json, "map");
|
||||
Vector<u32> shift_map = read_map(json, "shift_map");
|
||||
|
@ -55,7 +55,7 @@ ErrorOr<CharacterMapData> CharacterMapFile::load_from_file(const String& filenam
|
|||
return character_map;
|
||||
}
|
||||
|
||||
Vector<u32> CharacterMapFile::read_map(const JsonObject& json, const String& name)
|
||||
Vector<u32> CharacterMapFile::read_map(JsonObject const& json, String const& name)
|
||||
{
|
||||
if (!json.has(name))
|
||||
return {};
|
||||
|
|
|
@ -14,10 +14,10 @@ namespace Keyboard {
|
|||
class CharacterMapFile {
|
||||
|
||||
public:
|
||||
static ErrorOr<CharacterMapData> load_from_file(const String& filename);
|
||||
static ErrorOr<CharacterMapData> load_from_file(String const& filename);
|
||||
|
||||
private:
|
||||
static Vector<u32> read_map(const JsonObject& json, const String& name);
|
||||
static Vector<u32> read_map(JsonObject const& json, String const& name);
|
||||
};
|
||||
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue