Reduce includes

src/playlist/playlist.cpp

@@ -33,7 +33,6 @@
 #include <QtGlobal>
 #include <QObject>
 #include <QCoreApplication>
-#include <QtAlgorithms>
 #include <QtConcurrentRun>
 #include <QFuture>
 #include <QIODevice>
@@ -48,18 +47,17 @@
 #include <QString>
 #include <QStringList>
 #include <QUrl>
-#include <QColor>
 #include <QFont>
 #include <QBrush>
 #include <QLinkedList>
 #include <QUndoStack>
 #include <QUndoCommand>
 #include <QAbstractListModel>
-#include <QPersistentModelIndex>
 #include <QMutableListIterator>
 #include <QMutableLinkedListIterator>
 #include <QFlags>
 #include <QSettings>
+#include <QtDebug>
 
 #include "core/application.h"
 #include "core/closure.h"
@@ -85,7 +83,6 @@
 #include "songplaylistitem.h"
 #include "tagreadermessages.pb.h"
 
-#include "internet/internetservices.h"
 #include "internet/internetplaylistitem.h"
 #include "internet/internetsongmimedata.h"
 

src/playlist/playlist.h

@@ -24,30 +24,31 @@
 
 #include "config.h"
 
-
 #include <QtGlobal>
 #include <QObject>
 #include <QAbstractItemModel>
 #include <QAbstractListModel>
-#include <QSortFilterProxyModel>
 #include <QPersistentModelIndex>
 #include <QFuture>
 #include <QList>
 #include <QMap>
 #include <QMetaType>
-#include <QMimeData>
 #include <QVariant>
 #include <QString>
 #include <QStringList>
 #include <QUrl>
 #include <QColor>
-#include <QUndoStack>
+#include <QRgb>
 
 #include "core/song.h"
 #include "core/tagreaderclient.h"
 #include "playlistitem.h"
 #include "playlistsequence.h"
 
+class QMimeData;
+class QSortFilterProxyModel;
+class QUndoStack;
+
 class CollectionBackend;
 class PlaylistBackend;
 class PlaylistFilter;

src/playlist/playlistcontainer.h

@@ -23,19 +23,17 @@
 
 #include "config.h"
 
-
 #include <QObject>
 #include <QWidget>
 #include <QString>
 #include <QIcon>
-#include <QTimer>
-#include <QTimeLine>
 #include <QSettings>
-#include <QAction>
-#include <QEvent>
-#include <QLabel>
-#include <QtEvents>
 
+class QTimer;
+class QTimeLine;
+class QLabel;
+class QAction;
+class QEvent;
 class QKeyEvent;
 class QResizeEvent;
 

src/playlist/playlistdelegates.cpp

@@ -25,6 +25,7 @@
 #include <QApplication>
 #include <QObject>
 #include <QWidget>
+#include <QThread>
 #include <QtConcurrentRun>
 #include <QFuture>
 #include <QAbstractItemModel>

src/playlist/playlistdelegates.h

@@ -24,7 +24,6 @@
 
 #include "config.h"
 
-
 #include <QObject>
 #include <QWidget>
 #include <QAbstractItemView>
@@ -41,6 +40,7 @@
 #include <QPainter>
 #include <QRect>
 #include <QColor>
+#include <QRgb>
 #include <QSize>
 #include <QFont>
 #include <QString>
@@ -50,6 +50,7 @@
 #include <QLineEdit>
 
 #include "playlist.h"
+#include "core/song.h"
 
 class CollectionBackend;
 class Player;

src/playlist/playlistfilter.h

@@ -23,7 +23,6 @@
 
 #include "config.h"
 
-
 #include <QtGlobal>
 #include <QObject>
 #include <QMap>
@@ -32,8 +31,6 @@
 #include <QString>
 #include <QSortFilterProxyModel>
 
-#include "playlist.h"
-
 class FilterTree;
 
 class PlaylistFilter : public QSortFilterProxyModel {

src/playlist/playlistfilterparser.cpp

@@ -20,7 +20,6 @@
 
 #include "config.h"
 
-
 #include <QList>
 #include <QMap>
 #include <QSet>

src/playlist/playlistfilterparser.h

@@ -23,12 +23,11 @@
 
 #include "config.h"
 
-
-#include <QMap>
 #include <QSet>
+#include <QMap>
 #include <QString>
-#include <QAbstractItemModel>
 
+class QAbstractItemModel;
 class QModelIndex;
 
 // structure for filter parse tree

src/playlist/playlistheader.cpp

@@ -20,7 +20,7 @@
 
 #include "config.h"
 
-
+#include <QAbstractItemModel>
 #include <QWidget>
 #include <QFlags>
 #include <QVariant>
@@ -29,8 +29,8 @@
 #include <QMenu>
 #include <QAction>
 #include <QActionGroup>
+#include <QEvent>
 #include <QContextMenuEvent>
-#include <QtEvents>
 
 #include "playlistheader.h"
 #include "playlistview.h"

src/playlist/playlistheader.h

@@ -23,16 +23,16 @@
 
 #include "config.h"
 
-
 #include <QObject>
 #include <QWidget>
 #include <QList>
-#include <QtEvents>
 
 #include "widgets/stretchheaderview.h"
 
 class QMenu;
 class QAction;
+class QEvent;
+class QContextMenuEvent;
 
 class PlaylistView;
 

src/playlist/playlistitem.cpp

@@ -21,7 +21,6 @@
 
 #include "config.h"
 
-
 #include <QtConcurrentRun>
 #include <QFuture>
 #include <QString>

src/playlist/playlistitem.h

@@ -27,7 +27,6 @@
 #include <memory>
 
 #include <QFuture>
-#include <QFlags>
 #include <QMetaType>
 #include <QList>
 #include <QMap>
@@ -36,12 +35,12 @@
 #include <QString>
 #include <QUrl>
 #include <QColor>
-#include <QVector>
-#include <QAction>
-#include <QSqlQuery>
 
 #include "core/song.h"
 
+class QSqlQuery;
+class QAction;
+
 class SqlRow;
 
 class PlaylistItem : public std::enable_shared_from_this<PlaylistItem> {

src/playlist/playlistlistcontainer.cpp

@@ -22,26 +22,25 @@
 
 #include <QObject>
 #include <QWidget>
-#include <QAction>
-#include <QList>
+#include <QStandardItemModel>
+#include <QAbstractItemModel>
+#include <QItemSelectionModel>
+#include <QSortFilterProxyModel>
 #include <QSet>
+#include <QList>
 #include <QVariant>
 #include <QString>
-#include <QStringBuilder>
-#include <QMenu>
 #include <QPixmap>
 #include <QPainter>
 #include <QIcon>
 #include <QSize>
-#include <QStandardItemModel>
-#include <QAbstractItemModel>
-#include <QItemSelectionModel>
-#include <QPersistentModelIndex>
-#include <QSortFilterProxyModel>
+#include <QMenu>
+#include <QAction>
 #include <QMessageBox>
 #include <QInputDialog>
 #include <QToolButton>
-#include <QtEvents>
+#include <QShowEvent>
+#include <QContextMenuEvent>
 
 #include "core/application.h"
 #include "core/iconloader.h"
@@ -53,7 +52,7 @@
 #include "playlistlistmodel.h"
 #include "playlistmanager.h"
 #include "ui_playlistlistcontainer.h"
-#include "collection/collectionmodel.h"
+#include "organise/organisedialog.h"
 #ifndef Q_OS_WIN
 #  include "device/devicemanager.h"
 #  include "device/devicestatefiltermodel.h"

src/playlist/playlistlistcontainer.h

@@ -23,24 +23,26 @@
 
 #include "config.h"
 
+#include <memory>
 
 #include <QObject>
 #include <QWidget>
 #include <QString>
 #include <QIcon>
-#include <QAction>
-#include <QMenu>
-#include <QSortFilterProxyModel>
-#include <QStandardItem>
-#include <QtEvents>
 
-#include <organise/organisedialog.h>
+class QStandardItem;
+class QSortFilterProxyModel;
+class QMenu;
+class QAction;
+class QContextMenuEvent;
+class QShowEvent;
 
 class QModelIndex;
 class Application;
 class Playlist;
 class PlaylistListModel;
 class Ui_PlaylistListContainer;
+class OrganiseDialog;
 
 class PlaylistListContainer : public QWidget {
   Q_OBJECT

src/playlist/playlistlistmodel.h

@@ -30,8 +30,8 @@
 #include <QIcon>
 #include <QVariant>
 #include <QString>
-#include <QMimeData>
 
+class QMimeData;
 class QModelIndex;
 
 class PlaylistListModel : public QStandardItemModel {

src/playlist/playlistlistview.cpp

@@ -20,13 +20,14 @@
 
 #include "config.h"
 
-
+#include <QAbstractItemModel>
 #include <QWidget>
 #include <QFlags>
 #include <QFont>
 #include <QPainter>
 #include <QPalette>
 #include <QRect>
+#include <QPaintEvent>
 
 #include "playlistlistview.h"
 

src/playlist/playlistlistview.h

@@ -26,10 +26,11 @@
 #include <QObject>
 #include <QWidget>
 #include <QString>
-#include <QPaintEvent>
 
 #include "widgets/autoexpandingtreeview.h"
 
+class QPaintEvent;
+
 class PlaylistListView : public AutoExpandingTreeView {
   Q_OBJECT
 

src/playlist/playlistmanager.h

@@ -23,7 +23,7 @@
 
 #include "config.h"
 
-
+#include <QtGlobal>
 #include <QObject>
 #include <QItemSelectionModel>
 #include <QFuture>
@@ -35,6 +35,8 @@
 #include "core/song.h"
 #include "playlist.h"
 
+class QModelIndex;
+
 class Application;
 class CollectionBackend;
 class PlaylistBackend;

src/playlist/playlistsaveoptionsdialog.h

@@ -24,12 +24,13 @@
 #include "config.h"
 
 #include <QObject>
-#include <QWidget>
 #include <QDialog>
 #include <QString>
 
 #include "playlist.h"
 
+class QWidget;
+
 namespace Ui {
 class PlaylistSaveOptionsDialog;
 }

src/playlist/playlistsequence.cpp

@@ -21,12 +21,13 @@
 #include "config.h"
 
 #include <QWidget>
-#include <QMenu>
-#include <QSize>
+#include <QList>
 #include <QVariant>
 #include <QIcon>
 #include <QPixmap>
 #include <QPainter>
+#include <QMenu>
+#include <QSize>
 #include <QAction>
 #include <QActionGroup>
 #include <QToolButton>

src/playlist/playlistsequence.h

@@ -30,8 +30,9 @@
 #include <QString>
 #include <QIcon>
 #include <QPixmap>
-#include <QAction>
-#include <QMenu>
+
+class QMenu;
+class QAction;
 
 class SettingsProvider;
 class Ui_PlaylistSequence;

src/playlist/playlisttabbar.h

@@ -23,18 +23,16 @@
 
 #include "config.h"
 
-
 #include <QObject>
-#include <QWidget>
 #include <QBasicTimer>
 #include <QList>
 #include <QString>
 #include <QIcon>
 #include <QTabBar>
-#include <QAction>
-#include <QMenu>
-#include <QtEvents>
 
+class QWidget;
+class QMenu;
+class QAction;
 class QEvent;
 class QContextMenuEvent;
 class QDragEnterEvent;

src/playlist/playlistundocommands.cpp

@@ -22,6 +22,7 @@
 
 #include <memory>
 
+#include <QtGlobal>
 #include <QList>
 #include <QUrl>
 #include <QUndoStack>

src/playlist/playlistundocommands.h

@@ -23,7 +23,6 @@
 
 #include "config.h"
 
-
 #include <QCoreApplication>
 #include <QList>
 #include <QUndoStack>

src/playlist/playlistview.cpp

@@ -27,18 +27,19 @@
 #include <QApplication>
 #include <QObject>
 #include <QWidget>
-#include <QList>
 #include <QAbstractItemView>
+#include <QItemSelectionModel>
+#include <QSortFilterProxyModel>
+#include <QTreeView>
+#include <QHeaderView>
 #include <QByteArray>
 #include <QClipboard>
 #include <QCommonStyle>
 #include <QFontMetrics>
-#include <QHeaderView>
-#include <QItemSelectionModel>
 #include <QKeySequence>
 #include <QMimeData>
+#include <QList>
 #include <QSize>
-#include <QSortFilterProxyModel>
 #include <QTimeLine>
 #include <QTimer>
 #include <QVariant>
@@ -56,11 +57,9 @@
 #include <QPoint>
 #include <QRect>
 #include <QRegion>
-#include <QtAlgorithms>
 #include <QStyleOptionHeader>
 #include <QStyleOptionViewItem>
 #include <QProxyStyle>
-#include <QTreeView>
 #include <QLinearGradient>
 #include <QScrollBar>
 #include <QtEvents>

src/playlist/playlistview.h

@@ -28,8 +28,13 @@
 
 #include <QtGlobal>
 #include <QObject>
-#include <QWidget>
+#include <QAbstractItemDelegate>
+#include <QAbstractItemModel>
+#include <QStyleOptionViewItem>
+#include <QAbstractItemView>
+#include <QTreeView>
 #include <QList>
+#include <QByteArray>
 #include <QString>
 #include <QImage>
 #include <QPixmap>
@@ -38,22 +43,18 @@
 #include <QStyle>
 #include <QStyleOption>
 #include <QProxyStyle>
-#include <QTreeView>
 #include <QPoint>
-#include <QTimer>
 #include <QBasicTimer>
-#include <QTimeLine>
 #include <QCommonStyle>
-#include <QPainter>
-#include <QAbstractItemDelegate>
-#include <QAbstractItemModel>
-#include <QStyleOptionViewItem>
-#include <QtEvents>
 
 #include "core/song.h"
 #include "settings/appearancesettingspage.h"
 #include "playlist.h"
 
+class QWidget;
+class QTimer;
+class QTimeLine;
+class QPainter;
 class QEvent;
 class QShowEvent;
 class QContextMenuEvent;

src/playlist/songloaderinserter.h

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

src/playlist/songplaylistitem.cpp

@@ -21,11 +21,10 @@
 
 #include "config.h"
 
-#include <QString>
-#include <QStringList>
 #include <QUrl>
 
 #include "core/tagreaderclient.h"
+#include "core/song.h"
 #include "collection/sqlrow.h"
 #include "playlistitem.h"
 #include "songplaylistitem.h"

src/playlist/songplaylistitem.h

@@ -24,7 +24,6 @@
 
 #include "config.h"
 
-#include <QString>
 #include <QUrl>
 
 #include "core/song.h"
@@ -52,4 +51,4 @@ class SongPlaylistItem : public PlaylistItem {
   Song song_;
 };
 
-#endif // SONGPLAYLISTITEM_H
+#endif  // SONGPLAYLISTITEM_H