Reduce includes

src/context/contextalbumsmodel.cpp

@@ -26,7 +26,6 @@
 
 #include <QObject>
 #include <QtGlobal>
-#include <QtAlgorithms>
 #include <QMutex>
 #include <QMimeData>
 #include <QVariant>
@@ -38,14 +37,10 @@
 #include <QUrl>
 #include <QImage>
 #include <QPixmapCache>
-#include <QSettings>
-#include <QtDebug>
 
 #include "core/application.h"
-#include "core/closure.h"
 #include "core/database.h"
 #include "core/iconloader.h"
-#include "core/logging.h"
 #include "collection/collectionquery.h"
 #include "collection/collectionbackend.h"
 #include "collection/collectionitem.h"

src/context/contextalbumsmodel.h

@@ -24,22 +24,20 @@
 
 #include "config.h"
 
-
 #include <QtGlobal>
 #include <QObject>
 #include <QAbstractItemModel>
-#include <QList>
-#include <QMap>
 #include <QPair>
 #include <QSet>
+#include <QList>
+#include <QMap>
 #include <QVariant>
 #include <QString>
 #include <QStringList>
 #include <QUrl>
 #include <QImage>
-#include <QIcon>
 #include <QPixmap>
-#include <QSettings>
+#include <QIcon>
 
 #include "core/simpletreemodel.h"
 #include "core/song.h"

src/context/contextalbumsview.cpp

@@ -24,47 +24,30 @@
 #include <qcoreevent.h>
 
 #include <QtGlobal>
-#include <QWidget>
+#include <QTreeView>
 #include <QItemSelectionModel>
 #include <QSortFilterProxyModel>
 #include <QAbstractItemView>
 #include <QStyleOptionViewItem>
-#include <QAction>
+#include <QAbstractScrollArea>
+#include <QMimeData>
+#include <QList>
 #include <QVariant>
 #include <QString>
 #include <QUrl>
-#include <QList>
 #include <QLocale>
-#include <QMap>
 #include <QMessageBox>
 #include <QMenu>
-#include <QMimeData>
-#include <QPainter>
-#include <QPalette>
-#include <QPen>
-#include <QPoint>
+#include <QAction>
 #include <QRect>
-#include <QSet>
 #include <QSize>
 #include <QToolTip>
-#include <QTreeView>
-#include <QHeaderView>
 #include <QWhatsThis>
-#include <QBrush>
-#include <QColor>
-#include <QFont>
-#include <QFontMetrics>
-#include <QPixmap>
-#include <QIcon>
-#include <QLinearGradient>
-#include <QSettings>
-#include <QtEvents>
 
 #include "core/application.h"
 #include "core/iconloader.h"
 #include "core/mimedata.h"
 #include "core/utilities.h"
-#include "collection/collectionbackend.h"
 #include "collection/collectiondirectorymodel.h"
 #include "collection/collectionmodel.h"
 #include "collection/collectionitem.h"
@@ -74,9 +57,7 @@
 #endif
 #include "dialogs/edittagdialog.h"
 #include "organise/organisedialog.h"
-#include "settings/collectionsettingspage.h"
 
-#include "contextview.h"
 #include "contextalbumsmodel.h"
 #include "contextalbumsview.h"
 

src/context/contextalbumsview.h

@@ -27,23 +27,24 @@
 #include <memory>
 
 #include <QObject>
-#include <QWidget>
 #include <QAbstractItemModel>
 #include <QAbstractItemView>
-#include <QString>
-#include <QPixmap>
-#include <QPainter>
-#include <QSet>
-#include <QStyleOption>
 #include <QStyledItemDelegate>
-#include <QStyleOptionViewItem>
-#include <QAction>
-#include <QMenu>
-#include <QtEvents>
+#include <QStyleOption>
+#include <QSet>
+#include <QString>
 
 #include "core/song.h"
 #include "widgets/autoexpandingtreeview.h"
 
+class QWidget;
+class QMenu;
+class QAction;
+class QContextMenuEvent;
+class QHelpEvent;
+class QMouseEvent;
+class QPaintEvent;
+
 class Application;
 class EditTagDialog;
 class OrganiseDialog;

src/context/contextview.cpp

@@ -22,28 +22,32 @@
 #include <QtGlobal>
 #include <QObject>
 #include <QWidget>
-#include <QIODevice>
-#include <QFile>
 #include <QByteArray>
 #include <QList>
 #include <QVariant>
 #include <QString>
+#include <QUrl>
 #include <QImage>
 #include <QPixmap>
+#include <QIcon>
 #include <QMovie>
-#include <QAction>
 #include <QPainter>
 #include <QPalette>
 #include <QBrush>
+#include <QSize>
 #include <QMenu>
+#include <QAction>
 #include <QSettings>
 #include <QSizePolicy>
 #include <QTimeLine>
 #include <QtEvents>
 #include <QFontDatabase>
+#include <QLabel>
+#include <QLayoutItem>
+#include <QGridLayout>
+#include <QStackedWidget>
 
 #include "core/application.h"
-#include "core/logging.h"
 #include "core/player.h"
 #include "core/song.h"
 #include "core/utilities.h"
@@ -53,20 +57,17 @@
 #include "engine/enginetype.h"
 #include "engine/devicefinders.h"
 #include "engine/devicefinder.h"
-#include "collection/collection.h"
 #include "collection/collectionbackend.h"
 #include "collection/collectionquery.h"
-#include "collection/collectionmodel.h"
 #include "collection/collectionview.h"
 #include "covermanager/albumcoverchoicecontroller.h"
 #include "covermanager/albumcoverloader.h"
-#include "covermanager/currentalbumcoverloader.h"
 #include "lyrics/lyricsfetcher.h"
 #include "settings/contextsettingspage.h"
-#include "widgets/osd.h"
 
 #include "contextview.h"
 #include "contextalbumsmodel.h"
+#include "contextalbumsview.h"
 #include "ui_contextviewcontainer.h"
 
 using std::unique_ptr;

src/context/contextview.h

@@ -30,13 +30,7 @@
 #include <QString>
 #include <QImage>
 #include <QPixmap>
-#include <QPainter>
 #include <QMovie>
-#include <QTimeLine>
-#include <QAction>
-#include <QMenu>
-#include <QLabel>
-#include <QtEvents>
 
 #include "core/song.h"
 #include "covermanager/albumcoverloaderoptions.h"
@@ -45,6 +39,17 @@
 
 using std::unique_ptr;
 
+class QTimeLine;
+class QPainter;
+class QMenu;
+class QAction;
+class QLabel;
+class QEvent;
+class QContextMenuEvent;
+class QMouseEvent;
+class QDragEnterEvent;
+class QDropEvent;
+
 class Application;
 class CollectionView;
 class CollectionModel;