system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-07-21 10:05:32 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

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
Show stats Download patch file Download diff file Expand all files Collapse all files

40
Applications/Calculator/CalculatorWidget.h
View file

@ -25,26 +25,26 @@ private:
Calculator m_calculator;
Keypad m_keypad;
ObjectPtr<GTextBox> m_entry;
ObjectPtr<GLabel> m_label;
RefPtr<GTextBox> m_entry;
RefPtr<GLabel> m_label;
ObjectPtr<GButton> m_digit_button[10];
ObjectPtr<GButton> m_mem_add_button;
ObjectPtr<GButton> m_mem_save_button;
ObjectPtr<GButton> m_mem_recall_button;
ObjectPtr<GButton> m_mem_clear_button;
ObjectPtr<GButton> m_clear_button;
ObjectPtr<GButton> m_clear_error_button;
ObjectPtr<GButton> m_backspace_button;
ObjectPtr<GButton> m_decimal_point_button;
ObjectPtr<GButton> m_sign_button;
ObjectPtr<GButton> m_add_button;
ObjectPtr<GButton> m_subtract_button;
ObjectPtr<GButton> m_multiply_button;
ObjectPtr<GButton> m_divide_button;
ObjectPtr<GButton> m_sqrt_button;
ObjectPtr<GButton> m_inverse_button;
ObjectPtr<GButton> m_percent_button;
ObjectPtr<GButton> m_equals_button;
RefPtr<GButton> m_digit_button[10];
RefPtr<GButton> m_mem_add_button;
RefPtr<GButton> m_mem_save_button;
RefPtr<GButton> m_mem_recall_button;
RefPtr<GButton> m_mem_clear_button;
RefPtr<GButton> m_clear_button;
RefPtr<GButton> m_clear_error_button;
RefPtr<GButton> m_backspace_button;
RefPtr<GButton> m_decimal_point_button;
RefPtr<GButton> m_sign_button;
RefPtr<GButton> m_add_button;
RefPtr<GButton> m_subtract_button;
RefPtr<GButton> m_multiply_button;
RefPtr<GButton> m_divide_button;
RefPtr<GButton> m_sqrt_button;
RefPtr<GButton> m_inverse_button;
RefPtr<GButton> m_percent_button;
RefPtr<GButton> m_equals_button;
};

2
Applications/ChanViewer/BoardListModel.h
View file

@ -25,5 +25,5 @@ private:
BoardListModel();
JsonArray m_boards;
ObjectPtr<CHttpJob> m_pending_job;
RefPtr<CHttpJob> m_pending_job;
};

2
Applications/ChanViewer/ThreadCatalogModel.h
View file

@ -37,5 +37,5 @@ private:
String m_board { "g" };
JsonArray m_catalog;
ObjectPtr<CHttpJob> m_pending_job;
RefPtr<CHttpJob> m_pending_job;
};

4
Applications/DisplayProperties/DisplayProperties.h
View file

@ -40,10 +40,10 @@ private:
private:
String m_wallpaper_path;
RefPtr<CConfigFile> m_wm_config;
ObjectPtr<GWidget> m_root_widget;
RefPtr<GWidget> m_root_widget;
Vector<Size> m_resolutions;
Vector<String> m_wallpapers;
ObjectPtr<GLabel> m_wallpaper_preview;
RefPtr<GLabel> m_wallpaper_preview;
Size m_selected_resolution;
String m_selected_wallpaper;

4
Applications/FileManager/DirectoryView.h
View file

@ -72,6 +72,6 @@ private:
Vector<String> m_path_history;
void add_path_to_history(const StringView& path);
ObjectPtr<GTableView> m_table_view;
ObjectPtr<GItemView> m_item_view;
RefPtr<GTableView> m_table_view;
RefPtr<GItemView> m_item_view;
};

4
Applications/IRCClient/IRCAppWindow.h
View file

@ -27,8 +27,8 @@ private:
IRCWindow& create_window(void* owner, IRCWindow::Type, const String& name);
IRCClient m_client;
ObjectPtr<GStackWidget> m_container;
ObjectPtr<GTableView> m_window_list;
RefPtr<GStackWidget> m_container;
RefPtr<GTableView> m_window_list;
RefPtr<GAction> m_join_action;
RefPtr<GAction> m_part_action;
RefPtr<GAction> m_whois_action;

5
Applications/IRCClient/IRCClient.h
View file

@ -8,7 +8,6 @@
#include <AK/String.h>
#include <LibCore/CConfigFile.h>
#include <LibCore/CTCPSocket.h>
#include <LibCore/ObjectPtr.h>
class IRCChannel;
class IRCQuery;
@ -137,10 +136,10 @@ private:
String m_hostname;
int m_port { 6667 };
ObjectPtr<CTCPSocket> m_socket;
RefPtr<CTCPSocket> m_socket;
String m_nickname;
ObjectPtr<CNotifier> m_notifier;
RefPtr<CNotifier> m_notifier;
HashMap<String, RefPtr<IRCChannel>, CaseInsensitiveStringTraits> m_channels;
HashMap<String, RefPtr<IRCQuery>, CaseInsensitiveStringTraits> m_queries;

4
Applications/IRCClient/IRCWindow.h
View file

@ -46,8 +46,8 @@ private:
void* m_owner { nullptr };
Type m_type;
String m_name;
ObjectPtr<GTableView> m_table_view;
ObjectPtr<GTextEditor> m_text_editor;
RefPtr<GTableView> m_table_view;
RefPtr<GTextEditor> m_text_editor;
RefPtr<IRCLogBuffer> m_log_buffer;
int m_unread_count { 0 };
};

4
Applications/Launcher/main.cpp
View file

@ -12,7 +12,7 @@
#include <sys/wait.h>
#include <unistd.h>
static ObjectPtr<GWindow> make_launcher_window();
static RefPtr<GWindow> make_launcher_window();
void handle_sigchld(int)
{
@ -63,7 +63,7 @@ private:
String m_executable_path;
};
ObjectPtr<GWindow> make_launcher_window()
RefPtr<GWindow> make_launcher_window()
{
auto config = CConfigFile::get_for_app("Launcher");
auto vertical = config->read_bool_entry("Launcher", "Vertical", true);

2
Applications/PaintBrush/ColorDialog.h
View file

@ -17,5 +17,5 @@ private:
void build();
Color m_color;
ObjectPtr<GFrame> m_preview_widget;
RefPtr<GFrame> m_preview_widget;
};

4
Applications/PaintBrush/PaletteWidget.h
View file

@ -15,6 +15,6 @@ public:
private:
PaintableWidget& m_paintable_widget;
ObjectPtr<GFrame> m_primary_color_widget;
ObjectPtr<GFrame> m_secondary_color_widget;
RefPtr<GFrame> m_primary_color_widget;
RefPtr<GFrame> m_secondary_color_widget;
};

2
Applications/PaintBrush/SprayTool.h
View file

@ -19,7 +19,7 @@ public:
private:
virtual const char* class_name() const override { return "SprayTool"; }
void paint_it();
ObjectPtr<CTimer> m_timer;
RefPtr<CTimer> m_timer;
Point m_last_pos;
Color m_color;
OwnPtr<GMenu> m_context_menu;

2
Applications/SystemMonitor/MemoryStatsWidget.cpp
View file

@ -22,7 +22,7 @@ MemoryStatsWidget::MemoryStatsWidget(GraphWidget& graph, GWidget* parent)
layout()->set_margins({ 0, 8, 0, 0 });
layout()->set_spacing(3);
auto build_widgets_for_label = [this](const String& description) -> ObjectPtr<GLabel> {
auto build_widgets_for_label = [this](const String& description) -> RefPtr<GLabel> {
auto container = GWidget::construct(this);
container->set_layout(make<GBoxLayout>(Orientation::Horizontal));
container->set_size_policy(SizePolicy::Fixed, SizePolicy::Fixed);

10
Applications/SystemMonitor/MemoryStatsWidget.h
View file

@ -18,9 +18,9 @@ private:
virtual void timer_event(CTimerEvent&) override;
GraphWidget& m_graph;
ObjectPtr<GLabel> m_user_physical_pages_label;
ObjectPtr<GLabel> m_supervisor_physical_pages_label;
ObjectPtr<GLabel> m_kmalloc_label;
ObjectPtr<GLabel> m_kmalloc_count_label;
ObjectPtr<CFile> m_proc_memstat;
RefPtr<GLabel> m_user_physical_pages_label;
RefPtr<GLabel> m_supervisor_physical_pages_label;
RefPtr<GLabel> m_kmalloc_label;
RefPtr<GLabel> m_kmalloc_count_label;
RefPtr<CFile> m_proc_memstat;
};

6
Applications/SystemMonitor/NetworkStatisticsWidget.h
View file

@ -14,7 +14,7 @@ private:
explicit NetworkStatisticsWidget(GWidget* parent = nullptr);
void update_models();
ObjectPtr<GTableView> m_adapter_table_view;
ObjectPtr<GTableView> m_socket_table_view;
ObjectPtr<CTimer> m_update_timer;
RefPtr<GTableView> m_adapter_table_view;
RefPtr<GTableView> m_socket_table_view;
RefPtr<CTimer> m_update_timer;
};

2
Applications/SystemMonitor/ProcessFileDescriptorMapWidget.h
View file

@ -14,6 +14,6 @@ public:
private:
explicit ProcessFileDescriptorMapWidget(GWidget* parent);
ObjectPtr<GTableView> m_table_view;
RefPtr<GTableView> m_table_view;
pid_t m_pid { -1 };
};

2
Applications/SystemMonitor/ProcessMemoryMapWidget.h
View file

@ -13,6 +13,6 @@ public:
private:
explicit ProcessMemoryMapWidget(GWidget* parent);
ObjectPtr<GTableView> m_table_view;
RefPtr<GTableView> m_table_view;
pid_t m_pid { -1 };
};

5
Applications/SystemMonitor/ProcessStacksWidget.h
View file

@ -1,6 +1,5 @@
#pragma once
#include <LibCore/ObjectPtr.h>
#include <LibGUI/GTextEditor.h>
#include <LibGUI/GWidget.h>
@ -17,6 +16,6 @@ public:
private:
pid_t m_pid { -1 };
ObjectPtr<GTextEditor> m_stacks_editor;
ObjectPtr<CTimer> m_timer;
RefPtr<GTextEditor> m_stacks_editor;
RefPtr<CTimer> m_timer;
};

12
Applications/SystemMonitor/main.cpp
View file

@ -39,9 +39,9 @@ static String human_readable_size(u32 size)
return String::format("%u GB", size / GB);
}
static ObjectPtr<GWidget> build_file_systems_tab();
static ObjectPtr<GWidget> build_pci_devices_tab();
static ObjectPtr<GWidget> build_devices_tab();
static RefPtr<GWidget> build_file_systems_tab();
static RefPtr<GWidget> build_pci_devices_tab();
static RefPtr<GWidget> build_devices_tab();
int main(int argc, char** argv)
{
@ -234,7 +234,7 @@ public:
}
};
ObjectPtr<GWidget> build_file_systems_tab()
RefPtr<GWidget> build_file_systems_tab()
{
auto fs_widget = GWidget::construct();
fs_widget->set_layout(make<GBoxLayout>(Orientation::Vertical));
@ -299,7 +299,7 @@ ObjectPtr<GWidget> build_file_systems_tab()
return fs_widget;
}
ObjectPtr<GWidget> build_pci_devices_tab()
RefPtr<GWidget> build_pci_devices_tab()
{
auto pci_widget = GWidget::construct();
pci_widget->set_layout(make<GBoxLayout>(Orientation::Vertical));
@ -353,7 +353,7 @@ ObjectPtr<GWidget> build_pci_devices_tab()
return pci_widget;
}
ObjectPtr<GWidget> build_devices_tab()
RefPtr<GWidget> build_devices_tab()
{
auto devices_widget = GWidget::construct();
devices_widget->set_layout(make<GBoxLayout>(Orientation::Vertical));

8
Applications/Terminal/TerminalWidget.h
View file

@ -88,7 +88,7 @@ private:
bool m_in_active_window { false };
ObjectPtr<CNotifier> m_notifier;
RefPtr<CNotifier> m_notifier;
u8 m_opacity { 255 };
bool m_needs_background_fill { true };
@ -96,9 +96,9 @@ private:
int m_glyph_width { 0 };
ObjectPtr<CTimer> m_cursor_blink_timer;
ObjectPtr<CTimer> m_visual_beep_timer;
RefPtr<CTimer> m_cursor_blink_timer;
RefPtr<CTimer> m_visual_beep_timer;
RefPtr<CConfigFile> m_config;
ObjectPtr<GScrollBar> m_scrollbar;
RefPtr<GScrollBar> m_scrollbar;
};

4
Applications/Terminal/main.cpp
View file

@ -88,7 +88,7 @@ static void run_command(int ptm_fd, String command)
}
}
ObjectPtr<GWindow> create_settings_window(TerminalWidget& terminal, RefPtr<CConfigFile> config)
RefPtr<GWindow> create_settings_window(TerminalWidget& terminal, RefPtr<CConfigFile> config)
{
auto window = GWindow::construct();
window->set_title("Terminal Settings");
@ -170,7 +170,7 @@ int main(int argc, char** argv)
window->set_icon(load_png("/res/icons/16x16/app-terminal.png"));
terminal->set_should_beep(config->read_bool_entry("Window", "AudibleBeep", false));
ObjectPtr<GWindow> settings_window;
RefPtr<GWindow> settings_window;
auto new_opacity = config->read_num_entry("Window", "Opacity", 255);
terminal->set_opacity(new_opacity);

8
Applications/TextEditor/TextEditorWidget.h
View file

@ -24,7 +24,7 @@ private:
void set_path(const FileSystemPath& file);
void update_title();
ObjectPtr<GTextEditor> m_editor;
RefPtr<GTextEditor> m_editor;
String m_path;
String m_name;
String m_extension;
@ -37,12 +37,12 @@ private:
RefPtr<GAction> m_find_next_action;
RefPtr<GAction> m_find_previous_action;
ObjectPtr<GStatusBar> m_statusbar;
RefPtr<GStatusBar> m_statusbar;
ObjectPtr<GTextBox> m_find_textbox;
RefPtr<GTextBox> m_find_textbox;
GButton* m_find_previous_button { nullptr };
GButton* m_find_next_button { nullptr };
ObjectPtr<GWidget> m_find_widget;
RefPtr<GWidget> m_find_widget;
bool m_document_dirty { false };
};

4
DevTools/FormCompiler/main.cpp
View file

@ -44,14 +44,14 @@ int main(int argc, char** argv)
});
dbg() << "struct UI_" << name << " {";
dbg() << " ObjectPtr<GWidget> main_widget;";
dbg() << " RefPtr<GWidget> main_widget;";
widgets.as_array().for_each([&](auto& value) {
ASSERT(value.is_object());
const JsonObject& widget_object = value.as_object();
auto name = widget_object.get("name").to_string();
auto class_name = widget_object.get("class").to_string();
dbg() << " ObjectPtr<" << class_name << "> " << name << ";";
dbg() << " RefPtr<" << class_name << "> " << name << ";";
});
dbg() << " UI_" << name << "();";

2
DevTools/Inspector/RemoteProcess.h
View file

@ -32,6 +32,6 @@ private:
pid_t m_pid { -1 };
String m_process_name;
NonnullRefPtr<RemoteObjectGraphModel> m_object_graph_model;
ObjectPtr<CLocalSocket> m_socket;
RefPtr<CLocalSocket> m_socket;
NonnullOwnPtrVector<RemoteObject> m_roots;
};

2
DevTools/VisualBuilder/VBPropertiesWindow.cpp
View file

@ -31,7 +31,7 @@ public:
BoolModelEditingDelegate() {}
virtual ~BoolModelEditingDelegate() override {}
virtual ObjectPtr<GWidget> create_widget() override
virtual RefPtr<GWidget> create_widget() override
{
auto combo = GComboBox::construct(nullptr);
combo->set_only_allow_values_from_model(true);

2
DevTools/VisualBuilder/VBPropertiesWindow.h
View file

@ -15,5 +15,5 @@ public:
const GTableView& table_view() const { return *m_table_view; }
private:
ObjectPtr<GTableView> m_table_view;
RefPtr<GTableView> m_table_view;
};

2
DevTools/VisualBuilder/VBWidget.h
View file

@ -81,7 +81,7 @@ private:
VBWidgetType m_type { VBWidgetType::None };
VBForm& m_form;
ObjectPtr<GWidget> m_gwidget;
RefPtr<GWidget> m_gwidget;
NonnullOwnPtrVector<VBProperty> m_properties;
NonnullRefPtr<VBWidgetPropertyModel> m_property_model;
Rect m_transform_origin_rect;

4
DevTools/VisualBuilder/VBWidgetRegistry.cpp
View file

@ -68,7 +68,7 @@ VBWidgetType widget_type_from_class_name(const StringView& name)
ASSERT_NOT_REACHED();
}
static ObjectPtr<GWidget> build_gwidget(VBWidgetType type, GWidget* parent)
static RefPtr<GWidget> build_gwidget(VBWidgetType type, GWidget* parent)
{
switch (type) {
case VBWidgetType::GWidget:
@ -125,7 +125,7 @@ static ObjectPtr<GWidget> build_gwidget(VBWidgetType type, GWidget* parent)
}
}
ObjectPtr<GWidget> VBWidgetRegistry::build_gwidget(VBWidget& widget, VBWidgetType type, GWidget* parent, NonnullOwnPtrVector<VBProperty>& properties)
RefPtr<GWidget> VBWidgetRegistry::build_gwidget(VBWidget& widget, VBWidgetType type, GWidget* parent, NonnullOwnPtrVector<VBProperty>& properties)
{
auto gwidget = ::build_gwidget(type, parent);
auto add_readonly_property = [&](const String& name, const GVariant& value) {

2
DevTools/VisualBuilder/VBWidgetRegistry.h
View file

@ -19,7 +19,7 @@ public:
callback((VBWidgetType)i);
}
static ObjectPtr<GWidget> build_gwidget(VBWidget&, VBWidgetType, GWidget* parent, NonnullOwnPtrVector<VBProperty>&);
static RefPtr<GWidget> build_gwidget(VBWidget&, VBWidgetType, GWidget* parent, NonnullOwnPtrVector<VBProperty>&);
};
String to_class_name(VBWidgetType);

4
DevTools/VisualBuilder/main.cpp
View file

@ -17,7 +17,7 @@
#include <stdio.h>
#include <unistd.h>
static ObjectPtr<GWindow> make_toolbox_window();
static RefPtr<GWindow> make_toolbox_window();
int main(int argc, char** argv)
{
@ -74,7 +74,7 @@ int main(int argc, char** argv)
return app.exec();
}
ObjectPtr<GWindow> make_toolbox_window()
RefPtr<GWindow> make_toolbox_window()
{
auto window = GWindow::construct();
window->set_title("Widgets");

2
Games/Minesweeper/Field.h
View file

@ -95,7 +95,7 @@ private:
GButton& m_face_button;
GLabel& m_flag_label;
GLabel& m_time_label;
ObjectPtr<CTimer> m_timer;
RefPtr<CTimer> m_timer;
int m_time_elapsed { 0 };
int m_flags_left { 0 };
Face m_face { Face::Default };

2
Libraries/LibAudio/AWavLoader.h
View file

@ -29,7 +29,7 @@ public:
private:
bool parse_header();
ObjectPtr<CFile> m_file;
RefPtr<CFile> m_file;
String m_error_string;
u32 m_sample_rate { 0 };

6
Libraries/LibCore/CEventLoop.cpp
View file

@ -29,12 +29,12 @@ HashMap<int, NonnullOwnPtr<CEventLoop::EventLoopTimer>>* CEventLoop::s_timers;
HashTable<CNotifier*>* CEventLoop::s_notifiers;
int CEventLoop::s_next_timer_id = 1;
int CEventLoop::s_wake_pipe_fds[2];
ObjectPtr<CLocalServer> CEventLoop::s_rpc_server;
RefPtr<CLocalServer> CEventLoop::s_rpc_server;
class RPCClient : public CObject {
C_OBJECT(RPCClient)
public:
explicit RPCClient(ObjectPtr<CLocalSocket> socket)
explicit RPCClient(RefPtr<CLocalSocket> socket)
: m_socket(move(socket))
{
add_child(*m_socket);
@ -123,7 +123,7 @@ public:
}
private:
ObjectPtr<CLocalSocket> m_socket;
RefPtr<CLocalSocket> m_socket;
};
CEventLoop::CEventLoop()

2
Libraries/LibCore/CEventLoop.h
View file

@ -87,5 +87,5 @@ private:
static HashTable<CNotifier*>* s_notifiers;
static ObjectPtr<CLocalServer> s_rpc_server;
static RefPtr<CLocalServer> s_rpc_server;
};

2
Libraries/LibCore/CHttpJob.h
View file

@ -27,7 +27,7 @@ private:
};
CHttpRequest m_request;
ObjectPtr<CTCPSocket> m_socket;
RefPtr<CTCPSocket> m_socket;
State m_state { State::InStatus };
int m_code { -1 };
HashMap<String, String> m_headers;

2
Libraries/LibCore/CHttpRequest.cpp
View file

@ -10,7 +10,7 @@ CHttpRequest::~CHttpRequest()
{
}
ObjectPtr<CNetworkJob> CHttpRequest::schedule()
RefPtr<CNetworkJob> CHttpRequest::schedule()
{
auto job = CHttpJob::construct(*this);
job->start();

3
Libraries/LibCore/CHttpRequest.h
View file

@ -2,7 +2,6 @@
#include <AK/String.h>
#include <AK/URL.h>
#include <LibCore/ObjectPtr.h>
class CNetworkJob;
@ -27,7 +26,7 @@ public:
String method_name() const;
ByteBuffer to_raw_request() const;
ObjectPtr<CNetworkJob> schedule();
RefPtr<CNetworkJob> schedule();
private:
URL m_url;

2
Libraries/LibCore/CLocalServer.cpp
View file

@ -39,7 +39,7 @@ bool CLocalServer::listen(const String& address)
return true;
}
ObjectPtr<CLocalSocket> CLocalServer::accept()
RefPtr<CLocalSocket> CLocalServer::accept()
{
ASSERT(m_listening);
sockaddr_un un;

4
Libraries/LibCore/CLocalServer.h
View file

@ -13,7 +13,7 @@ public:
bool is_listening() const { return m_listening; }
bool listen(const String& address);
ObjectPtr<CLocalSocket> accept();
RefPtr<CLocalSocket> accept();
Function<void()> on_ready_to_accept;
@ -22,5 +22,5 @@ private:
int m_fd { -1 };
bool m_listening { false };
ObjectPtr<CNotifier> m_notifier;
RefPtr<CNotifier> m_notifier;
};

1
Libraries/LibCore/CNotifier.h
View file

@ -2,7 +2,6 @@
#include <AK/Function.h>
#include <LibCore/CObject.h>
#include <LibCore/ObjectPtr.h>
class CNotifier : public CObject {
C_OBJECT(CNotifier)

1
Libraries/LibCore/CObject.h
View file

@ -8,7 +8,6 @@
#include <AK/String.h>
#include <AK/Vector.h>
#include <AK/Weakable.h>
#include <LibCore/ObjectPtr.h>
namespace AK {
class JsonObject;

5
Libraries/LibCore/CSocket.h
View file

@ -2,7 +2,6 @@
#include <LibCore/CIODevice.h>
#include <LibCore/CSocketAddress.h>
#include <LibCore/ObjectPtr.h>
class CNotifier;
@ -54,6 +53,6 @@ private:
bool common_connect(const struct sockaddr*, socklen_t);
Type m_type { Type::Invalid };
ObjectPtr<CNotifier> m_notifier;
ObjectPtr<CNotifier> m_read_notifier;
RefPtr<CNotifier> m_notifier;
RefPtr<CNotifier> m_read_notifier;
};

2
Libraries/LibCore/CTCPServer.cpp
View file

@ -40,7 +40,7 @@ bool CTCPServer::listen(const IPv4Address& address, u16 port)
return true;
}
ObjectPtr<CTCPSocket> CTCPServer::accept()
RefPtr<CTCPSocket> CTCPServer::accept()
{
ASSERT(m_listening);
sockaddr_in in;

4
Libraries/LibCore/CTCPServer.h
View file

@ -14,7 +14,7 @@ public:
bool is_listening() const { return m_listening; }
bool listen(const IPv4Address& address, u16 port);
ObjectPtr<CTCPSocket> accept();
RefPtr<CTCPSocket> accept();
Function<void()> on_ready_to_accept;
@ -23,5 +23,5 @@ private:
int m_fd { -1 };
bool m_listening { false };
ObjectPtr<CNotifier> m_notifier;
RefPtr<CNotifier> m_notifier;
};

1
Libraries/LibCore/CTimer.h
View file

@ -2,7 +2,6 @@
#include <AK/Function.h>
#include <LibCore/CObject.h>
#include <LibCore/ObjectPtr.h>
class CTimer final : public CObject {
C_OBJECT(CTimer)

8
Libraries/LibCore/CoreIPCClient.h
View file

@ -229,8 +229,8 @@ namespace Client {
}
}
ObjectPtr<CLocalSocket> m_connection;
ObjectPtr<CNotifier> m_notifier;
RefPtr<CLocalSocket> m_connection;
RefPtr<CNotifier> m_notifier;
Vector<IncomingMessageBundle> m_unprocessed_bundles;
int m_server_pid { -1 };
int m_my_client_id { -1 };
@ -372,8 +372,8 @@ namespace Client {
}
}
ObjectPtr<CLocalSocket> m_connection;
ObjectPtr<CNotifier> m_notifier;
RefPtr<CLocalSocket> m_connection;
RefPtr<CNotifier> m_notifier;
Vector<OwnPtr<IMessage>> m_unprocessed_messages;
int m_server_pid { -1 };
int m_my_client_id { -1 };

4
Libraries/LibCore/CoreIPCServer.h
View file

@ -203,7 +203,7 @@ namespace Server {
virtual bool handle_message(const ClientMessage&, const ByteBuffer&& = {}) = 0;
private:
ObjectPtr<CLocalSocket> m_socket;
RefPtr<CLocalSocket> m_socket;
int m_client_id { -1 };
int m_client_pid { -1 };
};
@ -311,7 +311,7 @@ namespace Server {
private:
Endpoint& m_endpoint;
ObjectPtr<CLocalSocket> m_socket;
RefPtr<CLocalSocket> m_socket;
int m_client_id { -1 };
int m_client_pid { -1 };
};

3
Libraries/LibCore/ObjectPtr.h
View file

@ -1,3 +0,0 @@
#pragma once
#define ObjectPtr RefPtr

2
Libraries/LibGUI/GAbstractButton.h
View file

@ -61,7 +61,7 @@ private:
bool m_exclusive { false };
int m_auto_repeat_interval { 0 };
ObjectPtr<CTimer> m_auto_repeat_timer;
RefPtr<CTimer> m_auto_repeat_timer;
};
template<>

2
Libraries/LibGUI/GAbstractView.h
View file

@ -52,7 +52,7 @@ protected:
bool m_editable { false };
GModelIndex m_edit_index;
ObjectPtr<GWidget> m_edit_widget;
RefPtr<GWidget> m_edit_widget;
Rect m_edit_widget_content_rect;
private:

2
Libraries/LibGUI/GApplication.cpp
View file

@ -92,7 +92,7 @@ public:
m_label->set_text(tooltip);
}
ObjectPtr<GLabel> m_label;
RefPtr<GLabel> m_label;
};
void GApplication::show_tooltip(const StringView& tooltip, const Point& screen_location)

8
Libraries/LibGUI/GComboBox.h
View file

@ -36,9 +36,9 @@ protected:
virtual void resize_event(GResizeEvent&) override;
private:
ObjectPtr<GTextEditor> m_editor;
ObjectPtr<GButton> m_open_button;
ObjectPtr<GWindow> m_list_window;
ObjectPtr<GListView> m_list_view;
RefPtr<GTextEditor> m_editor;
RefPtr<GButton> m_open_button;
RefPtr<GWindow> m_list_window;
RefPtr<GListView> m_list_view;
bool m_only_allow_values_from_model { false };
};

2
Libraries/LibGUI/GDirectoryModel.h
View file

@ -82,7 +82,7 @@ private:
HashMap<uid_t, String> m_user_names;
HashMap<gid_t, String> m_group_names;
ObjectPtr<CNotifier> m_notifier;
RefPtr<CNotifier> m_notifier;
unsigned m_thumbnail_progress { 0 };
unsigned m_thumbnail_progress_total { 0 };

10
Libraries/LibGUI/GFilePicker.h
View file

@ -42,13 +42,13 @@ private:
}
}
ObjectPtr<GTableView> m_view;
RefPtr<GTableView> m_view;
NonnullRefPtr<GDirectoryModel> m_model;
FileSystemPath m_selected_file;
ObjectPtr<GTextBox> m_filename_textbox;
ObjectPtr<GLabel> m_preview_image_label;
ObjectPtr<GLabel> m_preview_name_label;
ObjectPtr<GLabel> m_preview_geometry_label;
RefPtr<GTextBox> m_filename_textbox;
RefPtr<GLabel> m_preview_image_label;
RefPtr<GLabel> m_preview_name_label;
RefPtr<GLabel> m_preview_geometry_label;
Mode m_mode { Mode::Open };
};

6
Libraries/LibGUI/GInputBox.h
View file

@ -18,7 +18,7 @@ private:
String m_prompt;
String m_text_value;
ObjectPtr<GButton> m_ok_button;
ObjectPtr<GButton> m_cancel_button;
ObjectPtr<GTextEditor> m_text_editor;
RefPtr<GButton> m_ok_button;
RefPtr<GButton> m_cancel_button;
RefPtr<GTextEditor> m_text_editor;
};

2
Libraries/LibGUI/GMessageBox.cpp
View file

@ -62,7 +62,7 @@ void GMessageBox::build()
widget->layout()->set_margins({ 0, 15, 0, 15 });
widget->layout()->set_spacing(15);
ObjectPtr<GWidget> message_container = widget;
RefPtr<GWidget> message_container = widget;
if (m_type != Type::None) {
message_container = GWidget::construct(widget.ptr());
message_container->set_layout(make<GBoxLayout>(Orientation::Horizontal));

6
Libraries/LibGUI/GModelEditingDelegate.h
View file

@ -29,7 +29,7 @@ public:
virtual void will_begin_editing() { }
protected:
virtual ObjectPtr<GWidget> create_widget() = 0;
virtual RefPtr<GWidget> create_widget() = 0;
void commit()
{
if (on_commit)
@ -39,7 +39,7 @@ protected:
private:
RefPtr<GModel> m_model;
GModelIndex m_index;
ObjectPtr<GWidget> m_widget;
RefPtr<GWidget> m_widget;
};
class GStringModelEditingDelegate : public GModelEditingDelegate {
@ -47,7 +47,7 @@ public:
GStringModelEditingDelegate() {}
virtual ~GStringModelEditingDelegate() override {}
virtual ObjectPtr<GWidget> create_widget() override
virtual RefPtr<GWidget> create_widget() override
{
auto textbox = GTextBox::construct(nullptr);
textbox->on_return_pressed = [this] {

2
Libraries/LibGUI/GScrollBar.h
View file

@ -83,5 +83,5 @@ private:
};
AutomaticScrollingDirection m_automatic_scrolling_direction { AutomaticScrollingDirection::None };
ObjectPtr<CTimer> m_automatic_scrolling_timer;
RefPtr<CTimer> m_automatic_scrolling_timer;
};

6
Libraries/LibGUI/GScrollableWidget.h
View file

@ -53,9 +53,9 @@ protected:
private:
void update_scrollbar_ranges();
ObjectPtr<GScrollBar> m_vertical_scrollbar;
ObjectPtr<GScrollBar> m_horizontal_scrollbar;
ObjectPtr<GWidget> m_corner_widget;
RefPtr<GScrollBar> m_vertical_scrollbar;
RefPtr<GScrollBar> m_horizontal_scrollbar;
RefPtr<GWidget> m_corner_widget;
Size m_content_size;
Size m_size_occupied_by_fixed_elements;
bool m_scrollbars_enabled { true };

6
Libraries/LibGUI/GSpinBox.h
View file

@ -27,9 +27,9 @@ protected:
virtual void resize_event(GResizeEvent&) override;
private:
ObjectPtr<GTextEditor> m_editor;
ObjectPtr<GButton> m_increment_button;
ObjectPtr<GButton> m_decrement_button;
RefPtr<GTextEditor> m_editor;
RefPtr<GButton> m_increment_button;
RefPtr<GButton> m_decrement_button;
int m_min { 0 };
int m_max { 100 };

2
Libraries/LibGUI/GStackWidget.h
View file

@ -19,5 +19,5 @@ protected:
virtual void resize_event(GResizeEvent&) override;
private:
ObjectPtr<GWidget> m_active_widget;
RefPtr<GWidget> m_active_widget;
};

4
Libraries/LibGUI/GStatusBar.h
View file

@ -18,6 +18,6 @@ protected:
virtual void paint_event(GPaintEvent&) override;
private:
ObjectPtr<GLabel> m_label;
ObjectPtr<GResizeCorner> m_corner;
RefPtr<GLabel> m_label;
RefPtr<GResizeCorner> m_corner;
};

2
Libraries/LibGUI/GTabWidget.h
View file

@ -42,7 +42,7 @@ private:
Rect container_rect() const;
void update_bar();
ObjectPtr<GWidget> m_active_widget;
RefPtr<GWidget> m_active_widget;
struct TabData {
Rect rect(const Font&) const;

2
Libraries/LibGUI/GWindow.h
View file

@ -151,7 +151,7 @@ private:
RefPtr<GraphicsBitmap> m_icon;
int m_window_id { 0 };
float m_opacity_when_windowless { 1.0f };
ObjectPtr<GWidget> m_main_widget;
RefPtr<GWidget> m_main_widget;
WeakPtr<GWidget> m_focused_widget;
WeakPtr<GWidget> m_global_cursor_tracking_widget;
WeakPtr<GWidget> m_automatic_cursor_tracking_widget;

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;
};