summaryrefslogtreecommitdiff
path: root/Userland/Applications/Browser/Tab.h
diff options
context:
space:
mode:
authorLinus Groh <mail@linusgroh.de>2022-12-04 18:02:33 +0000
committerAndreas Kling <kling@serenityos.org>2022-12-06 08:54:33 +0100
commit6e19ab2bbce0b113b628e6f8e9b5c0640053933e (patch)
tree372d21b2f5dcff112f5d0089559c6af5798680d4 /Userland/Applications/Browser/Tab.h
parentf74251606d74b504a1379ebb893fdb5529054ea5 (diff)
downloadserenity-6e19ab2bbce0b113b628e6f8e9b5c0640053933e.zip
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 :^)
Diffstat (limited to 'Userland/Applications/Browser/Tab.h')
-rw-r--r--Userland/Applications/Browser/Tab.h22
1 files changed, 11 insertions, 11 deletions
diff --git a/Userland/Applications/Browser/Tab.h b/Userland/Applications/Browser/Tab.h
index 2334631094..f65eb6ff83 100644
--- a/Userland/Applications/Browser/Tab.h
+++ b/Userland/Applications/Browser/Tab.h
@@ -59,20 +59,20 @@ public:
void window_position_changed(Gfx::IntPoint const&);
void window_size_changed(Gfx::IntSize const&);
- Function<void(String const&)> on_title_change;
+ Function<void(DeprecatedString const&)> on_title_change;
Function<void(const URL&)> on_tab_open_request;
Function<void(Tab&)> on_tab_close_request;
Function<void(Tab&)> on_tab_close_other_request;
Function<void(Gfx::Bitmap const&)> on_favicon_change;
Function<Vector<Web::Cookie::Cookie>(AK::URL const& url)> on_get_all_cookies;
- Function<Optional<Web::Cookie::Cookie>(AK::URL const& url, String const& name)> on_get_named_cookie;
- Function<String(const URL&, Web::Cookie::Source source)> on_get_cookie;
+ Function<Optional<Web::Cookie::Cookie>(AK::URL const& url, DeprecatedString const& name)> on_get_named_cookie;
+ Function<DeprecatedString(const URL&, Web::Cookie::Source source)> on_get_cookie;
Function<void(const URL&, Web::Cookie::ParsedCookie const& cookie, Web::Cookie::Source source)> on_set_cookie;
Function<void()> on_dump_cookies;
Function<void(URL const&, Web::Cookie::Cookie)> on_update_cookie;
Function<Vector<Web::Cookie::Cookie>()> on_get_cookies_entries;
- Function<OrderedHashMap<String, String>()> on_get_local_storage_entries;
- Function<OrderedHashMap<String, String>()> on_get_session_storage_entries;
+ Function<OrderedHashMap<DeprecatedString, DeprecatedString>()> on_get_local_storage_entries;
+ Function<OrderedHashMap<DeprecatedString, DeprecatedString>()> on_get_session_storage_entries;
Function<Gfx::ShareableBitmap()> on_take_screenshot;
void enable_webdriver_mode();
@@ -86,7 +86,7 @@ public:
void show_console_window();
void show_storage_inspector();
- String const& title() const { return m_title; }
+ DeprecatedString const& title() const { return m_title; }
Gfx::Bitmap const* icon() const { return m_icon; }
WebView::OutOfProcessWebView& view() { return *m_web_content_view; }
@@ -102,10 +102,10 @@ private:
void update_actions();
void bookmark_current_url();
- void update_bookmark_button(String const& url);
+ void update_bookmark_button(DeprecatedString const& url);
void start_download(const URL& url);
- void view_source(const URL& url, String const& source);
- void update_status(Optional<String> text_override = {}, i32 count_waiting = 0);
+ void view_source(const URL& url, DeprecatedString const& source);
+ void update_status(Optional<DeprecatedString> text_override = {}, i32 count_waiting = 0);
enum class MayAppendTLD {
No,
@@ -138,7 +138,7 @@ private:
RefPtr<GUI::Menu> m_page_context_menu;
RefPtr<GUI::Menu> m_go_back_context_menu;
RefPtr<GUI::Menu> m_go_forward_context_menu;
- String m_title;
+ DeprecatedString m_title;
RefPtr<const Gfx::Bitmap> m_icon;
Optional<URL> m_navigating_url;
@@ -147,6 +147,6 @@ private:
bool m_is_history_navigation { false };
};
-URL url_from_user_input(String const& input);
+URL url_from_user_input(DeprecatedString const& input);
}