From 7772f245f62176f0ff9e0fc96033e1f0add60502 Mon Sep 17 00:00:00 2001
From: Rasmus Karlsson <rasmus.karlsson@pajlada.com>
Date: Fri, 12 Jan 2018 23:33:04 +0100
Subject: [PATCH] refactor the refactor

---
 src/widgets/helper/settingsdialogtab.cpp   |  1 +
 src/widgets/settingsdialog.cpp             | 25 +----------------
 src/widgets/settingsdialog.hpp             | 32 ++++++++--------------
 src/widgets/settingspages/settingspage.cpp |  1 +
 src/widgets/settingspages/settingspage.hpp |  1 +
 5 files changed, 15 insertions(+), 45 deletions(-)

diff --git a/src/widgets/helper/settingsdialogtab.cpp b/src/widgets/helper/settingsdialogtab.cpp
index 887c86de7..43006af40 100644
--- a/src/widgets/helper/settingsdialogtab.cpp
+++ b/src/widgets/helper/settingsdialogtab.cpp
@@ -1,5 +1,6 @@
 #include "widgets/helper/settingsdialogtab.hpp"
 #include "widgets/settingsdialog.hpp"
+#include "widgets/settingspages/settingspage.hpp"
 
 #include <QPainter>
 #include <QStyleOption>
diff --git a/src/widgets/settingsdialog.cpp b/src/widgets/settingsdialog.cpp
index 28b9ece98..cb7f1dea4 100644
--- a/src/widgets/settingsdialog.cpp
+++ b/src/widgets/settingsdialog.cpp
@@ -1,14 +1,6 @@
 #include "widgets/settingsdialog.hpp"
-#include "const.hpp"
-#include "debug/log.hpp"
-#include "singletons/accountmanager.hpp"
-#include "singletons/commandmanager.hpp"
-#include "singletons/windowmanager.hpp"
-#include "twitch/twitchmessagebuilder.hpp"
-#include "twitch/twitchuser.hpp"
 #include "util/layoutcreator.hpp"
 #include "widgets/helper/settingsdialogtab.hpp"
-#include "widgets/logindialog.hpp"
 #include "widgets/settingspages/aboutpage.hpp"
 #include "widgets/settingspages/accountspage.hpp"
 #include "widgets/settingspages/appearancepage.hpp"
@@ -19,22 +11,7 @@
 #include "widgets/settingspages/logspage.hpp"
 #include "widgets/settingspages/moderationpage.hpp"
 
-#include <QComboBox>
-#include <QDebug>
-#include <QFile>
-#include <QFileDialog>
-#include <QFont>
-#include <QFontDialog>
-#include <QFormLayout>
-#include <QGraphicsScene>
-#include <QGraphicsView>
-#include <QGroupBox>
-#include <QLabel>
-#include <QListWidget>
-#include <QPalette>
-#include <QResource>
-#include <QTextEdit>
-#include <QtSvg>
+#include <QDialogButtonBox>
 
 namespace chatterino {
 namespace widgets {
diff --git a/src/widgets/settingsdialog.hpp b/src/widgets/settingsdialog.hpp
index b06ea4f15..7bcd196f4 100644
--- a/src/widgets/settingsdialog.hpp
+++ b/src/widgets/settingsdialog.hpp
@@ -1,41 +1,27 @@
 #pragma once
 
-#include "singletons/settingsmanager.hpp"
-#include "widgets/accountswitchwidget.hpp"
-#include "widgets/helper/settingsdialogtab.hpp"
-#include "widgets/settingspages/appearancepage.hpp"
+#include "basewidget.hpp"
 
-#include <QButtonGroup>
-#include <QCheckBox>
-#include <QComboBox>
-#include <QDialogButtonBox>
-#include <QHBoxLayout>
-#include <QListView>
-#include <QListWidget>
-#include <QMainWindow>
 #include <QPushButton>
 #include <QStackedLayout>
-#include <QTimer>
 #include <QVBoxLayout>
 #include <QWidget>
 #include <pajlada/settings/setting.hpp>
 
-#include "basewidget.hpp"
-
 namespace chatterino {
-
 namespace widgets {
 
+namespace settingspages {
+class SettingsPage;
+}
+
+class SettingsDialogTab;
+
 class SettingsDialog : public BaseWidget
 {
 public:
     SettingsDialog();
 
-    void select(SettingsDialogTab *tab);
-
-    friend class SettingsDialogTab;
-
-public:
     static SettingsDialog *getHandle();  // may be NULL
 
     enum class PreferredTab {
@@ -66,11 +52,15 @@ private:
     void addTabs();
     void addTab(settingspages::SettingsPage *page, Qt::Alignment alignment = Qt::AlignTop);
 
+    void select(SettingsDialogTab *tab);
+
     SettingsDialogTab *selectedTab = nullptr;
 
     void okButtonClicked();
     void cancelButtonClicked();
 
+    friend class SettingsDialogTab;
+
     //    static void setChildrensFont(QLayout *object, QFont &font, int indent = 0);
 };
 
diff --git a/src/widgets/settingspages/settingspage.cpp b/src/widgets/settingspages/settingspage.cpp
index 7049b9616..10e6d6197 100644
--- a/src/widgets/settingspages/settingspage.cpp
+++ b/src/widgets/settingspages/settingspage.cpp
@@ -73,6 +73,7 @@ QLineEdit *SettingsPage::createLineEdit(pajlada::Settings::Setting<QString> &set
 
     return edit;
 }
+
 }  // namespace settingspages
 }  // namespace widgets
 }  // namespace chatterino
diff --git a/src/widgets/settingspages/settingspage.hpp b/src/widgets/settingspages/settingspage.hpp
index 4926f0638..623bd3d8d 100644
--- a/src/widgets/settingspages/settingspage.hpp
+++ b/src/widgets/settingspages/settingspage.hpp
@@ -32,6 +32,7 @@ protected:
     pajlada::Signals::NoArgSignal onCancel;
     std::vector<pajlada::Signals::ScopedConnection> managedConnections;
 };
+
 }  // namespace settingspages
 }  // namespace widgets
 }  // namespace chatterino