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

18
Userland/Libraries/LibWeb/Loader/FrameLoader.cpp
View file

@ -28,10 +28,10 @@
namespace Web {
static String s_default_favicon_path = "/res/icons/16x16/app-browser.png";
static DeprecatedString s_default_favicon_path = "/res/icons/16x16/app-browser.png";
static RefPtr<Gfx::Bitmap> s_default_favicon_bitmap;
void FrameLoader::set_default_favicon_path(String path)
void FrameLoader::set_default_favicon_path(DeprecatedString path)
{
s_default_favicon_path = move(path);
}
@ -120,7 +120,7 @@ static bool build_text_document(DOM::Document& document, ByteBuffer const& data)
auto pre_element = document.create_element("pre").release_value();
MUST(body_element->append_child(pre_element));
MUST(pre_element->append_child(document.create_text_node(String::copy(data))));
MUST(pre_element->append_child(document.create_text_node(DeprecatedString::copy(data))));
return true;
}
@ -143,7 +143,7 @@ static bool build_image_document(DOM::Document& document, ByteBuffer const& data
MUST(head_element->append_child(title_element));
auto basename = LexicalPath::basename(document.url().path());
auto title_text = document.heap().allocate<DOM::Text>(document.realm(), document, String::formatted("{} [{}x{}]", basename, bitmap->width(), bitmap->height()));
auto title_text = document.heap().allocate<DOM::Text>(document.realm(), document, DeprecatedString::formatted("{} [{}x{}]", basename, bitmap->width(), bitmap->height()));
MUST(title_element->append_child(*title_text));
auto body_element = document.create_element("body").release_value();
@ -160,7 +160,7 @@ static bool build_gemini_document(DOM::Document& document, ByteBuffer const& dat
{
StringView gemini_data { data };
auto gemini_document = Gemini::Document::parse(gemini_data, document.url());
String html_data = gemini_document->render_to_html();
DeprecatedString html_data = gemini_document->render_to_html();
dbgln_if(GEMINI_DEBUG, "Gemini data:\n\"\"\"{}\"\"\"", gemini_data);
dbgln_if(GEMINI_DEBUG, "Converted to HTML:\n\"\"\"{}\"\"\"", html_data);
@ -324,9 +324,9 @@ void FrameLoader::load_html(StringView html, const AK::URL& url)
parser->run(url);
}
static String s_error_page_url = "file:///res/html/error.html";
static DeprecatedString s_error_page_url = "file:///res/html/error.html";
void FrameLoader::set_error_page_url(String error_page_url)
void FrameLoader::set_error_page_url(DeprecatedString error_page_url)
{
s_error_page_url = error_page_url;
}
@ -334,7 +334,7 @@ void FrameLoader::set_error_page_url(String error_page_url)
// FIXME: Use an actual templating engine (our own one when it's built, preferably
// with a way to check these usages at compile time)
void FrameLoader::load_error_page(const AK::URL& failed_url, String const& error)
void FrameLoader::load_error_page(const AK::URL& failed_url, DeprecatedString const& error)
{
ResourceLoader::the().load(
s_error_page_url,
@ -363,7 +363,7 @@ void FrameLoader::load_favicon(RefPtr<Gfx::Bitmap> bitmap)
}
}
void FrameLoader::store_response_cookies(AK::URL const& url, String const& cookies)
void FrameLoader::store_response_cookies(AK::URL const& url, DeprecatedString const& cookies)
{
auto* page = browsing_context().page();
if (!page)