Reduce includes

src/collection/collection.cpp

@@ -21,11 +21,11 @@
 
 #include "config.h"
 
-#include <unistd.h>
-
+#include <QtGlobal>
 #include <QObject>
 #include <QThread>
 #include <QList>
+#include <QtDebug>
 
 #include "core/application.h"
 #include "core/database.h"
@@ -34,6 +34,7 @@
 #include "core/thread.h"
 #include "core/utilities.h"
 #include "core/song.h"
+#include "core/logging.h"
 #include "collection.h"
 #include "collectionwatcher.h"
 #include "collectionbackend.h"

src/collection/collection.h

@@ -25,12 +25,14 @@
 #include "config.h"
 
 #include <QObject>
+#include <QList>
 #include <QHash>
 #include <QString>
-#include <QUrl>
 
 #include "core/song.h"
 
+class QThread;
+
 class Application;
 class Thread;
 class CollectionBackend;

src/collection/collectionbackend.cpp

@@ -30,23 +30,20 @@
 #include <QMutex>
 #include <QSet>
 #include <QMap>
-#include <QByteArray>
-#include <QFileInfo>
-#include <QDateTime>
+#include <QVector>
 #include <QVariant>
+#include <QByteArray>
 #include <QString>
 #include <QStringList>
-#include <QRegExp>
 #include <QUrl>
+#include <QFileInfo>
+#include <QDateTime>
+#include <QRegExp>
 #include <QSqlDatabase>
 #include <QSqlQuery>
-#include <QtDebug>
 
-#include "core/application.h"
 #include "core/database.h"
-#include "core/logging.h"
 #include "core/scopedtransaction.h"
-#include "core/utilities.h"
 
 #include "directory.h"
 #include "collectionbackend.h"

src/collection/collectionbackend.h

@@ -24,13 +24,10 @@
 
 #include "config.h"
 
-
 #include <QtGlobal>
 #include <QObject>
 #include <QFileInfo>
 #include <QList>
-#include <QVector>
-#include <QSet>
 #include <QString>
 #include <QStringList>
 #include <QUrl>

src/collection/collectiondirectorymodel.cpp

@@ -25,9 +25,7 @@
 #include <QAbstractItemModel>
 #include <QVariant>
 #include <QString>
-#include <QUrl>
 
-#include "core/application.h"
 #include "core/filesystemmusicstorage.h"
 #include "core/iconloader.h"
 #include "core/musicstorage.h"

src/collection/collectionfilterwidget.cpp

@@ -49,6 +49,7 @@
 #include "collectionfilterwidget.h"
 #include "groupbydialog.h"
 #include "ui_collectionfilterwidget.h"
+#include "widgets/qsearchfield.h"
 
 CollectionFilterWidget::CollectionFilterWidget(QWidget *parent)
     : QWidget(parent),

src/collection/collectionfilterwidget.h

@@ -29,7 +29,6 @@
 #include <QObject>
 #include <QMap>
 #include <QString>
-#include <QtEvents>
 
 #include "collectionquery.h"
 #include "collectionmodel.h"
@@ -44,7 +43,6 @@ class GroupByDialog;
 class SavedGroupingManager;
 class SettingsDialog;
 class Ui_CollectionFilterWidget;
-struct QueryOptions;
 
 class CollectionFilterWidget : public QWidget {
   Q_OBJECT

src/collection/collectionitemdelegate.cpp

@@ -21,11 +21,14 @@
 #include "config.h"
 
 #include <QtGlobal>
+#include <QAbstractItemModel>
 #include <QAbstractItemView>
 #include <QStyleOptionViewItem>
 #include <QVariant>
 #include <QString>
 #include <QLocale>
+#include <QPixmap>
+#include <QIcon>
 #include <QPainter>
 #include <QPalette>
 #include <QPen>
@@ -34,8 +37,7 @@
 #include <QBrush>
 #include <QColor>
 #include <QFont>
-#include <QPixmap>
-#include <QIcon>
+#include <QPoint>
 #include <QLinearGradient>
 #include <QToolTip>
 #include <QWhatsThis>

src/collection/collectionitemdelegate.h

@@ -23,12 +23,13 @@
 
 #include "config.h"
 
-
+#include <QObject>
 #include <QStyledItemDelegate>
-#include <QAbstractItemView>
-#include <QPainter>
+#include <QStyleOption>
 #include <QStyleOptionViewItem>
 
+class QAbstractItemView;
+class QPainter;
 class QHelpEvent;
 
 class CollectionItemDelegate : public QStyledItemDelegate {

src/collection/collectionmodel.cpp

@@ -21,30 +21,32 @@
 
 #include "config.h"
 
+#include <memory>
 #include <functional>
 #include <algorithm>
 
 #include <QObject>
 #include <QtGlobal>
 #include <QtConcurrentRun>
-#include <QtAlgorithms>
+#include <QThread>
 #include <QMutex>
 #include <QFuture>
 #include <QDataStream>
 #include <QMimeData>
 #include <QIODevice>
-#include <QByteArray>
-#include <QVariant>
 #include <QList>
 #include <QSet>
 #include <QMap>
-#include <QChar>
-#include <QRegExp>
+#include <QVariant>
+#include <QByteArray>
 #include <QString>
 #include <QStringList>
 #include <QUrl>
 #include <QImage>
+#include <QChar>
+#include <QRegExp>
 #include <QPixmapCache>
+#include <QNetworkDiskCache>
 #include <QSettings>
 #include <QStandardPaths>
 #include <QtDebug>

src/collection/collectionmodel.h

@@ -24,18 +24,16 @@
 
 #include "config.h"
 
-
 #include <QtGlobal>
 #include <QObject>
 #include <QAbstractItemModel>
 #include <QFuture>
 #include <QDataStream>
-#include <QList>
-#include <QMap>
 #include <QMetaType>
-#include <QMimeData>
 #include <QPair>
 #include <QSet>
+#include <QList>
+#include <QMap>
 #include <QVariant>
 #include <QString>
 #include <QStringList>
@@ -43,8 +41,6 @@
 #include <QImage>
 #include <QIcon>
 #include <QPixmap>
-#include <QNetworkDiskCache>
-#include <QSettings>
 
 #include "core/simpletreemodel.h"
 #include "core/song.h"
@@ -53,10 +49,12 @@
 #include "sqlrow.h"
 #include "covermanager/albumcoverloaderoptions.h"
 
+class QSettings;
+class QNetworkDiskCache;
+
 class Application;
 class CollectionBackend;
 class CollectionDirectoryModel;
-class CollectionItem;
 
 class CollectionModel : public SimpleTreeModel<CollectionItem> {
   Q_OBJECT

src/collection/collectionplaylistitem.cpp

@@ -21,7 +21,6 @@
 #include "config.h"
 
 #include <QVariant>
-#include <QString>
 #include <QUrl>
 
 #include "collectionplaylistitem.h"

src/collection/collectionplaylistitem.h

@@ -23,9 +23,7 @@
 
 #include "config.h"
 
-
 #include <QVariant>
-#include <QString>
 #include <QUrl>
 
 #include "core/song.h"

src/collection/collectionquery.cpp

@@ -31,7 +31,6 @@
 #include <QSqlQuery>
 
 #include "collectionquery.h"
-#include "core/logging.h"
 #include "core/song.h"
 
 QueryOptions::QueryOptions() : max_age_(-1), query_mode_(QueryMode_All) {}

src/collection/collectionquery.h

@@ -23,7 +23,6 @@
 
 #include "config.h"
 
-
 #include <QMetaType>
 #include <QVariant>
 #include <QString>
@@ -32,7 +31,6 @@
 #include <QSqlQuery>
 
 class Song;
-class CollectionBackend;
 
 // This structure let's you customize behaviour of any CollectionQuery.
 struct QueryOptions {

src/collection/collectionview.cpp

@@ -22,37 +22,25 @@
 
 #include <QtGlobal>
 #include <QWidget>
+#include <QAbstractItemView>
+#include <QTreeView>
 #include <QItemSelectionModel>
 #include <QSortFilterProxyModel>
-#include <QAbstractItemView>
-#include <QStyleOptionViewItem>
-#include <QAction>
+#include <QMimeData>
+#include <QSet>
+#include <QList>
+#include <QMap>
 #include <QVariant>
 #include <QString>
 #include <QUrl>
-#include <QList>
-#include <QLocale>
-#include <QMap>
-#include <QMessageBox>
-#include <QMenu>
-#include <QMimeData>
+#include <QPixmap>
 #include <QPainter>
-#include <QPalette>
-#include <QPen>
-#include <QPoint>
 #include <QRect>
-#include <QSet>
-#include <QSize>
-#include <QToolTip>
-#include <QTreeView>
-#include <QWhatsThis>
-#include <QBrush>
-#include <QColor>
 #include <QFont>
 #include <QFontMetrics>
-#include <QPixmap>
-#include <QIcon>
-#include <QLinearGradient>
+#include <QMenu>
+#include <QAction>
+#include <QMessageBox>
 #include <QSettings>
 #include <QtEvents>
 

src/collection/collectionview.h

@@ -26,25 +26,19 @@
 #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 "core/song.h"
 #include "widgets/autoexpandingtreeview.h"
 
+class QWidget;
+class QMenu;
+class QAction;
 class QContextMenuEvent;
-class QHelpEvent;
 class QMouseEvent;
 class QPaintEvent;
 

src/collection/collectionwatcher.cpp

@@ -24,7 +24,6 @@
 #include <assert.h>
 
 #include <QObject>
-#include <QApplication>
 #include <QThread>
 #include <QIODevice>
 #include <QDir>
@@ -50,7 +49,6 @@
 #include "core/logging.h"
 #include "core/tagreaderclient.h"
 #include "core/taskmanager.h"
-#include "core/utilities.h"
 #include "directory.h"
 #include "collectionbackend.h"
 #include "collectionwatcher.h"

src/collection/collectionwatcher.h

@@ -24,7 +24,6 @@
 
 #include "config.h"
 
-
 #include <QtGlobal>
 #include <QObject>
 #include <QHash>
@@ -32,11 +31,14 @@
 #include <QSet>
 #include <QString>
 #include <QStringList>
-#include <QTimer>
+#include <QUrl>
 
 #include "directory.h"
 #include "core/song.h"
 
+class QThread;
+class QTimer;
+
 class CollectionBackend;
 class FileSystemWatcherInterface;
 class TaskManager;

src/collection/groupbydialog.cpp

@@ -23,10 +23,10 @@
 #include <functional>
 
 #include <QDialog>
+#include <QWidget>
 #include <QComboBox>
 #include <QDialogButtonBox>
 #include <QPushButton>
-#include <QWidget>
 
 #include "collectionmodel.h"
 #include "groupbydialog.h"
@@ -42,6 +42,7 @@ using std::placeholders::_2;
 #include <boost/multi_index/tag.hpp>
 #include <boost/multi_index_container.hpp>
 #include <boost/multi_index_container_fwd.hpp>
+#include <boost/multi_index/detail/ord_index_impl.hpp>
 #include <boost/operators.hpp>
 
 using boost::multi_index_container;

src/collection/groupbydialog.h

@@ -27,11 +27,12 @@
 
 #include <QDialog>
 #include <QObject>
-#include <QWidget>
 #include <QString>
 
 #include "collectionmodel.h"
 
+class QWidget;
+
 class GroupByDialogPrivate;
 class Ui_GroupByDialog;
 

src/collection/savedgroupingmanager.h

@@ -25,12 +25,13 @@
 
 #include <QDialog>
 #include <QObject>
-#include <QWidget>
-#include <QStandardItemModel>
 #include <QString>
 
 #include "collectionmodel.h"
 
+class QWidget;
+class QStandardItemModel;
+
 class CollectionFilterWidget;
 class Ui_SavedGroupingManager;