Reduce includes

src/internet/internetcollectionview.cpp

@@ -21,18 +21,21 @@
 
 #include "config.h"
 
-#include <QtGlobal>
+#include <QWidget>
 #include <QTreeView>
 #include <QSortFilterProxyModel>
 #include <QAbstractItemView>
+#include <QItemSelectionModel>
 #include <QVariant>
 #include <QString>
+#include <QUrl>
 #include <QPainter>
 #include <QRect>
 #include <QFont>
 #include <QFontMetrics>
 #include <QMimeData>
 #include <QMenu>
+#include <QAction>
 #include <QtEvents>
 
 #include "core/application.h"

src/internet/internetcollectionview.h

@@ -24,21 +24,20 @@
 
 #include "config.h"
 
-
 #include <QObject>
-#include <QWidget>
+#include <QAbstractItemModel>
+#include <QAbstractItemView>
 #include <QSet>
 #include <QString>
 #include <QPixmap>
-#include <QAction>
-#include <QMenu>
-#include <QtEvents>
 
 #include "widgets/autoexpandingtreeview.h"
 #include "core/song.h"
 
+class QWidget;
+class QMenu;
+class QAction;
 class QContextMenuEvent;
-class QHelpEvent;
 class QMouseEvent;
 class QPaintEvent;
 

src/internet/internetcollectionviewcontainer.cpp

@@ -19,19 +19,16 @@
 
 #include "config.h"
 
+#include <QtGlobal>
 #include <QWidget>
-#include <QPushButton>
-#include <QLabel>
 #include <QProgressBar>
 #include <QKeyEvent>
 #include <QContextMenuEvent>
 
-#include "core/application.h"
+#include "collection/collectionfilterwidget.h"
 #include "internetcollectionview.h"
 #include "internetcollectionviewcontainer.h"
 #include "ui_internetcollectionviewcontainer.h"
-#include "collection/collectionfilterwidget.h"
-#include "internetservice.h"
 
 InternetCollectionViewContainer::InternetCollectionViewContainer(QWidget *parent) :
   QWidget(parent),

src/internet/internetcollectionviewcontainer.h

@@ -22,19 +22,21 @@
 
 #include "config.h"
 
+#include <QObject>
 #include <QWidget>
+#include <QString>
 
+#include "internetcollectionview.h"
 #include "ui_internetcollectionviewcontainer.h"
 
 class QStackedWidget;
 class QPushButton;
 class QLabel;
 class QProgressBar;
+class QContextMenuEvent;
 class Application;
-class InternetCollectionView;
 class CollectionFilterWidget;
 class InternetService;
-class Ui_InternetCollectionViewContainer;
 
 class InternetCollectionViewContainer : public QWidget {
   Q_OBJECT

src/internet/internetplaylistitem.cpp

@@ -25,6 +25,7 @@
 #include <QSettings>
 #include <QVariant>
 #include <QString>
+#include <QStringList>
 #include <QtDebug>
 
 #include "internetplaylistitem.h"

src/internet/internetplaylistitem.h

@@ -23,11 +23,11 @@
 
 #include "config.h"
 
-#include <QString>
 #include <QVariant>
 #include <QUrl>
 
 #include "core/song.h"
+#include "collection/sqlrow.h"
 #include "playlist/playlistitem.h"
 
 class InternetService;

src/internet/internetsearch.cpp

@@ -29,17 +29,16 @@
 #include <QStringList>
 #include <QStringBuilder>
 #include <QUrl>
+#include <QRegExp>
 #include <QImage>
 #include <QPixmap>
-#include <QIcon>
 #include <QPainter>
+#include <QSize>
 #include <QTimerEvent>
-#include <QSettings>
 
 #include "core/application.h"
-#include "core/logging.h"
 #include "core/song.h"
-#include "playlist/songmimedata.h"
+#include "core/mimedata.h"
 #include "covermanager/albumcoverloader.h"
 #include "internet/internetsongmimedata.h"
 #include "internetsearch.h"

src/internet/internetsearch.h

@@ -26,9 +26,13 @@
 
 #include <QtGlobal>
 #include <QObject>
+#include <QMetaType>
+#include <QSet>
+#include <QList>
 #include <QMap>
 #include <QString>
 #include <QStringList>
+#include <QUrl>
 #include <QImage>
 #include <QPixmap>
 #include <QPixmapCache>
@@ -36,6 +40,7 @@
 #include "core/song.h"
 #include "covermanager/albumcoverloaderoptions.h"
 
+class QTimerEvent;
 class Application;
 class MimeData;
 class AlbumCoverLoader;

src/internet/internetsearchitemdelegate.h

@@ -22,10 +22,12 @@
 #define INTERNETSEARCHITEMDELEGATE_H
 
 #include <QStyleOptionViewItem>
+#include <QStyleOption>
 
 #include "collection/collectionitemdelegate.h"
 
 class QPainter;
+class QModelIndex;
 class InternetSearchView;
 
 class InternetSearchItemDelegate : public CollectionItemDelegate {

src/internet/internetsearchmodel.cpp

@@ -21,16 +21,17 @@
 #include "config.h"
 
 #include <QStandardItemModel>
+#include <QSortFilterProxyModel>
 #include <QMimeData>
 #include <QList>
 #include <QSet>
 #include <QVariant>
 #include <QString>
 #include <QPixmap>
+#include <QSize>
 
 #include "core/mimedata.h"
 #include "core/iconloader.h"
-#include "core/logging.h"
 #include "internetsearch.h"
 #include "internetsearchmodel.h"
 

src/internet/internetsearchmodel.h

@@ -25,21 +25,23 @@
 
 #include <QtGlobal>
 #include <QObject>
-#include <QMimeData>
+#include <QAbstractItemModel>
 #include <QStandardItemModel>
 #include <QStandardItem>
-#include <QSortFilterProxyModel>
-#include <QMap>
 #include <QSet>
 #include <QList>
+#include <QMap>
 #include <QString>
-#include <QStringList>
 #include <QIcon>
 #include <QPixmap>
 
+#include "core/song.h"
 #include "collection/collectionmodel.h"
 #include "internetsearch.h"
 
+class QMimeData;
+class QSortFilterProxyModel;
+
 class InternetSearchModel : public QStandardItemModel {
   Q_OBJECT
 

src/internet/internetsearchsortmodel.cpp

@@ -21,10 +21,14 @@
 #include "config.h"
 
 #include <QObject>
+#include <QAbstractItemModel>
 #include <QSortFilterProxyModel>
+#include <QVariant>
 #include <QString>
 
-#include "core/logging.h"
+#include "core/song.h"
+#include "collection/collectionmodel.h"
+#include "internetsearch.h"
 #include "internetsearchmodel.h"
 #include "internetsearchsortmodel.h"
 

src/internet/internetsearchsortmodel.h

@@ -21,9 +21,11 @@
 #ifndef INTERNETSEARCHSORTMODEL_H
 #define INTERNETSEARCHSORTMODEL_H
 
-#include <QObject>
 #include <QSortFilterProxyModel>
 
+class QObject;
+class QModelIndex;
+
 class InternetSearchSortModel : public QSortFilterProxyModel {
  public:
   InternetSearchSortModel(QObject *parent = nullptr);

src/internet/internetsearchview.cpp

@@ -37,14 +37,12 @@
 #include <QtEvents>
 
 #include "core/application.h"
-#include "core/logging.h"
 #include "core/mimedata.h"
 #include "core/iconloader.h"
 #include "internet/internetsongmimedata.h"
 #include "collection/collectionfilterwidget.h"
 #include "collection/collectionmodel.h"
 #include "collection/groupbydialog.h"
-#include "playlist/songmimedata.h"
 #include "internetsearch.h"
 #include "internetsearchitemdelegate.h"
 #include "internetsearchmodel.h"

src/internet/internetsearchview.h

@@ -24,15 +24,17 @@
 
 #include "config.h"
 
+#include <QObject>
 #include <QWidget>
 #include <QMap>
 #include <QList>
 #include <QString>
 #include <QPixmap>
+#include <QScopedPointer>
 
+#include "core/song.h"
 #include "collection/collectionmodel.h"
 #include "settings/settingsdialog.h"
-#include "playlist/playlistmanager.h"
 #include "internetsearch.h"
 
 class QSortFilterProxyModel;
@@ -47,7 +49,9 @@ class QShowEvent;
 class QHideEvent;
 class QContextMenuEvent;
 
+class QModelIndex;
 class Application;
+class MimeData;
 class GroupByDialog;
 class InternetSearchModel;
 class Ui_InternetSearchView;

src/internet/internetservice.h

@@ -20,15 +20,17 @@
 #ifndef INTERNETSERVICE_H
 #define INTERNETSERVICE_H
 
+#include <QtGlobal>
 #include <QObject>
+#include <QMetaType>
 #include <QString>
 #include <QUrl>
 #include <QIcon>
-#include <QSortFilterProxyModel>
 
 #include "core/song.h"
 #include "internetsearch.h"
 
+class QSortFilterProxyModel;
 class Application;
 class CollectionBackend;
 class CollectionModel;

src/internet/internetservices.h

@@ -25,7 +25,9 @@
 #include "config.h"
 
 #include <QObject>
+#include <QList>
 #include <QMap>
+#include <QString>
 
 #include "core/song.h"
 

src/internet/internetsongsview.cpp

@@ -25,12 +25,17 @@
 #include <QStackedWidget>
 #include <QContextMenuEvent>
 #include <QSortFilterProxyModel>
+#include <QLabel>
+#include <QProgressBar>
+#include <QPushButton>
 
 #include "core/application.h"
 #include "collection/collectionbackend.h"
+#include "collection/collectionmodel.h"
 #include "collection/collectionfilterwidget.h"
 #include "internetservice.h"
 #include "internetsongsview.h"
+#include "internetcollectionview.h"
 #include "ui_internetcollectionviewcontainer.h"
 
 InternetSongsView::InternetSongsView(Application *app, InternetService *service, const QString &settings_group, const SettingsDialog::Page settings_page, QWidget *parent)

src/internet/internetsongsview.h

@@ -22,19 +22,18 @@
 
 #include "config.h"
 
+#include <QObject>
 #include <QWidget>
 #include <QString>
 
-#include "settings/settingsdialog.h"
-#include "internetcollectionviewcontainer.h"
-#include "ui_internetcollectionviewcontainer.h"
 #include "core/song.h"
+#include "settings/settingsdialog.h"
+#include "ui_internetcollectionviewcontainer.h"
 
 class QContextMenuEvent;
 
 class Application;
 class InternetService;
-class Ui_InternetCollectionViewContainer;
 class InternetCollectionView;
 
 class InternetSongsView : public QWidget {

src/internet/internettabsview.cpp

@@ -21,16 +21,26 @@
 
 #include <QtGlobal>
 #include <QWidget>
+#include <QVariant>
 #include <QString>
+#include <QLabel>
+#include <QProgressBar>
+#include <QPushButton>
+#include <QSortFilterProxyModel>
+#include <QTabWidget>
 #include <QStackedWidget>
 #include <QContextMenuEvent>
 #include <QSettings>
 
 #include "core/application.h"
 #include "collection/collectionbackend.h"
+#include "collection/collectionmodel.h"
 #include "collection/collectionfilterwidget.h"
 #include "internetservice.h"
 #include "internettabsview.h"
+#include "internetcollectionview.h"
+#include "internetcollectionviewcontainer.h"
+#include "internetsearchview.h"
 #include "ui_internettabsview.h"
 
 InternetTabsView::InternetTabsView(Application *app, InternetService *service, InternetSearch *engine, const QString &settings_group, const SettingsDialog::Page settings_page, QWidget *parent)

src/internet/internettabsview.h

@@ -22,12 +22,12 @@
 
 #include "config.h"
 
+#include <QObject>
 #include <QWidget>
 #include <QString>
 
 #include "settings/settingsdialog.h"
 #include "internetcollectionviewcontainer.h"
-#include "internetcollectionview.h"
 #include "ui_internettabsview.h"
 #include "core/song.h"
 
@@ -36,7 +36,6 @@ class QContextMenuEvent;
 class Application;
 class InternetService;
 class InternetSearch;
-class Ui_InternetTabsView;
 class InternetCollectionView;
 class InternetSearchView;
 

src/internet/localredirectserver.cpp

@@ -29,23 +29,26 @@
 #include <QIODevice>
 #include <QBuffer>
 #include <QFile>
-#include <QRegExp>
-#include <QStyle>
-#include <QSslKey>
-#include <QSslCertificate>
-#include <QTcpServer>
-#include <QAbstractSocket>
-#include <QTcpSocket>
-#include <QSslSocket>
 #include <QList>
 #include <QByteArray>
 #include <QString>
 #include <QUrl>
+#include <QIcon>
+#include <QImage>
+#include <QPixmap>
+#include <QRegExp>
+#include <QStyle>
+#include <QHostAddress>
+#include <QSsl>
+#include <QSslKey>
+#include <QSslCertificate>
+#include <QSslError>
+#include <QTcpServer>
+#include <QAbstractSocket>
+#include <QTcpSocket>
+#include <QSslSocket>
 #include <QDateTime>
 
-#include "core/logging.h"
-#include "core/closure.h"
-
 LocalRedirectServer::LocalRedirectServer(const bool https, QObject *parent)
     : QTcpServer(parent),
       https_(https),

src/internet/localredirectserver.h

@@ -22,16 +22,17 @@
 #ifndef LOCALREDIRECTSERVER_H
 #define LOCALREDIRECTSERVER_H
 
+#include <QtGlobal>
 #include <QByteArray>
 #include <QObject>
-#include <QSslCertificate>
-#include <QSslKey>
-#include <QTcpServer>
-#include <QAbstractSocket>
-#include <QTcpSocket>
-#include <QSslSocket>
+#include <QList>
 #include <QString>
 #include <QUrl>
+#include <QTcpServer>
+#include <QSslCertificate>
+#include <QSslKey>
+
+class QAbstractSocket;
 
 class LocalRedirectServer : public QTcpServer {
   Q_OBJECT