Reduce includes

src/settings/appearancesettingspage.cpp

@@ -32,13 +32,16 @@
 #include <QPushButton>
 #include <QRadioButton>
 #include <QSlider>
+#include <QBoxLayout>
+#include <QCheckBox>
+#include <QComboBox>
+#include <QSpinBox>
 #include <QSettings>
 
 #include "appearancesettingspage.h"
 #include "core/appearance.h"
 #include "core/iconloader.h"
 #include "core/stylehelper.h"
-#include "playlist/playlistview.h"
 #include "covermanager/albumcoverchoicecontroller.h"
 #include "settingspage.h"
 #include "settingsdialog.h"

src/settings/appearancesettingspage.h

@@ -24,14 +24,14 @@
 
 #include "config.h"
 
-
 #include <QObject>
-#include <QWidget>
 #include <QString>
 #include <QColor>
 
 #include "settingspage.h"
 
+class QWidget;
+
 class SettingsDialog;
 class Ui_AppearanceSettingsPage;
 

src/settings/backendsettingspage.cpp

@@ -20,18 +20,23 @@
 #include "config.h"
 
 #include <QtGlobal>
+#include <QWidget>
 #include <QSettings>
+#include <QList>
 #include <QVariant>
 #include <QString>
-#include <QStringBuilder>
+#include <QStringList>
+#include <QRegExp>
 #include <QFontMetrics>
+#include <QAbstractItemView>
+#include <QListView>
 #include <QGroupBox>
 #include <QCheckBox>
 #include <QComboBox>
 #include <QSlider>
 #include <QSpinBox>
 #include <QLabel>
-#include <QListView>
+#include <QRadioButton>
 
 #include "backendsettingspage.h"
 

src/settings/backendsettingspage.h

@@ -22,7 +22,6 @@
 
 #include "config.h"
 
-
 #include <QObject>
 #include <QVariant>
 #include <QString>
@@ -31,11 +30,10 @@
 #include "engine/enginetype.h"
 #include "dialogs/errordialog.h"
 #include "settingspage.h"
-#include "settingsdialog.h"
 
 #include "core/application.h"
 #include "core/player.h"
-#include "engine/enginebase.h"
+#include "engine/engine_fwd.h"
 
 class SettingsDialog;
 class Ui_BackendSettingsPage;

src/settings/behavioursettingspage.cpp

@@ -20,9 +20,13 @@
 
 #include "config.h"
 
+#include <algorithm>
+
+#include <QList>
 #include <QVariant>
 #include <QString>
 #include <QStringList>
+#include <QRegExp>
 #include <QDir>
 #include <QLocale>
 #include <QSettings>
@@ -30,6 +34,8 @@
 #include <QCheckBox>
 #include <QRadioButton>
 #include <QSpinBox>
+#include <QComboBox>
+#include <QGroupBox>
 
 #include "core/iconloader.h"
 #include "core/mainwindow.h"

src/settings/behavioursettingspage.h

@@ -23,7 +23,6 @@
 
 #include "config.h"
 
-
 #include <QObject>
 #include <QMap>
 #include <QString>

src/settings/collectionsettingspage.cpp

@@ -32,6 +32,11 @@
 #include <QLineEdit>
 #include <QListView>
 #include <QPushButton>
+#include <QComboBox>
+#include <QGroupBox>
+#include <QLabel>
+#include <QRadioButton>
+#include <QSpinBox>
 #include <QSettings>
 
 #include "core/application.h"

src/settings/collectionsettingspage.h

@@ -25,9 +25,12 @@
 #include "config.h"
 
 #include <QObject>
+#include <QString>
+#include <QStringList>
 
 #include "settingspage.h"
 
+class QModelIndex;
 class SettingsDialog;
 class Ui_CollectionSettingsPage;
 

src/settings/contextsettingspage.cpp

@@ -24,17 +24,12 @@
 #include <QtGlobal>
 #include <QAction>
 #include <QVariant>
-#include <QImage>
 #include <QMenu>
 #include <QCursor>
-#include <QGroupBox>
-#include <QLabel>
 #include <QCheckBox>
-#include <QPushButton>
-#include <QSpinBox>
 #include <QToolButton>
 #include <QToolTip>
-#include <QtEvents>
+#include <QLineEdit>
 #include <QSettings>
 
 #include "core/iconloader.h"

src/settings/contextsettingspage.h

@@ -26,13 +26,12 @@
 
 #include <QObject>
 #include <QString>
-#include <QAction>
-#include <QtEvents>
-#include <QCheckBox>
-#include <QLabel>
 
 #include "settingspage.h"
 
+class QAction;
+class QCheckBox;
+
 class SettingsDialog;
 class Ui_ContextSettingsPage;
 

src/settings/moodbarsettingspage.cpp

@@ -22,17 +22,20 @@
 
 #include <QIODevice>
 #include <QFile>
+#include <QVariant>
 #include <QByteArray>
 #include <QPixmap>
 #include <QPainter>
 #include <QSettings>
+#include <QCheckBox>
+#include <QComboBox>
+#include <QSize>
 
-#include "core/application.h"
-#include "core/mainwindow.h"
 #include "core/iconloader.h"
 #include "core/logging.h"
 
 #include "settingsdialog.h"
+#include "settingspage.h"
 
 #ifdef HAVE_MOODBAR
 #  include "moodbar/moodbarrenderer.h"

src/settings/moodbarsettingspage.h

@@ -24,7 +24,9 @@
 #include "settingspage.h"
 
 #include <QObject>
+#include <QString>
 
+class SettingsDialog;
 class Ui_MoodbarSettingsPage;
 
 class MoodbarSettingsPage : public SettingsPage {

src/settings/networkproxysettingspage.cpp

@@ -20,7 +20,6 @@
 
 #include "config.h"
 
-
 #include <QVariant>
 #include <QSettings>
 #include <QNetworkProxy>

src/settings/notificationssettingspage.cpp

@@ -25,6 +25,7 @@
 #include <QVariant>
 #include <QImage>
 #include <QColor>
+#include <QRgb>
 #include <QMenu>
 #include <QFont>
 #include <QFontDialog>

src/settings/notificationssettingspage.h

@@ -25,11 +25,10 @@
 
 #include <QObject>
 #include <QString>
-#include <QAction>
-#include <QtEvents>
 
 #include "settingspage.h"
 
+class QAction;
 class QHideEvent;
 class QShowEvent;
 

src/settings/playlistsettingspage.cpp

@@ -24,11 +24,9 @@
 #include <QVariant>
 #include <QSettings>
 #include <QCheckBox>
-#include <QComboBox>
 #include <QRadioButton>
 
 #include "core/iconloader.h"
-#include "core/mainwindow.h"
 #include "playlist/playlist.h"
 #include "settingspage.h"
 #include "playlistsettingspage.h"

src/settings/qobuzsettingspage.cpp

@@ -20,18 +20,26 @@
 #include "config.h"
 
 #include <QObject>
+#include <QVariant>
+#include <QByteArray>
 #include <QString>
 #include <QSettings>
 #include <QMessageBox>
+#include <QCheckBox>
+#include <QComboBox>
+#include <QLineEdit>
+#include <QPushButton>
+#include <QSpinBox>
 #include <QEvent>
 
+#include "settingsdialog.h"
 #include "qobuzsettingspage.h"
 #include "ui_qobuzsettingspage.h"
 #include "core/application.h"
 #include "core/iconloader.h"
+#include "widgets/loginstatewidget.h"
 #include "internet/internetservices.h"
 #include "qobuz/qobuzservice.h"
-#include "qobuz/qobuzstreamurlrequest.h"
 
 const char *QobuzSettingsPage::kSettingsGroup = "Qobuz";
 

src/settings/qobuzsettingspage.h

@@ -22,10 +22,11 @@
 
 #include <QObject>
 #include <QString>
-#include <QEvent>
 
 #include "settings/settingspage.h"
 
+class QEvent;
+class SettingsDialog;
 class QobuzService;
 class Ui_QobuzSettingsPage;
 

src/settings/scrobblersettingspage.cpp

@@ -23,12 +23,19 @@
 #include <QObject>
 #include <QMessageBox>
 #include <QSettings>
+#include <QCheckBox>
+#include <QLabel>
+#include <QLineEdit>
+#include <QPushButton>
+#include <QSpinBox>
 
+#include "settingsdialog.h"
+#include "settingspage.h"
 #include "core/application.h"
 #include "core/iconloader.h"
+#include "widgets/loginstatewidget.h"
 
 #include "scrobbler/audioscrobbler.h"
-#include "scrobbler/scrobblerservice.h"
 #include "scrobbler/lastfmscrobbler.h"
 #include "scrobbler/librefmscrobbler.h"
 #include "scrobbler/listenbrainzscrobbler.h"

src/settings/scrobblersettingspage.h

@@ -25,6 +25,7 @@
 #include <QObject>
 #include <QString>
 
+class SettingsDialog;
 class Ui_ScrobblerSettingsPage;
 class AudioScrobbler;
 class LastFMScrobbler;

src/settings/settingsdialog.cpp

@@ -20,13 +20,18 @@
 
 #include "config.h"
 
+#include <QtGlobal>
 #include <QDialog>
+#include <QWidget>
 #include <QScreen>
 #include <QWindow>
 #include <QAbstractItemModel>
 #include <QAbstractItemView>
 #include <QTreeWidget>
+#include <QList>
+#include <QVariant>
 #include <QString>
+#include <QIcon>
 #include <QPainter>
 #include <QFrame>
 #include <QKeySequence>
@@ -36,11 +41,13 @@
 #include <QScrollArea>
 #include <QComboBox>
 #include <QPushButton>
+#include <QLabel>
+#include <QLayout>
+#include <QStackedWidget>
+#include <QSettings>
 
 #include "core/application.h"
 #include "core/player.h"
-#include "core/logging.h"
-#include "engine/enginebase.h"
 #include "widgets/groupediconview.h"
 #include "collection/collectionmodel.h"
 

src/settings/settingsdialog.h

@@ -23,22 +23,26 @@
 
 #include "config.h"
 
+#include <QObject>
 #include <QDialog>
 #include <QStyledItemDelegate>
+#include <QStyleOptionViewItem>
+#include <QStyleOption>
 #include <QMap>
 #include <QSize>
 #include <QString>
-#include <QPainter>
 #include <QSettings>
 
-#include "core/logging.h"
+#include "engine/engine_fwd.h"
 #include "widgets/osd.h"
 
+class QWidget;
+class QModelIndex;
+class QPainter;
 class QTreeWidgetItem;
 class QComboBox;
 class QScrollArea;
 class QAbstractButton;
-class QStyleOptionViewItem;
 class QShowEvent;
 
 class Application;

src/settings/shortcutssettingspage.cpp

@@ -21,8 +21,8 @@
 
 #include "config.h"
 
-#include <QtGlobal>
 #include <QWidget>
+#include <QList>
 #include <QVariant>
 #include <QStringList>
 #include <QAction>
@@ -37,8 +37,10 @@
 #include <QGroupBox>
 #include <QPushButton>
 #include <QRadioButton>
+#include <QLabel>
 
 #include "core/iconloader.h"
+#include "core/logging.h"
 #include "core/utilities.h"
 #ifdef Q_OS_MACOS
 #  include "core/mac_utilities.h"

src/settings/shortcutssettingspage.h

@@ -26,17 +26,16 @@
 
 #include <memory>
 
-#include <QtGlobal>
 #include <QObject>
 #include <QSettings>
 #include <QMap>
 #include <QString>
 #include <QKeySequence>
-#include <QTreeWidgetItem>
 
 #include "globalshortcuts/globalshortcuts.h"
 #include "settingspage.h"
 
+class QTreeWidgetItem;
 class GlobalShortcutGrabber;
 class SettingsDialog;
 class Ui_GlobalShortcutsSettingsPage;
@@ -66,7 +65,7 @@ class GlobalShortcutsSettingsPage : public SettingsPage {
 #endif
 #endif
 
-  void ItemClicked(QTreeWidgetItem *);
+  void ItemClicked(QTreeWidgetItem*);
   void NoneClicked();
   void DefaultClicked();
   void ChangeClicked();

src/settings/subsonicsettingspage.cpp

@@ -20,11 +20,18 @@
 #include "config.h"
 
 #include <QObject>
+#include <QVariant>
+#include <QByteArray>
 #include <QString>
+#include <QUrl>
 #include <QSettings>
+#include <QCheckBox>
+#include <QLineEdit>
+#include <QPushButton>
 #include <QMessageBox>
 #include <QEvent>
 
+#include "settingsdialog.h"
 #include "subsonicsettingspage.h"
 #include "ui_subsonicsettingspage.h"
 #include "core/application.h"

src/settings/subsonicsettingspage.h

@@ -22,10 +22,12 @@
 
 #include <QObject>
 #include <QString>
-#include <QEvent>
+#include <QUrl>
 
 #include "settings/settingspage.h"
 
+class QEvent;
+class SettingsDialog;
 class SubsonicService;
 class Ui_SubsonicSettingsPage;
 

src/settings/tidalsettingspage.cpp

@@ -20,18 +20,26 @@
 #include "config.h"
 
 #include <QObject>
+#include <QVariant>
+#include <QByteArray>
 #include <QString>
 #include <QSettings>
+#include <QCheckBox>
+#include <QComboBox>
+#include <QLineEdit>
+#include <QPushButton>
+#include <QSpinBox>
 #include <QMessageBox>
 #include <QEvent>
 
+#include "settingsdialog.h"
 #include "tidalsettingspage.h"
 #include "ui_tidalsettingspage.h"
 #include "core/application.h"
 #include "core/iconloader.h"
 #include "internet/internetservices.h"
 #include "tidal/tidalservice.h"
-#include "tidal/tidalstreamurlrequest.h"
+#include "widgets/loginstatewidget.h"
 
 const char *TidalSettingsPage::kSettingsGroup = "Tidal";
 

src/settings/tidalsettingspage.h

@@ -22,11 +22,12 @@
 
 #include <QObject>
 #include <QString>
-#include <QEvent>
 
 #include "settings/settingspage.h"
 
+class QEvent;
 class TidalService;
+class SettingsDialog;
 class Ui_TidalSettingsPage;
 
 class TidalSettingsPage : public SettingsPage {