From 62c60a89df26ac09d535e4bb1e54b719b988daca Mon Sep 17 00:00:00 2001
From: Diadlo <polsha3@gmail.com>
Date: Mon, 30 Oct 2017 21:35:54 +0300
Subject: [PATCH] refactor: Remove unused 'SettingsWidget' from 'ContentDialog'

---
 src/widget/contentdialog.cpp | 6 ++----
 src/widget/contentdialog.h   | 6 ++----
 src/widget/widget.cpp        | 2 +-
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/widget/contentdialog.cpp b/src/widget/contentdialog.cpp
index 6270dc202..3299385a4 100644
--- a/src/widget/contentdialog.cpp
+++ b/src/widget/contentdialog.cpp
@@ -39,7 +39,6 @@
 #include "src/grouplist.h"
 #include "src/persistence/settings.h"
 #include "src/widget/form/chatform.h"
-#include "src/widget/form/settingswidget.h"
 #include "src/widget/friendlistlayout.h"
 #include "src/widget/translator.h"
 #include "tool/adjustingscrollarea.h"
@@ -54,12 +53,11 @@ static const int minHeight = 220;
 static const QSize minSize(minHeight, minWidget);
 static const QSize defaultSize(720, 400);
 
-ContentDialog::ContentDialog(SettingsWidget* settingsWidget, QWidget* parent)
+ContentDialog::ContentDialog(QWidget* parent)
     : ActivateDialog(parent, Qt::Window)
     , splitter{new QSplitter(this)}
     , friendLayout{new FriendListLayout(this)}
     , activeChatroomWidget(nullptr)
-    , settingsWidget(settingsWidget)
     , videoSurfaceSize(QSize())
     , videoCount(0)
 {
@@ -684,7 +682,7 @@ void ContentDialog::keyPressEvent(QKeyEvent* event)
  */
 void ContentDialog::openNewDialog(GenericChatroomWidget* widget)
 {
-    ContentDialog* contentDialog = new ContentDialog(settingsWidget);
+    ContentDialog* contentDialog = new ContentDialog();
     contentDialog->show();
 
     if (widget->getFriend()) {
diff --git a/src/widget/contentdialog.h b/src/widget/contentdialog.h
index 187c112dc..d5ceaade9 100644
--- a/src/widget/contentdialog.h
+++ b/src/widget/contentdialog.h
@@ -38,7 +38,6 @@ class GenericChatroomWidget;
 class FriendWidget;
 class GroupWidget;
 class FriendListLayout;
-class SettingsWidget;
 class Friend;
 class Group;
 
@@ -48,8 +47,8 @@ class ContentDialog : public ActivateDialog
 {
     Q_OBJECT
 public:
-    ContentDialog(SettingsWidget* settingsWidget, QWidget* parent = 0);
-    ~ContentDialog();
+    explicit ContentDialog(QWidget* parent = nullptr);
+    ~ContentDialog() override;
 
     FriendWidget* addFriend(const Friend* f);
     GroupWidget* addGroup(int groupId, const QString& name);
@@ -126,7 +125,6 @@ private:
     GenericChatItemLayout groupLayout;
     ContentLayout* contentLayout;
     GenericChatroomWidget* activeChatroomWidget;
-    SettingsWidget* settingsWidget;
     QSize videoSurfaceSize;
     int videoCount;
 
diff --git a/src/widget/widget.cpp b/src/widget/widget.cpp
index 1a1384b82..6aaf2522e 100644
--- a/src/widget/widget.cpp
+++ b/src/widget/widget.cpp
@@ -1550,7 +1550,7 @@ void Widget::toggleFullscreen()
 
 ContentDialog* Widget::createContentDialog() const
 {
-    ContentDialog* contentDialog = new ContentDialog(settingsWidget);
+    ContentDialog* contentDialog = new ContentDialog();
     connect(contentDialog, &ContentDialog::friendDialogShown, this, &Widget::onFriendDialogShown);
     connect(contentDialog, &ContentDialog::groupDialogShown, this, &Widget::onGroupDialogShown);
     connect(Core::getInstance(), &Core::usernameSet, contentDialog, &ContentDialog::setUsername);