diff options
author | Andreas Kling <kling@serenityos.org> | 2021-04-29 21:46:15 +0200 |
---|---|---|
committer | Andreas Kling <kling@serenityos.org> | 2021-04-29 22:16:18 +0200 |
commit | 7ae7170d6140f7cad730f05f84b53437058b82f4 (patch) | |
tree | 79caaefa15a1e4ae1c60def7a40425983206c281 /Userland/Libraries/LibKeyboard | |
parent | def1f1444aeee2caf6d47d0eb96a18ffc476c3f9 (diff) | |
download | serenity-7ae7170d6140f7cad730f05f84b53437058b82f4.zip |
Everywhere: "file name" => "filename"
Diffstat (limited to 'Userland/Libraries/LibKeyboard')
-rw-r--r-- | Userland/Libraries/LibKeyboard/CharacterMap.h | 2 | ||||
-rw-r--r-- | Userland/Libraries/LibKeyboard/CharacterMapFile.cpp | 8 | ||||
-rw-r--r-- | Userland/Libraries/LibKeyboard/CharacterMapFile.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/Userland/Libraries/LibKeyboard/CharacterMap.h b/Userland/Libraries/LibKeyboard/CharacterMap.h index 48407cf20e..d12c1f4940 100644 --- a/Userland/Libraries/LibKeyboard/CharacterMap.h +++ b/Userland/Libraries/LibKeyboard/CharacterMap.h @@ -20,7 +20,7 @@ class CharacterMap { public: CharacterMap(const String& map_name, const CharacterMapData& map_data); - static Optional<CharacterMap> load_from_file(const String& file_name); + static Optional<CharacterMap> load_from_file(const String& filename); #ifndef KERNEL int set_system_map(); diff --git a/Userland/Libraries/LibKeyboard/CharacterMapFile.cpp b/Userland/Libraries/LibKeyboard/CharacterMapFile.cpp index cdefe24023..05fb406383 100644 --- a/Userland/Libraries/LibKeyboard/CharacterMapFile.cpp +++ b/Userland/Libraries/LibKeyboard/CharacterMapFile.cpp @@ -11,13 +11,13 @@ namespace Keyboard { -Optional<CharacterMapData> CharacterMapFile::load_from_file(const String& file_name) +Optional<CharacterMapData> CharacterMapFile::load_from_file(const String& filename) { - auto path = file_name; + auto path = filename; if (!path.ends_with(".json")) { StringBuilder full_path; full_path.append("/res/keymaps/"); - full_path.append(file_name); + full_path.append(filename); full_path.append(".json"); path = full_path.to_string(); } @@ -25,7 +25,7 @@ Optional<CharacterMapData> CharacterMapFile::load_from_file(const String& file_n auto file = Core::File::construct(path); file->open(Core::IODevice::ReadOnly); if (!file->is_open()) { - dbgln("Failed to open {}: {}", file_name, file->error_string()); + dbgln("Failed to open {}: {}", filename, file->error_string()); return {}; } diff --git a/Userland/Libraries/LibKeyboard/CharacterMapFile.h b/Userland/Libraries/LibKeyboard/CharacterMapFile.h index 361901f13c..c11800d612 100644 --- a/Userland/Libraries/LibKeyboard/CharacterMapFile.h +++ b/Userland/Libraries/LibKeyboard/CharacterMapFile.h @@ -14,7 +14,7 @@ namespace Keyboard { class CharacterMapFile { public: - static Optional<CharacterMapData> load_from_file(const String& file_name); + static Optional<CharacterMapData> load_from_file(const String& filename); private: static Vector<u32> read_map(const JsonObject& json, const String& name); |