Reduce includes

src/moodbar/moodbarbuilder.cpp

@@ -15,6 +15,7 @@
    along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <algorithm>
 #include <cmath>
 
 #include <QList>

src/moodbar/moodbarbuilder.h

@@ -18,6 +18,7 @@
 #ifndef MOODBARBUILDER_H
 #define MOODBARBUILDER_H
 
+#include <QtGlobal>
 #include <QList>
 #include <QByteArray>
 

src/moodbar/moodbarcontroller.cpp

@@ -15,15 +15,19 @@
    along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <memory>
+
 #include <QObject>
 #include <QByteArray>
 #include <QUrl>
 
 #include "core/application.h"
 #include "core/closure.h"
-#include "core/logging.h"
 #include "core/player.h"
+#include "core/song.h"
+#include "engine/engine_fwd.h"
 #include "playlist/playlistmanager.h"
+#include "playlist/playlistitem.h"
 
 #include "moodbarcontroller.h"
 #include "moodbarloader.h"

src/moodbar/moodbarcontroller.h

@@ -20,6 +20,7 @@
 
 #include <QObject>
 #include <QByteArray>
+#include <QString>
 #include <QUrl>
 
 class Application;

src/moodbar/moodbaritemdelegate.cpp

@@ -18,14 +18,20 @@
 #include <QApplication>
 #include <QtConcurrentRun>
 #include <QFuture>
-#include <QSettings>
+#include <QAbstractItemModel>
 #include <QSortFilterProxyModel>
+#include <QSettings>
 #include <QItemDelegate>
+#include <QList>
+#include <QVector>
+#include <QVariant>
 #include <QByteArray>
 #include <QUrl>
 #include <QImage>
 #include <QPixmap>
 #include <QPainter>
+#include <QPalette>
+#include <QRect>
 
 #include "core/application.h"
 #include "core/closure.h"

src/moodbar/moodbaritemdelegate.h

@@ -26,9 +26,16 @@
 #include <QFuture>
 #include <QSet>
 #include <QByteArray>
+#include <QString>
 #include <QUrl>
-#include <QPainter>
+#include <QImage>
+#include <QPixmap>
+#include <QSize>
+#include <QStyleOption>
 
+class QPainter;
+class QModelIndex;
+class QPersistentModelIndex;
 class Application;
 class MoodbarPipeline;
 class PlaylistView;

src/moodbar/moodbarloader.cpp

@@ -19,17 +19,24 @@
 
 #include <memory>
 
+#include <QtGlobal>
 #include <QObject>
 #include <QThread>
 #include <QCoreApplication>
 #include <QStandardPaths>
 #include <QIODevice>
 #include <QDir>
+#include <QFile>
 #include <QFileInfo>
+#include <QAbstractNetworkCache>
 #include <QNetworkDiskCache>
 #include <QTimer>
+#include <QVariant>
+#include <QByteArray>
 #include <QString>
 #include <QUrl>
+#include <QSettings>
+#include <QtDebug>
 
 #include "core/application.h"
 #include "core/closure.h"

src/moodbar/moodbarloader.h

@@ -19,15 +19,16 @@
 #define MOODBARLOADER_H
 
 #include <QObject>
-#include <QThread>
 #include <QList>
 #include <QMap>
 #include <QSet>
-#include <QByteArray>
+#include <QString>
 #include <QStringList>
 #include <QUrl>
-#include <QNetworkDiskCache>
 
+class QThread;
+class QByteArray;
+class QNetworkDiskCache;
 class Application;
 class MoodbarPipeline;
 

src/moodbar/moodbarpipeline.cpp

@@ -17,15 +17,18 @@
 
 #include "moodbarpipeline.h"
 
+#include <stdlib.h>
+#include <glib-object.h>
+
 #include <QObject>
 #include <QCoreApplication>
 #include <QThread>
 #include <QString>
 #include <QUrl>
+#include <QtDebug>
 
 #include "core/logging.h"
 #include "core/signalchecker.h"
-#include "core/timeconstants.h"
 #include "core/utilities.h"
 #include "moodbar/moodbarbuilder.h"
 

src/moodbar/moodbarpipeline.h

@@ -23,6 +23,7 @@
 #include <QString>
 #include <QUrl>
 
+#include <glib.h>
 #include <gst/gst.h>
 #include <gst/app/gstappsink.h>
 

src/moodbar/moodbarproxystyle.cpp

@@ -17,21 +17,32 @@
 
 #include <QProxyStyle>
 #include <QSettings>
-#include <QMenu>
+#include <QList>
+#include <QVector>
+#include <QVariant>
 #include <QPixmap>
 #include <QPainter>
+#include <QPen>
+#include <QPoint>
+#include <QPolygon>
+#include <QSize>
+#include <QSizePolicy>
 #include <QSlider>
+#include <QStyleOption>
 #include <QStyleOptionComplex>
 #include <QStyleOptionSlider>
 #include <QTimeLine>
 #include <QStyle>
+#include <QMenu>
+#include <QAction>
+#include <QActionGroup>
 #include <QEvent>
 #include <QContextMenuEvent>
 
 #include "core/application.h"
-#include "core/logging.h"
 
 #include "moodbarproxystyle.h"
+#include "moodbarrenderer.h"
 #include "settings/moodbarsettingspage.h"
 
 const int MoodbarProxyStyle::kMarginSize = 3;

src/moodbar/moodbarproxystyle.h

@@ -18,19 +18,30 @@
 #ifndef MOODBARPROXYSTYLE_H
 #define MOODBARPROXYSTYLE_H
 
+#include <QtGlobal>
+#include <QObject>
 #include <QProxyStyle>
-#include <QTimeLine>
 #include <QByteArray>
+#include <QString>
 #include <QPixmap>
-#include <QPainter>
-#include <QSlider>
-#include <QMenu>
-#include <QActionGroup>
-#include <QStyleOptionSlider>
-#include <QEvent>
+#include <QPalette>
+#include <QRect>
+#include <QPoint>
+#include <QStyle>
 
 #include "moodbarrenderer.h"
 
+class QAction;
+class QActionGroup;
+class QMenu;
+class QPainter;
+class QSlider;
+class QStyleOptionComplex;
+class QStyleOptionSlider;
+class QTimeLine;
+class QWidget;
+class QEvent;
+
 class Application;
 
 class MoodbarProxyStyle : public QProxyStyle {

src/moodbar/moodbarrenderer.cpp

@@ -15,16 +15,22 @@
    along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "moodbarrenderer.h"
+#include <string>
 
+#include <QtGlobal>
+#include <QObject>
+#include <QArrayData>
+#include <QList>
 #include <QByteArray>
 #include <QString>
 #include <QImage>
 #include <QPainter>
 #include <QPalette>
 #include <QColor>
+#include <QRect>
+#include <QSize>
 
-#include "core/arraysize.h"
+#include "moodbarrenderer.h"
 
 const int MoodbarRenderer::kNumHues = 12;
 

src/moodbar/moodbarrenderer.h

@@ -18,14 +18,18 @@
 #ifndef MOODBARRENDERER_H
 #define MOODBARRENDERER_H
 
-#include <QByteArray>
-#include <QImage>
-#include <QPixmap>
 #include <QMetaType>
+#include <QList>
+#include <QByteArray>
+#include <QString>
+#include <QImage>
 #include <QVector>
 #include <QColor>
-#include <QPainter>
 #include <QPalette>
+#include <QRect>
+#include <QSize>
+
+class QPainter;
 
 typedef QVector<QColor> ColorVector;