From 070e33a46b66c69d4349343c4e77ab2a53e3855f Mon Sep 17 00:00:00 2001 From: Diadlo Date: Sun, 6 Aug 2017 16:20:55 +0300 Subject: [PATCH] refactor(group): Remove GroupWidget from Group --- src/model/group.cpp | 11 ----------- src/model/group.h | 5 ----- src/widget/widget.cpp | 1 - 3 files changed, 17 deletions(-) diff --git a/src/model/group.cpp b/src/model/group.cpp index 85229c6ce..f0224163e 100644 --- a/src/model/group.cpp +++ b/src/model/group.cpp @@ -48,7 +48,6 @@ Group::Group(int groupId, const QString& name, bool isAvGroupchat) Group::~Group() { delete chatForm; - widget->deleteLater(); } void Group::updatePeer(int peerId, QString name) @@ -135,16 +134,6 @@ GroupChatForm* Group::getChatForm() return chatForm; } -void Group::setGroupWidget(GroupWidget* widget) -{ - this->widget = widget; -} - -GroupWidget* Group::getGroupWidget() -{ - return widget; -} - QStringList Group::getPeerList() const { return peers; diff --git a/src/model/group.h b/src/model/group.h index 7d3e36c57..8da9dd86e 100644 --- a/src/model/group.h +++ b/src/model/group.h @@ -28,7 +28,6 @@ #define RETRY_PEER_INFO_INTERVAL 500 class Friend; -class GroupWidget; class GroupChatForm; class ToxPk; @@ -48,9 +47,6 @@ public: GroupChatForm* getChatForm(); - void setGroupWidget(GroupWidget* widget); - GroupWidget* getGroupWidget(); - void setEventFlag(bool f) override; bool getEventFlag() const override; @@ -70,7 +66,6 @@ signals: private: QString title; - GroupWidget* widget; GroupChatForm* chatForm; QStringList peers; QMap toxids; diff --git a/src/widget/widget.cpp b/src/widget/widget.cpp index 1b5bfd3a2..66bdfd5ac 100644 --- a/src/widget/widget.cpp +++ b/src/widget/widget.cpp @@ -1824,7 +1824,6 @@ Group* Widget::createGroup(int groupId) bool compact = Settings::getInstance().getCompactLayout(); GroupWidget* widget = new GroupWidget(groupId, groupName, compact); groupWidgets[groupId] = widget; - newgroup->setGroupWidget(widget); contactListWidget->addGroupWidget(widget); widget->updateStatusLight();