diff options
| author | Andreas Kling <awesomekling@gmail.com> | 2019-09-22 00:31:54 +0200 |
|---|---|---|
| committer | Andreas Kling <awesomekling@gmail.com> | 2019-09-22 00:31:54 +0200 |
| commit | d6abfbdc5a7838fdc8e20e43a5146968a8dbcd81 (patch) | |
| tree | 3a2b7d2f2c3d5e231a391f5f86ac64aaea2c49fb /Applications/IRCClient | |
| parent | bc319d9e8873734bb8e8cea3d762d7fab2ded887 (diff) | |
| download | serenity-d6abfbdc5a7838fdc8e20e43a5146968a8dbcd81.zip | |
LibCore: Remove ObjectPtr in favor of RefPtr
Now that CObject is fully ref-counted, just use RefPtr everywhere! :^)
Diffstat (limited to 'Applications/IRCClient')
| -rw-r--r-- | Applications/IRCClient/IRCAppWindow.h | 4 | ||||
| -rw-r--r-- | Applications/IRCClient/IRCClient.h | 5 | ||||
| -rw-r--r-- | Applications/IRCClient/IRCWindow.h | 4 |
3 files changed, 6 insertions, 7 deletions
diff --git a/Applications/IRCClient/IRCAppWindow.h b/Applications/IRCClient/IRCAppWindow.h index a058152b84..d990aae6f8 100644 --- a/Applications/IRCClient/IRCAppWindow.h +++ b/Applications/IRCClient/IRCAppWindow.h @@ -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; diff --git a/Applications/IRCClient/IRCClient.h b/Applications/IRCClient/IRCClient.h index 75e20e7ae1..ed89e482c2 100644 --- a/Applications/IRCClient/IRCClient.h +++ b/Applications/IRCClient/IRCClient.h @@ -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; diff --git a/Applications/IRCClient/IRCWindow.h b/Applications/IRCClient/IRCWindow.h index a23d028b9f..62c26fd681 100644 --- a/Applications/IRCClient/IRCWindow.h +++ b/Applications/IRCClient/IRCWindow.h @@ -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 }; }; |