mirror of
https://github.com/RGBCube/serenity
synced 2025-07-25 13:27:35 +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
|
@ -4,7 +4,7 @@
|
|||
* SPDX-License-Identifier: BSD-2-Clause
|
||||
*/
|
||||
|
||||
#include <AK/String.h>
|
||||
#include <AK/DeprecatedString.h>
|
||||
#include <AK/Vector.h>
|
||||
#include <LibCore/ArgsParser.h>
|
||||
#include <LibCore/ConfigFile.h>
|
||||
|
@ -13,9 +13,9 @@
|
|||
#include <LibMain/Main.h>
|
||||
#include <stdio.h>
|
||||
|
||||
int set_keymap(String const& keymap);
|
||||
int set_keymap(DeprecatedString const& keymap);
|
||||
|
||||
int set_keymap(String const& keymap)
|
||||
int set_keymap(DeprecatedString const& keymap)
|
||||
{
|
||||
auto character_map = Keyboard::CharacterMap::load_from_file(keymap);
|
||||
if (character_map.is_error()) {
|
||||
|
@ -38,8 +38,8 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
|||
TRY(Core::System::unveil("/res/keymaps", "r"));
|
||||
TRY(Core::System::unveil("/etc/Keyboard.ini", "rwc"));
|
||||
|
||||
String mapping;
|
||||
String mappings;
|
||||
DeprecatedString mapping;
|
||||
DeprecatedString mappings;
|
||||
Core::ArgsParser args_parser;
|
||||
args_parser.add_option(mapping, "The mapping to be used", "set-keymap", 'm', "keymap");
|
||||
args_parser.add_option(mappings, "Comma separated list of enabled mappings", "set-keymaps", 's', "keymaps");
|
||||
|
@ -72,7 +72,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
|||
}
|
||||
}
|
||||
|
||||
auto keymaps = String::join(',', mappings_vector);
|
||||
auto keymaps = DeprecatedString::join(',', mappings_vector);
|
||||
mapper_config->write_entry("Mapping", "Keymaps", keymaps);
|
||||
TRY(mapper_config->sync());
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue