Reduce includes

src/covermanager/albumcoverchoicecontroller.cpp

@@ -28,14 +28,13 @@
 #include <QWidget>
 #include <QDialog>
 #include <QDir>
+#include <QFile>
 #include <QFileInfo>
-#include <QList>
-#include <QSet>
 #include <QMimeData>
-#include <QByteArray>
+#include <QSet>
+#include <QList>
 #include <QVariant>
 #include <QString>
-#include <QStringBuilder>
 #include <QRegExp>
 #include <QUrl>
 #include <QImage>
@@ -43,12 +42,12 @@
 #include <QPixmap>
 #include <QIcon>
 #include <QRect>
-#include <QAction>
 #include <QFileDialog>
 #include <QLabel>
+#include <QAction>
+#include <QSettings>
 #include <QtEvents>
 
-#include "core/utilities.h"
 #include "core/song.h"
 #include "core/iconloader.h"
 #include "core/application.h"

src/covermanager/albumcoverchoicecontroller.h

@@ -24,22 +24,24 @@
 
 #include "config.h"
 
-
 #include <QtGlobal>
 #include <QObject>
 #include <QWidget>
+#include <QSet>
 #include <QList>
 #include <QMap>
-#include <QSet>
 #include <QString>
+#include <QUrl>
 #include <QImage>
-#include <QAction>
-#include <QFileDialog>
-#include <QtEvents>
 
+#include "core/song.h"
 #include "settings/collectionsettingspage.h"
 
-class Song;
+class QFileDialog;
+class QAction;
+class QDragEnterEvent;
+class QDropEvent;
+
 class Application;
 class AlbumCoverFetcher;
 class AlbumCoverSearcher;

src/covermanager/albumcoverexport.h

@@ -23,12 +23,11 @@
 
 #include "config.h"
 
-
 #include <QObject>
-#include <QWidget>
 #include <QDialog>
 #include <QString>
 
+class QWidget;
 class Ui_AlbumCoverExport;
 
 // Controller for the "Export covers" dialog.

src/covermanager/albumcoverexporter.cpp

@@ -24,6 +24,7 @@
 #include <QThreadPool>
 
 #include "core/song.h"
+#include "albumcoverexport.h"
 #include "albumcoverexporter.h"
 #include "coverexportrunnable.h"
 

src/covermanager/albumcoverexporter.h

@@ -24,12 +24,12 @@
 #include "config.h"
 
 #include <QObject>
-#include <QThreadPool>
 #include <QQueue>
 #include <QString>
 
 #include "albumcoverexport.h"
 
+class QThreadPool;
 class Song;
 class CoverExportRunnable;
 

src/covermanager/albumcoverfetchersearch.cpp

@@ -24,7 +24,6 @@
 #include <cmath>
 
 #include <QObject>
-#include <QtAlgorithms>
 #include <QTimer>
 #include <QList>
 #include <QString>
@@ -37,7 +36,6 @@
 
 #include "core/closure.h"
 #include "core/logging.h"
-#include "core/network.h"
 #include "core/networktimeouts.h"
 #include "albumcoverfetcher.h"
 #include "albumcoverfetchersearch.h"

src/covermanager/albumcoverfetchersearch.h

@@ -23,19 +23,18 @@
 
 #include "config.h"
 
-
 #include <QtGlobal>
 #include <QObject>
-#include <QList>
-#include <QMap>
 #include <QPair>
+#include <QMap>
 #include <QString>
+#include <QUrl>
 #include <QImage>
-#include <QNetworkAccessManager>
 
 #include "albumcoverfetcher.h"
 #include "coversearchstatistics.h"
 
+class QNetworkAccessManager;
 class QNetworkReply;
 class CoverProvider;
 class CoverProviders;

src/covermanager/albumcoverloader.cpp

@@ -27,18 +27,16 @@
 #include <QDir>
 #include <QThread>
 #include <QMutex>
+#include <QSet>
 #include <QList>
 #include <QQueue>
-#include <QSet>
 #include <QVariant>
 #include <QString>
-#include <QStringBuilder>
 #include <QUrl>
 #include <QImage>
 #include <QPixmap>
 #include <QPainter>
 #include <QSize>
-#include <QNetworkAccessManager>
 #include <QNetworkReply>
 #include <QNetworkRequest>
 #include <QSettings>

src/covermanager/albumcoverloader.h

@@ -24,24 +24,22 @@
 
 #include "config.h"
 
-
 #include <QtGlobal>
 #include <QObject>
 #include <QMutex>
-#include <QQueue>
-#include <QMap>
 #include <QSet>
+#include <QMap>
+#include <QQueue>
 #include <QString>
 #include <QImage>
 #include <QPixmap>
-#include <QNetworkReply>
 
 #include "core/song.h"
 #include "settings/collectionsettingspage.h"
 #include "albumcoverloaderoptions.h"
 
 class QThread;
-class Song;
+class QNetworkReply;
 class NetworkAccessManager;
 
 class AlbumCoverLoader : public QObject {
@@ -117,7 +115,7 @@ class AlbumCoverLoader : public QObject {
 
   QMutex mutex_;
   QQueue<Task> tasks_;
-  QMap<QNetworkReply *, Task> remote_tasks_;
+  QMap<QNetworkReply*, Task> remote_tasks_;
   quint64 next_id_;
 
   NetworkAccessManager *network_;

src/covermanager/albumcoversearcher.cpp

@@ -20,15 +20,13 @@
 
 #include "config.h"
 
-
 #include <QWidget>
 #include <QDialog>
-#include <QStandardItem>
 #include <QStandardItemModel>
 #include <QAbstractItemModel>
 #include <QStyledItemDelegate>
 #include <QStyleOptionViewItem>
-#include <QSize>
+#include <QStandardItem>
 #include <QList>
 #include <QVariant>
 #include <QString>
@@ -41,6 +39,7 @@
 #include <QFontMetrics>
 #include <QColor>
 #include <QRect>
+#include <QSize>
 #include <QDialogButtonBox>
 #include <QPushButton>
 #include <QKeySequence>
@@ -55,6 +54,7 @@
 #include "albumcoversearcher.h"
 #include "albumcoverfetcher.h"
 #include "albumcoverloader.h"
+#include "albumcoverloaderoptions.h"
 #include "ui_albumcoversearcher.h"
 
 const int SizeOverlayDelegate::kMargin = 4;

src/covermanager/albumcoversearcher.h

@@ -25,24 +25,24 @@
 
 #include <QtGlobal>
 #include <QObject>
-#include <QWidget>
 #include <QDialog>
-#include <QStandardItem>
-#include <QStandardItemModel>
+#include <QStyleOption>
+#include <QStyledItemDelegate>
+#include <QStyleOptionViewItem>
 #include <QMap>
 #include <QString>
 #include <QImage>
 #include <QIcon>
-#include <QPainter>
-#include <QStyleOption>
-#include <QStyledItemDelegate>
-#include <QStyleOptionViewItem>
-#include <QtEvents>
 
 #include "albumcoverfetcher.h"
 #include "albumcoverloaderoptions.h"
 
+class QWidget;
+class QStandardItem;
+class QStandardItemModel;
+class QPainter;
 class QModelIndex;
+class QKeyEvent;
 
 class Application;
 class Ui_AlbumCoverSearcher;
@@ -83,7 +83,7 @@ public:
   QImage Exec(const QString &artist, const QString &album);
 
 protected:
-  void keyPressEvent(QKeyEvent *);
+  void keyPressEvent(QKeyEvent*);
 
 private slots:
   void Search();

src/covermanager/coverexportrunnable.cpp

@@ -29,6 +29,7 @@
 
 #include "core/song.h"
 #include "core/tagreaderclient.h"
+#include "albumcoverexport.h"
 #include "coverexportrunnable.h"
 
 CoverExportRunnable::CoverExportRunnable(const AlbumCoverExport::DialogResult &dialog_result, const Song &song) :

src/covermanager/coverexportrunnable.h

@@ -30,8 +30,6 @@
 #include "core/song.h"
 #include "albumcoverexport.h"
 
-class AlbumCoverExporter;
-
 class CoverExportRunnable : public QObject, public QRunnable {
   Q_OBJECT
 

src/covermanager/coverfromurldialog.h

@@ -24,11 +24,12 @@
 #include "config.h"
 
 #include <QObject>
-#include <QWidget>
 #include <QDialog>
 #include <QString>
 #include <QImage>
 
+class QWidget;
+
 class NetworkAccessManager;
 class Ui_CoverFromURLDialog;
 

src/covermanager/coverprovider.h

@@ -23,9 +23,8 @@
 
 #include "config.h"
 
-
+#include <QtGlobal>
 #include <QObject>
-#include <QList>
 #include <QString>
 
 #include "albumcoverfetcher.h"

src/covermanager/coverproviders.h

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

src/covermanager/coversearchstatistics.h

@@ -24,6 +24,7 @@
 #include "config.h"
 
 #include <QtGlobal>
+#include <QList>
 #include <QMap>
 #include <QString>
 

src/covermanager/coversearchstatisticsdialog.cpp

@@ -22,14 +22,15 @@
 
 #include <algorithm>
 
+#include <QtGlobal>
 #include <QWidget>
+#include <QList>
 #include <QMap>
 #include <QString>
 #include <QStringList>
 #include <QBoxLayout>
 #include <QLabel>
 #include <QFrame>
-#include <QtAlgorithms>
 
 #include "core/utilities.h"
 #include "coversearchstatistics.h"

src/covermanager/coversearchstatisticsdialog.h

@@ -25,9 +25,10 @@
 
 #include <QObject>
 #include <QDialog>
-#include <QWidget>
 #include <QString>
-#include <QBoxLayout>
+
+class QWidget;
+class QVBoxLayout;
 
 class Ui_CoverSearchStatisticsDialog;
 struct CoverSearchStatistics;

src/covermanager/currentalbumcoverloader.cpp

@@ -27,12 +27,12 @@
 #include <QString>
 #include <QStringBuilder>
 #include <QImage>
-#include <QStandardPaths>
 #include <QTemporaryFile>
 
 #include "core/application.h"
 #include "playlist/playlistmanager.h"
 #include "albumcoverloader.h"
+#include "albumcoverloaderoptions.h"
 #include "currentalbumcoverloader.h"
 
 CurrentAlbumCoverLoader::CurrentAlbumCoverLoader(Application *app, QObject *parent)

src/covermanager/deezercoverprovider.cpp

@@ -19,10 +19,10 @@
 
 #include "config.h"
 
-#include <algorithm>
-#include <functional>
-
+#include <QtGlobal>
 #include <QObject>
+#include <QPair>
+#include <QSet>
 #include <QList>
 #include <QVariant>
 #include <QByteArray>
@@ -36,11 +36,13 @@
 #include <QJsonValue>
 #include <QJsonObject>
 #include <QJsonArray>
+#include <QtDebug>
 
 #include "core/application.h"
 #include "core/closure.h"
 #include "core/network.h"
 #include "core/logging.h"
+#include "core/song.h"
 #include "albumcoverfetcher.h"
 #include "coverprovider.h"
 #include "deezercoverprovider.h"

src/covermanager/deezercoverprovider.h

@@ -22,19 +22,17 @@
 
 #include "config.h"
 
-
 #include <QObject>
 #include <QVariant>
 #include <QByteArray>
 #include <QString>
-#include <QNetworkAccessManager>
-#include <QNetworkReply>
 #include <QJsonValue>
 #include <QJsonObject>
-#include <QJsonArray>
 
 #include "coverprovider.h"
 
+class QNetworkAccessManager;
+class QNetworkReply;
 class Application;
 
 class DeezerCoverProvider : public CoverProvider {

src/covermanager/discogscoverprovider.cpp

@@ -21,13 +21,17 @@
 
 #include "config.h"
 
+#include <algorithm>
+#include <type_traits>
+
+#include <QtGlobal>
 #include <QObject>
 #include <QByteArray>
 #include <QList>
 #include <QPair>
+#include <QSet>
 #include <QVariant>
 #include <QString>
-#include <QStringBuilder>
 #include <QStringList>
 #include <QUrl>
 #include <QUrlQuery>
@@ -38,6 +42,7 @@
 #include <QJsonObject>
 #include <QJsonValue>
 #include <QJsonArray>
+#include <QtDebug>
 
 #include "core/application.h"
 #include "core/closure.h"

src/covermanager/discogscoverprovider.h

@@ -24,17 +24,20 @@
 
 #include "config.h"
 
-
 #include <QObject>
-#include <QHash>
 #include <QMetaType>
+#include <QHash>
+#include <QVariant>
+#include <QByteArray>
 #include <QString>
-#include <QNetworkAccessManager>
-#include <QNetworkReply>
+#include <QJsonObject>
+#include <QJsonValue>
 
 #include "coverprovider.h"
 #include "albumcoverfetcher.h"
 
+class QNetworkAccessManager;
+class QNetworkReply;
 class Application;
 
 // This struct represents a single search-for-cover request. It identifies and describes the request.

src/covermanager/lastfmcoverprovider.cpp

@@ -19,14 +19,17 @@
 
 #include "config.h"
 
+#include <QtGlobal>
 #include <QObject>
+#include <QLocale>
 #include <QList>
 #include <QPair>
+#include <QSet>
 #include <QByteArray>
 #include <QString>
-#include <QStringBuilder>
 #include <QUrl>
 #include <QUrlQuery>
+#include <QNetworkAccessManager>
 #include <QNetworkRequest>
 #include <QNetworkReply>
 #include <QCryptographicHash>
@@ -34,6 +37,7 @@
 #include <QJsonValue>
 #include <QJsonObject>
 #include <QJsonArray>
+#include <QtDebug>
 
 #include "core/application.h"
 #include "core/closure.h"

src/covermanager/lastfmcoverprovider.h

@@ -22,19 +22,17 @@
 
 #include "config.h"
 
-
 #include <QObject>
 #include <QVariant>
 #include <QByteArray>
 #include <QString>
-#include <QNetworkAccessManager>
-#include <QNetworkReply>
 #include <QJsonValue>
 #include <QJsonObject>
-#include <QJsonArray>
 
 #include "coverprovider.h"
 
+class QNetworkAccessManager;
+class QNetworkReply;
 class Application;
 
 class LastFmCoverProvider : public CoverProvider {

src/covermanager/musicbrainzcoverprovider.cpp

@@ -19,11 +19,8 @@
 
 #include "config.h"
 
-#include <algorithm>
-#include <functional>
-
+#include <QtGlobal>
 #include <QObject>
-#include <QList>
 #include <QVariant>
 #include <QByteArray>
 #include <QString>
@@ -36,6 +33,7 @@
 #include <QJsonValue>
 #include <QJsonObject>
 #include <QJsonArray>
+#include <QtDebug>
 
 #include "core/application.h"
 #include "core/closure.h"

src/covermanager/musicbrainzcoverprovider.h

@@ -22,18 +22,16 @@
 
 #include "config.h"
 
-
 #include <QObject>
 #include <QByteArray>
 #include <QVariant>
 #include <QString>
-#include <QNetworkAccessManager>
-#include <QNetworkReply>
 #include <QJsonObject>
 
 #include "coverprovider.h"
-#include "albumcoverfetcher.h"
 
+class QNetworkAccessManager;
+class QNetworkReply;
 class Application;
 
 class MusicbrainzCoverProvider : public CoverProvider {

src/covermanager/tidalcoverprovider.cpp

@@ -19,7 +19,7 @@
 
 #include "config.h"
 
-
+#include <QtGlobal>
 #include <QObject>
 #include <QList>
 #include <QVariant>
@@ -27,19 +27,21 @@
 #include <QString>
 #include <QUrl>
 #include <QUrlQuery>
+#include <QNetworkAccessManager>
 #include <QNetworkRequest>
 #include <QNetworkReply>
 #include <QJsonDocument>
 #include <QJsonValue>
 #include <QJsonObject>
 #include <QJsonArray>
+#include <QtDebug>
 
 #include "core/application.h"
 #include "core/closure.h"
 #include "core/network.h"
 #include "core/logging.h"
+#include "core/song.h"
 #include "internet/internetservices.h"
-#include "settings/tidalsettingspage.h"
 #include "tidal/tidalservice.h"
 #include "albumcoverfetcher.h"
 #include "coverprovider.h"

src/covermanager/tidalcoverprovider.h

@@ -22,18 +22,20 @@
 
 #include "config.h"
 
-
 #include <QObject>
+#include <QPair>
+#include <QSet>
+#include <QList>
 #include <QVariant>
 #include <QByteArray>
 #include <QString>
-#include <QNetworkAccessManager>
-#include <QNetworkReply>
 #include <QJsonValue>
 #include <QJsonObject>
 
 #include "coverprovider.h"
 
+class QNetworkAccessManager;
+class QNetworkReply;
 class Application;
 class TidalService;