RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 08:27:46 +00:00
Code Issues Activity Actions

LibCore: Remove ObjectPtr in favor of RefPtr

Browse source 
Now that CObject is fully ref-counted, just use RefPtr everywhere! :^)
This commit is contained in:
Andreas Kling 2019-09-22 00:31:54 +02:00
parent bc319d9e88
commit d6abfbdc5a
71 changed files with 146 additions and 156 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Servers/AudioServer/ASEventLoop.h
View file

@ -12,6 +12,6 @@ public:
private:
CEventLoop m_event_loop;
ObjectPtr<CLocalServer> m_server;
RefPtr<CLocalServer> m_server;
ASMixer m_mixer;
};

2
Servers/AudioServer/ASMixer.h
View file

@ -63,7 +63,7 @@ public:
private:
Vector<NonnullRefPtr<ASBufferQueue>> m_pending_mixing;
ObjectPtr<CFile> m_device;
RefPtr<CFile> m_device;
LibThread::Lock m_lock;
LibThread::Thread m_sound_thread;

2
Servers/TelnetServer/Client.cpp
View file

@ -10,7 +10,7 @@
#include "Client.h"
Client::Client(int id, ObjectPtr<CTCPSocket> socket, int ptm_fd)
Client::Client(int id, RefPtr<CTCPSocket> socket, int ptm_fd)
: m_id(id)
, m_socket(move(socket))
, m_ptm_fd(ptm_fd)

8
Servers/TelnetServer/Client.h
View file

@ -11,7 +11,7 @@
class Client : public RefCounted<Client> {
public:
static NonnullRefPtr<Client> create(int id, ObjectPtr<CTCPSocket> socket, int ptm_fd)
static NonnullRefPtr<Client> create(int id, RefPtr<CTCPSocket> socket, int ptm_fd)
{
return adopt(*new Client(id, move(socket), ptm_fd));
}
@ -19,7 +19,7 @@ public:
Function<void()> on_exit;
protected:
Client(int id, ObjectPtr<CTCPSocket> socket, int ptm_fd);
Client(int id, RefPtr<CTCPSocket> socket, int ptm_fd);
void drain_socket();
void drain_pty();
@ -35,9 +35,9 @@ private:
// client id
int m_id { 0 };
// client resources
ObjectPtr<CTCPSocket> m_socket;
RefPtr<CTCPSocket> m_socket;
Parser m_parser;
// pty resources
int m_ptm_fd { -1 };
ObjectPtr<CNotifier> m_ptm_notifier;
RefPtr<CNotifier> m_ptm_notifier;
};

4
Servers/WindowServer/WSCompositor.h
View file

@ -46,8 +46,8 @@ private:
unsigned m_compose_count { 0 };
unsigned m_flush_count { 0 };
ObjectPtr<CTimer> m_compose_timer;
ObjectPtr<CTimer> m_immediate_compose_timer;
RefPtr<CTimer> m_compose_timer;
RefPtr<CTimer> m_immediate_compose_timer;
bool m_flash_flush { false };
bool m_buffers_are_flipped { false };
bool m_screen_can_set_buffer { false };

6
Servers/WindowServer/WSEventLoop.h
View file

@ -21,8 +21,8 @@ private:
CEventLoop m_event_loop;
int m_keyboard_fd { -1 };
ObjectPtr<CNotifier> m_keyboard_notifier;
RefPtr<CNotifier> m_keyboard_notifier;
int m_mouse_fd { -1 };
ObjectPtr<CNotifier> m_mouse_notifier;
ObjectPtr<CLocalServer> m_server;
RefPtr<CNotifier> m_mouse_notifier;
RefPtr<CLocalServer> m_server;
};

2
Servers/WindowServer/WSMenuManager.h
View file

@ -33,7 +33,7 @@ private:
RefPtr<WSWindow> m_window;
WSCPUMonitor m_cpu_monitor;
String m_username;
ObjectPtr<CTimer> m_timer;
RefPtr<CTimer> m_timer;
Vector<WeakPtr<WSMenu>> m_open_menu_stack;
};