RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 21:08:12 +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

12
Userland/Libraries/LibRegex/C/Regex.cpp
View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: BSD-2-Clause
*/
#include <AK/String.h>
#include <AK/DeprecatedString.h>
#include <AK/StringBuilder.h>
#include <AK/Variant.h>
#include <LibRegex/Regex.h>
@ -23,7 +23,7 @@ struct internal_regex_t {
Optional<Variant<NonnullOwnPtr<Regex<PosixExtended>>, NonnullOwnPtr<Regex<PosixBasic>>>> re;
size_t re_pat_errpos;
ReError re_pat_err;
String re_pat;
DeprecatedString re_pat;
};
static internal_regex_t* impl_from(regex_t* re)
@ -55,7 +55,7 @@ int regcomp(regex_t* reg, char const* pattern, int cflags)
preg->cflags = cflags;
String pattern_str(pattern);
DeprecatedString pattern_str(pattern);
if (is_extended)
preg->re = make<Regex<PosixExtended>>(pattern_str, PosixOptions {} | (PosixFlags)cflags | PosixFlags::SkipTrimEmptyMatches);
else
@ -152,9 +152,9 @@ int regexec(regex_t const* reg, char const* string, size_t nmatch, regmatch_t pm
return REG_NOMATCH;
}
inline static String get_error(ReError errcode)
inline static DeprecatedString get_error(ReError errcode)
{
String error;
DeprecatedString error;
switch ((ReError)errcode) {
case REG_NOERR:
error = "No error";
@ -211,7 +211,7 @@ inline static String get_error(ReError errcode)
size_t regerror(int errcode, regex_t const* reg, char* errbuf, size_t errbuf_size)
{
String error;
DeprecatedString error;
auto const* preg = impl_from(reg);
if (!preg)