From 902c96ee53db6d5cbe2c21c9424c89e1e0088cb1 Mon Sep 17 00:00:00 2001 From: ouwou <26526779+ouwou@users.noreply.github.com> Date: Mon, 7 Sep 2020 00:27:41 -0400 Subject: use a singleton (oh no) instead of passing Abaddon* everywhere --- components/chatmessage.cpp | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) (limited to 'components/chatmessage.cpp') diff --git a/components/chatmessage.cpp b/components/chatmessage.cpp index d2b0dde..32ce326 100644 --- a/components/chatmessage.cpp +++ b/components/chatmessage.cpp @@ -50,13 +50,8 @@ ChatMessageContainer::ChatMessageContainer(const MessageData *data) { show(); } -void ChatMessageContainer::SetAbaddon(Abaddon *ptr) { - m_abaddon = ptr; -} - void ChatMessageContainer::Update() { - if (m_abaddon == nullptr) return; - auto &discord = m_abaddon->GetDiscordClient(); + auto &discord = Abaddon::Get().GetDiscordClient(); auto guild_id = discord.GetChannel(ChannelID)->GuildID; auto role_id = discord.GetMemberHoistedRole(guild_id, UserID, true); auto *user = discord.GetUser(UserID); @@ -94,16 +89,12 @@ ChatMessageItem::ChatMessageItem() { m_menu.show_all(); } -void ChatMessageItem::SetAbaddon(Abaddon *ptr) { - m_abaddon = ptr; -} - void ChatMessageItem::on_menu_message_delete() { - m_abaddon->ActionChatDeleteMessage(ChannelID, ID); + Abaddon::Get().ActionChatDeleteMessage(ChannelID, ID); } void ChatMessageItem::on_menu_message_edit() { - m_abaddon->ActionChatEditMessage(ChannelID, ID); + Abaddon::Get().ActionChatEditMessage(ChannelID, ID); } void ChatMessageItem::on_menu_copy_id() { @@ -125,7 +116,7 @@ void ChatMessageItem::AttachMenuHandler(Gtk::Widget *widget) { // clang-format on void ChatMessageItem::ShowMenu(const GdkEvent *event) { - auto &client = m_abaddon->GetDiscordClient(); + auto &client = Abaddon::Get().GetDiscordClient(); auto *data = client.GetMessage(ID); bool can_manage = client.GetUserData().ID == data->Author.ID; m_menu_delete_message->set_sensitive(can_manage); -- cgit v1.2.3