mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 01:17:35 +00:00
AK: Rename adopt() to adopt_ref()
This makes it more symmetrical with adopt_own() (which is used to create a NonnullOwnPtr from the result of a naked new.)
This commit is contained in:
parent
b3db01e20e
commit
b91c49364d
228 changed files with 461 additions and 461 deletions
|
@ -42,7 +42,7 @@ Mixer::~Mixer()
|
|||
|
||||
NonnullRefPtr<BufferQueue> Mixer::create_queue(ClientConnection& client)
|
||||
{
|
||||
auto queue = adopt(*new BufferQueue(client));
|
||||
auto queue = adopt_ref(*new BufferQueue(client));
|
||||
pthread_mutex_lock(&m_pending_mutex);
|
||||
m_pending_mixing.append(*queue);
|
||||
m_added_queue = true;
|
||||
|
|
|
@ -12,7 +12,7 @@ class Client : public RefCounted<Client> {
|
|||
public:
|
||||
static NonnullRefPtr<Client> create(int id, RefPtr<Core::TCPSocket> socket)
|
||||
{
|
||||
return adopt(*new Client(id, move(socket)));
|
||||
return adopt_ref(*new Client(id, move(socket)));
|
||||
}
|
||||
|
||||
Function<void()> on_exit;
|
||||
|
|
|
@ -19,7 +19,7 @@ class Client : public RefCounted<Client> {
|
|||
public:
|
||||
static NonnullRefPtr<Client> create(int id, RefPtr<Core::TCPSocket> socket, int ptm_fd)
|
||||
{
|
||||
return adopt(*new Client(id, move(socket), ptm_fd));
|
||||
return adopt_ref(*new Client(id, move(socket), ptm_fd));
|
||||
}
|
||||
|
||||
Function<void()> on_exit;
|
||||
|
|
|
@ -117,13 +117,13 @@ Cursor::~Cursor()
|
|||
NonnullRefPtr<Cursor> Cursor::create(NonnullRefPtr<Gfx::Bitmap>&& bitmap)
|
||||
{
|
||||
auto hotspot = bitmap->rect().center();
|
||||
return adopt(*new Cursor(move(bitmap), CursorParams(hotspot)));
|
||||
return adopt_ref(*new Cursor(move(bitmap), CursorParams(hotspot)));
|
||||
}
|
||||
|
||||
NonnullRefPtr<Cursor> Cursor::create(NonnullRefPtr<Gfx::Bitmap>&& bitmap, const StringView& filename)
|
||||
{
|
||||
auto default_hotspot = bitmap->rect().center();
|
||||
return adopt(*new Cursor(move(bitmap), CursorParams::parse_from_file_name(filename, default_hotspot)));
|
||||
return adopt_ref(*new Cursor(move(bitmap), CursorParams::parse_from_file_name(filename, default_hotspot)));
|
||||
}
|
||||
|
||||
RefPtr<Cursor> Cursor::create(Gfx::StandardCursor standard_cursor)
|
||||
|
|
|
@ -17,7 +17,7 @@ class Menubar
|
|||
: public RefCounted<Menubar>
|
||||
, public Weakable<Menubar> {
|
||||
public:
|
||||
static NonnullRefPtr<Menubar> create(ClientConnection& client, int menubar_id) { return adopt(*new Menubar(client, menubar_id)); }
|
||||
static NonnullRefPtr<Menubar> create(ClientConnection& client, int menubar_id) { return adopt_ref(*new Menubar(client, menubar_id)); }
|
||||
~Menubar();
|
||||
|
||||
ClientConnection& client() { return m_client; }
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue