RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 06:07:34 +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

4
Userland/Services/NotificationServer/ConnectionFromClient.cpp
View file

@ -24,7 +24,7 @@ void ConnectionFromClient::die()
s_connections.remove(client_id());
}
void ConnectionFromClient::show_notification(String const& text, String const& title, Gfx::ShareableBitmap const& icon)
void ConnectionFromClient::show_notification(DeprecatedString const& text, DeprecatedString const& title, Gfx::ShareableBitmap const& icon)
{
auto window = NotificationWindow::construct(client_id(), text, title, icon);
window->show();
@ -47,7 +47,7 @@ Messages::NotificationServer::UpdateNotificationIconResponse ConnectionFromClien
return !!window;
}
Messages::NotificationServer::UpdateNotificationTextResponse ConnectionFromClient::update_notification_text(String const& text, String const& title)
Messages::NotificationServer::UpdateNotificationTextResponse ConnectionFromClient::update_notification_text(DeprecatedString const& text, DeprecatedString const& title)
{
auto window = NotificationWindow::get_window_by_id(client_id());
if (window) {

4
Userland/Services/NotificationServer/ConnectionFromClient.h
View file

@ -23,10 +23,10 @@ public:
private:
explicit ConnectionFromClient(NonnullOwnPtr<Core::Stream::LocalSocket>, int client_id);
virtual void show_notification(String const&, String const&, Gfx::ShareableBitmap const&) override;
virtual void show_notification(DeprecatedString const&, DeprecatedString const&, Gfx::ShareableBitmap const&) override;
virtual void close_notification() override;
virtual Messages::NotificationServer::UpdateNotificationIconResponse update_notification_icon(Gfx::ShareableBitmap const&) override;
virtual Messages::NotificationServer::UpdateNotificationTextResponse update_notification_text(String const&, String const&) override;
virtual Messages::NotificationServer::UpdateNotificationTextResponse update_notification_text(DeprecatedString const&, DeprecatedString const&) override;
virtual Messages::NotificationServer::IsShowingResponse is_showing() override;
};

4
Userland/Services/NotificationServer/NotificationServer.ipc
View file

@ -2,9 +2,9 @@
endpoint NotificationServer
{
show_notification([UTF8] String text, [UTF8] String title, Gfx::ShareableBitmap icon) => ()
show_notification([UTF8] DeprecatedString text, [UTF8] DeprecatedString title, Gfx::ShareableBitmap icon) => ()
update_notification_text([UTF8] String text, [UTF8] String title) => (bool still_showing)
update_notification_text([UTF8] DeprecatedString text, [UTF8] DeprecatedString title) => (bool still_showing)
update_notification_icon(Gfx::ShareableBitmap icon) => (bool still_showing)

6
Userland/Services/NotificationServer/NotificationWindow.cpp
View file

@ -37,7 +37,7 @@ static void update_notification_window_locations(Gfx::IntRect const& screen_rect
}
}
NotificationWindow::NotificationWindow(i32 client_id, String const& text, String const& title, Gfx::ShareableBitmap const& icon)
NotificationWindow::NotificationWindow(i32 client_id, DeprecatedString const& text, DeprecatedString const& title, Gfx::ShareableBitmap const& icon)
{
m_id = client_id;
s_windows.set(m_id, this);
@ -129,14 +129,14 @@ void NotificationWindow::leave_event(Core::Event&)
update_notification_window_locations(GUI::Desktop::the().rect());
}
void NotificationWindow::set_text(String const& value)
void NotificationWindow::set_text(DeprecatedString const& value)
{
m_text_label->set_text(value);
if (m_hovering)
resize_to_fit_text();
}
void NotificationWindow::set_title(String const& value)
void NotificationWindow::set_title(DeprecatedString const& value)
{
m_title_label->set_text(value);
}

6
Userland/Services/NotificationServer/NotificationWindow.h
View file

@ -18,8 +18,8 @@ public:
virtual ~NotificationWindow() override = default;
void set_original_rect(Gfx::IntRect original_rect) { m_original_rect = original_rect; };
void set_text(String const&);
void set_title(String const&);
void set_text(DeprecatedString const&);
void set_title(DeprecatedString const&);
void set_image(Gfx::ShareableBitmap const&);
static RefPtr<NotificationWindow> get_window_by_id(i32 id);
@ -29,7 +29,7 @@ protected:
virtual void leave_event(Core::Event&) override;
private:
NotificationWindow(i32 client_id, String const& text, String const& title, Gfx::ShareableBitmap const&);
NotificationWindow(i32 client_id, DeprecatedString const& text, DeprecatedString const& title, Gfx::ShareableBitmap const&);
virtual void screen_rects_change_event(GUI::ScreenRectsChangeEvent&) override;