1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 09:57:35 +00:00

AK: Rename RetainPtr => RefPtr and Retained => NonnullRefPtr.

This commit is contained in:
Andreas Kling 2019-06-21 18:37:47 +02:00
parent 77b9fa89dd
commit 90b1354688
188 changed files with 562 additions and 562 deletions

View file

@ -24,10 +24,10 @@ private:
IRCClient m_client;
GStackWidget* m_container { nullptr };
GTableView* m_window_list { nullptr };
RetainPtr<GAction> m_join_action;
RetainPtr<GAction> m_part_action;
RetainPtr<GAction> m_whois_action;
RetainPtr<GAction> m_open_query_action;
RetainPtr<GAction> m_close_query_action;
RetainPtr<GAction> m_change_nick_action;
RefPtr<GAction> m_join_action;
RefPtr<GAction> m_part_action;
RefPtr<GAction> m_whois_action;
RefPtr<GAction> m_open_query_action;
RefPtr<GAction> m_close_query_action;
RefPtr<GAction> m_change_nick_action;
};

View file

@ -18,7 +18,7 @@ IRCChannel::~IRCChannel()
{
}
Retained<IRCChannel> IRCChannel::create(IRCClient& client, const String& name)
NonnullRefPtr<IRCChannel> IRCChannel::create(IRCClient& client, const String& name)
{
return adopt(*new IRCChannel(client, name));
}

View file

@ -13,7 +13,7 @@ class IRCWindow;
class IRCChannel : public RefCounted<IRCChannel> {
public:
static Retained<IRCChannel> create(IRCClient&, const String&);
static NonnullRefPtr<IRCChannel> create(IRCClient&, const String&);
~IRCChannel();
bool is_open() const { return m_open; }
@ -64,7 +64,7 @@ private:
Vector<Member> m_members;
bool m_open { false };
Retained<IRCLogBuffer> m_log;
Retained<IRCChannelMemberListModel> m_member_model;
NonnullRefPtr<IRCLogBuffer> m_log;
NonnullRefPtr<IRCChannelMemberListModel> m_member_model;
IRCWindow* m_window { nullptr };
};

View file

@ -10,7 +10,7 @@ public:
enum Column {
Name
};
static Retained<IRCChannelMemberListModel> create(IRCChannel& channel) { return adopt(*new IRCChannelMemberListModel(channel)); }
static NonnullRefPtr<IRCChannelMemberListModel> create(IRCChannel& channel) { return adopt(*new IRCChannelMemberListModel(channel)); }
virtual ~IRCChannelMemberListModel() override;
virtual int row_count(const GModelIndex&) const override;

View file

@ -120,14 +120,14 @@ private:
String m_nickname;
OwnPtr<CNotifier> m_notifier;
HashMap<String, RetainPtr<IRCChannel>> m_channels;
HashMap<String, RetainPtr<IRCQuery>> m_queries;
HashMap<String, RefPtr<IRCChannel>> m_channels;
HashMap<String, RefPtr<IRCQuery>> m_queries;
Vector<IRCWindow*> m_windows;
IRCWindow* m_server_subwindow { nullptr };
Retained<IRCWindowListModel> m_client_window_list_model;
Retained<IRCLogBuffer> m_log;
Retained<CConfigFile> m_config;
NonnullRefPtr<IRCWindowListModel> m_client_window_list_model;
NonnullRefPtr<IRCLogBuffer> m_log;
NonnullRefPtr<CConfigFile> m_config;
};

View file

@ -3,7 +3,7 @@
#include <stdio.h>
#include <time.h>
Retained<IRCLogBuffer> IRCLogBuffer::create()
NonnullRefPtr<IRCLogBuffer> IRCLogBuffer::create()
{
return adopt(*new IRCLogBuffer);
}

View file

@ -10,7 +10,7 @@ class IRCLogBufferModel;
class IRCLogBuffer : public RefCounted<IRCLogBuffer> {
public:
static Retained<IRCLogBuffer> create();
static NonnullRefPtr<IRCLogBuffer> create();
~IRCLogBuffer();
struct Message {
@ -32,6 +32,6 @@ public:
private:
IRCLogBuffer();
Retained<IRCLogBufferModel> m_model;
NonnullRefPtr<IRCLogBufferModel> m_model;
CircularQueue<Message, 1000> m_messages;
};

View file

@ -4,7 +4,7 @@
#include <stdio.h>
#include <time.h>
IRCLogBufferModel::IRCLogBufferModel(Retained<IRCLogBuffer>&& log_buffer)
IRCLogBufferModel::IRCLogBufferModel(NonnullRefPtr<IRCLogBuffer>&& log_buffer)
: m_log_buffer(move(log_buffer))
{
}

View file

@ -13,7 +13,7 @@ public:
__Count,
};
static Retained<IRCLogBufferModel> create(Retained<IRCLogBuffer>&& log_buffer) { return adopt(*new IRCLogBufferModel(move(log_buffer))); }
static NonnullRefPtr<IRCLogBufferModel> create(NonnullRefPtr<IRCLogBuffer>&& log_buffer) { return adopt(*new IRCLogBufferModel(move(log_buffer))); }
virtual ~IRCLogBufferModel() override;
virtual int row_count(const GModelIndex&) const override;
@ -24,7 +24,7 @@ public:
virtual void update() override;
private:
explicit IRCLogBufferModel(Retained<IRCLogBuffer>&&);
explicit IRCLogBufferModel(NonnullRefPtr<IRCLogBuffer>&&);
Retained<IRCLogBuffer> m_log_buffer;
NonnullRefPtr<IRCLogBuffer> m_log_buffer;
};

View file

@ -16,7 +16,7 @@ IRCQuery::~IRCQuery()
{
}
Retained<IRCQuery> IRCQuery::create(IRCClient& client, const String& name)
NonnullRefPtr<IRCQuery> IRCQuery::create(IRCClient& client, const String& name)
{
return adopt(*new IRCQuery(client, name));
}

View file

@ -12,7 +12,7 @@ class IRCWindow;
class IRCQuery : public RefCounted<IRCQuery> {
public:
static Retained<IRCQuery> create(IRCClient&, const String& name);
static NonnullRefPtr<IRCQuery> create(IRCClient&, const String& name);
~IRCQuery();
String name() const { return m_name; }
@ -35,5 +35,5 @@ private:
String m_name;
IRCWindow* m_window { nullptr };
Retained<IRCLogBuffer> m_log;
NonnullRefPtr<IRCLogBuffer> m_log;
};

View file

@ -49,6 +49,6 @@ private:
String m_name;
GTableView* m_table_view { nullptr };
GTextEditor* m_text_editor { nullptr };
RetainPtr<IRCLogBuffer> m_log_buffer;
RefPtr<IRCLogBuffer> m_log_buffer;
int m_unread_count { 0 };
};

View file

@ -12,7 +12,7 @@ public:
Name,
};
static Retained<IRCWindowListModel> create(IRCClient& client) { return adopt(*new IRCWindowListModel(client)); }
static NonnullRefPtr<IRCWindowListModel> create(IRCClient& client) { return adopt(*new IRCWindowListModel(client)); }
virtual ~IRCWindowListModel() override;
virtual int row_count(const GModelIndex&) const override;