From c5e21be0f84b9004812dbc023a8aa319f1bbf632 Mon Sep 17 00:00:00 2001
From: sudden6 <sudden6@gmx.at>
Date: Tue, 7 Jul 2020 22:07:43 +0200
Subject: [PATCH] refactor: remove getInstance() from groupchatroom.cpp

---
 src/model/chatroom/groupchatroom.cpp | 5 +++--
 src/model/chatroom/groupchatroom.h   | 4 +++-
 src/widget/widget.cpp                | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/model/chatroom/groupchatroom.cpp b/src/model/chatroom/groupchatroom.cpp
index 3c8327948..6078554cd 100644
--- a/src/model/chatroom/groupchatroom.cpp
+++ b/src/model/chatroom/groupchatroom.cpp
@@ -28,9 +28,10 @@
 #include "src/model/status.h"
 #include "src/persistence/settings.h"
 
-GroupChatroom::GroupChatroom(Group* group, IDialogsManager* dialogsManager)
+GroupChatroom::GroupChatroom(Group* group, IDialogsManager* dialogsManager, Core& _core)
     : group{group}
     , dialogsManager{dialogsManager}
+    , core{_core}
 {
 }
 
@@ -68,7 +69,7 @@ void GroupChatroom::inviteFriend(const ToxPk& pk)
     const auto canInvite = Status::isOnline(frnd->getStatus());
 
     if (canInvite) {
-        Core::getInstance()->groupInviteFriend(friendId, groupId);
+        core.groupInviteFriend(friendId, groupId);
     }
 }
 
diff --git a/src/model/chatroom/groupchatroom.h b/src/model/chatroom/groupchatroom.h
index 97b227daa..6814a5ff9 100644
--- a/src/model/chatroom/groupchatroom.h
+++ b/src/model/chatroom/groupchatroom.h
@@ -23,6 +23,7 @@
 
 #include <QObject>
 
+class Core;
 class IDialogsManager;
 class Group;
 class ToxPk;
@@ -31,7 +32,7 @@ class GroupChatroom : public QObject, public Chatroom
 {
     Q_OBJECT
 public:
-    GroupChatroom(Group* group, IDialogsManager* dialogsManager);
+    GroupChatroom(Group* group, IDialogsManager* dialogsManager, Core& _core);
 
     Contact* getContact() override;
 
@@ -50,4 +51,5 @@ public:
 private:
     Group* group{nullptr};
     IDialogsManager* dialogsManager{nullptr};
+    Core& core;
 };
diff --git a/src/widget/widget.cpp b/src/widget/widget.cpp
index 1f18a3e71..422e868e1 100644
--- a/src/widget/widget.cpp
+++ b/src/widget/widget.cpp
@@ -2068,7 +2068,7 @@ Group* Widget::createGroup(uint32_t groupnumber, const GroupId& groupId)
         });
     }
     auto dialogManager = ContentDialogManager::getInstance();
-    auto rawChatroom = new GroupChatroom(newgroup, dialogManager);
+    auto rawChatroom = new GroupChatroom(newgroup, dialogManager, *core);
     std::shared_ptr<GroupChatroom> chatroom(rawChatroom);
 
     const auto compact = settings.getCompactLayout();