Remove Unnecessary Includes in Headers (#4275)

* refactor: remove unnecessary includes in headers

* fix: formatting

* chore: changelog

* fix: scrollbar

* fix: suggestions and old appbase remains

* fix: suggestion

* fix: missing Qt forward declarations

* fix: another qt include

* fix: includes for precompiled-headers=off

* Add missing `<memory>` includes

* Add missing `#pragma once`

* Fix tests

Co-authored-by: Rasmus Karlsson <rasmus.karlsson@pajlada.com>

src/widgets/settingspages/AccountsPage.hpp

@@ -1,12 +1,13 @@
 #pragma once
 
-#include "widgets/AccountSwitchWidget.hpp"
 #include "widgets/settingspages/SettingsPage.hpp"
 
 #include <QPushButton>
 
 namespace chatterino {
 
+class AccountSwitchWidget;
+
 class AccountsPage : public SettingsPage
 {
 public:

src/widgets/settingspages/CommandPage.cpp

@@ -1,9 +1,13 @@
 #include "CommandPage.hpp"
 
 #include "Application.hpp"
+#include "controllers/commands/Command.hpp"
 #include "controllers/commands/CommandController.hpp"
 #include "controllers/commands/CommandModel.hpp"
+#include "singletons/Settings.hpp"
+#include "util/CombinePath.hpp"
 #include "util/LayoutCreator.hpp"
+#include "util/Qt.hpp"
 #include "util/StandardItemHelper.hpp"
 #include "widgets/helper/EditableModelView.hpp"
 
@@ -13,12 +17,6 @@
 #include <QStandardItemModel>
 #include <QTableView>
 #include <QTextEdit>
-//#include "widgets/helper/ComboBoxItemDelegate.hpp"
-#include "util/CombinePath.hpp"
-#include "util/Qt.hpp"
-
-#include <QLabel>
-#include <QTextEdit>
 
 // clang-format off
 #define TEXT "{1} => first word &nbsp;&nbsp;&nbsp; {1+} => first word and after &nbsp;&nbsp;&nbsp; {{ => { &nbsp;&nbsp;&nbsp; <a href='https://chatterino.com/help/commands'>more info</a>"

src/widgets/settingspages/ExternalToolsPage.cpp

@@ -1,6 +1,6 @@
 #include "ExternalToolsPage.hpp"
 
-#include "Application.hpp"
+#include "singletons/Settings.hpp"
 #include "util/Helpers.hpp"
 #include "util/LayoutCreator.hpp"
 #include "util/RemoveScrollAreaBackground.hpp"

src/widgets/settingspages/FiltersPage.cpp

@@ -1,6 +1,8 @@
 #include "FiltersPage.hpp"
 
+#include "Application.hpp"
 #include "controllers/filters/FilterModel.hpp"
+#include "controllers/filters/FilterRecord.hpp"
 #include "singletons/Settings.hpp"
 #include "singletons/WindowManager.hpp"
 #include "util/LayoutCreator.hpp"

src/widgets/settingspages/FiltersPage.hpp

@@ -1,6 +1,5 @@
 #pragma once
 
-#include "widgets/helper/EditableModelView.hpp"
 #include "widgets/settingspages/SettingsPage.hpp"
 
 #include <QStringListModel>
@@ -9,6 +8,8 @@ class QVBoxLayout;
 
 namespace chatterino {
 
+class EditableModelView;
+
 class FiltersPage : public SettingsPage
 {
 public:

src/widgets/settingspages/GeneralPage.cpp

@@ -10,14 +10,13 @@
 #include "singletons/Fonts.hpp"
 #include "singletons/NativeMessaging.hpp"
 #include "singletons/Paths.hpp"
+#include "singletons/Settings.hpp"
 #include "singletons/Theme.hpp"
-#include "singletons/WindowManager.hpp"
 #include "util/FuzzyConvert.hpp"
 #include "util/Helpers.hpp"
 #include "util/IncognitoBrowser.hpp"
 #include "util/StreamerMode.hpp"
 #include "widgets/BaseWindow.hpp"
-#include "widgets/helper/Line.hpp"
 #include "widgets/settingspages/GeneralPageView.hpp"
 #include "widgets/splits/SplitInput.hpp"
 

src/widgets/settingspages/GeneralPageView.cpp

@@ -1,7 +1,6 @@
 #include "widgets/settingspages/GeneralPageView.hpp"
 
 #include "Application.hpp"
-#include "singletons/WindowManager.hpp"
 #include "util/LayoutHelper.hpp"
 #include "util/RapidJsonSerializeQString.hpp"
 #include "widgets/dialogs/ColorPickerDialog.hpp"
@@ -9,6 +8,7 @@
 #include "widgets/helper/Line.hpp"
 
 #include <QRegularExpression>
+#include <QScrollArea>
 #include <QScrollBar>
 
 namespace {

src/widgets/settingspages/HighlightingPage.cpp

@@ -2,16 +2,20 @@
 
 #include "Application.hpp"
 #include "controllers/highlights/BadgeHighlightModel.hpp"
+#include "controllers/highlights/HighlightBadge.hpp"
 #include "controllers/highlights/HighlightBlacklistModel.hpp"
+#include "controllers/highlights/HighlightBlacklistUser.hpp"
 #include "controllers/highlights/HighlightModel.hpp"
+#include "controllers/highlights/HighlightPhrase.hpp"
 #include "controllers/highlights/UserHighlightModel.hpp"
+#include "providers/colors/ColorProvider.hpp"
 #include "singletons/Settings.hpp"
 #include "singletons/Theme.hpp"
 #include "util/Helpers.hpp"
 #include "util/LayoutCreator.hpp"
-#include "util/StandardItemHelper.hpp"
 #include "widgets/dialogs/BadgePickerDialog.hpp"
 #include "widgets/dialogs/ColorPickerDialog.hpp"
+#include "widgets/helper/EditableModelView.hpp"
 
 #include <QFileDialog>
 #include <QHeaderView>

src/widgets/settingspages/HighlightingPage.hpp

@@ -1,6 +1,5 @@
 #pragma once
 
-#include "widgets/helper/EditableModelView.hpp"
 #include "widgets/settingspages/SettingsPage.hpp"
 
 #include <QAbstractTableModel>
@@ -11,6 +10,8 @@ class QListWidget;
 
 namespace chatterino {
 
+class EditableModelView;
+
 class HighlightingPage : public SettingsPage
 {
 public:

src/widgets/settingspages/IgnoresPage.cpp

@@ -4,7 +4,9 @@
 #include "controllers/accounts/AccountController.hpp"
 #include "controllers/ignores/IgnoreController.hpp"
 #include "controllers/ignores/IgnoreModel.hpp"
+#include "controllers/ignores/IgnorePhrase.hpp"
 #include "providers/twitch/TwitchAccount.hpp"
+#include "providers/twitch/TwitchUser.hpp"
 #include "singletons/Settings.hpp"
 #include "util/LayoutCreator.hpp"
 #include "widgets/helper/EditableModelView.hpp"

src/widgets/settingspages/KeyboardSettingsPage.cpp

@@ -2,14 +2,17 @@
 
 #include "Application.hpp"
 #include "common/QLogging.hpp"
+#include "controllers/hotkeys/Hotkey.hpp"
 #include "controllers/hotkeys/HotkeyController.hpp"
 #include "controllers/hotkeys/HotkeyModel.hpp"
 #include "util/LayoutCreator.hpp"
 #include "widgets/dialogs/EditHotkeyDialog.hpp"
+#include "widgets/helper/EditableModelView.hpp"
 
 #include <QFormLayout>
 #include <QHeaderView>
 #include <QLabel>
+#include <QMessageBox>
 #include <QTableView>
 
 namespace chatterino {

src/widgets/settingspages/KeyboardSettingsPage.hpp

@@ -1,11 +1,11 @@
 #pragma once
 
-#include "widgets/helper/EditableModelView.hpp"
 #include "widgets/settingspages/SettingsPage.hpp"
 
 namespace chatterino {
 
 class HotkeyModel;
+class EditableModelView;
 
 class KeyboardSettingsPage : public SettingsPage
 {

src/widgets/settingspages/ModerationPage.cpp

@@ -1,25 +1,22 @@
 #include "ModerationPage.hpp"
 
 #include "Application.hpp"
+#include "controllers/moderationactions/ModerationAction.hpp"
 #include "controllers/moderationactions/ModerationActionModel.hpp"
 #include "singletons/Logging.hpp"
 #include "singletons/Paths.hpp"
+#include "singletons/Settings.hpp"
 #include "util/Helpers.hpp"
 #include "util/LayoutCreator.hpp"
 #include "widgets/helper/EditableModelView.hpp"
 
 #include <QFileDialog>
-#include <QFormLayout>
-#include <QGroupBox>
 #include <QHBoxLayout>
 #include <QHeaderView>
 #include <QLabel>
-#include <QListView>
 #include <QPushButton>
 #include <QTableView>
 #include <QtConcurrent/QtConcurrent>
-#include <QTextEdit>
-#include <QVBoxLayout>
 
 namespace chatterino {
 

src/widgets/settingspages/NicknamesPage.cpp

@@ -1,11 +1,11 @@
 #include "NicknamesPage.hpp"
 
+#include "controllers/nicknames/Nickname.hpp"
 #include "controllers/nicknames/NicknamesModel.hpp"
 #include "singletons/Settings.hpp"
 #include "singletons/WindowManager.hpp"
 #include "util/LayoutCreator.hpp"
 #include "widgets/helper/EditableModelView.hpp"
-#include "widgets/Window.hpp"
 
 #include <QHeaderView>
 #include <QTableView>

src/widgets/settingspages/NicknamesPage.hpp

@@ -1,12 +1,7 @@
 #pragma once
 
-#include "widgets/helper/EditableModelView.hpp"
 #include "widgets/settingspages/SettingsPage.hpp"
 
-#include <QStringListModel>
-
-class QVBoxLayout;
-
 namespace chatterino {
 
 class NicknamesPage : public SettingsPage

src/widgets/settingspages/NotificationPage.hpp

@@ -2,10 +2,7 @@
 
 #include "widgets/settingspages/SettingsPage.hpp"
 
-class QPushButton;
-class QListWidget;
-
-class QVBoxLayout;
+class QComboBox;
 
 namespace chatterino {
 

src/widgets/settingspages/SettingsPage.cpp

@@ -2,10 +2,10 @@
 
 #include "Application.hpp"
 #include "singletons/WindowManager.hpp"
+#include "util/FunctionEventFilter.hpp"
+#include "util/RapidJsonSerializeQString.hpp"
 
 #include <QDebug>
-#include <QPainter>
-#include <util/FunctionEventFilter.hpp>
 
 namespace chatterino {
 

src/widgets/settingspages/SettingsPage.hpp

@@ -1,7 +1,6 @@
 #pragma once
 
-#include "singletons/Settings.hpp"
-
+#include <pajlada/settings.hpp>
 #include <pajlada/signals/signal.hpp>
 #include <QCheckBox>
 #include <QComboBox>