Reduce includes

src/core/application.cpp

@@ -35,6 +35,7 @@
 #include "core/lazy.h"
 #include "core/tagreaderclient.h"
 #include "core/song.h"
+#include "core/logging.h"
 
 #include "database.h"
 #include "taskmanager.h"
@@ -57,7 +58,6 @@
 #include "covermanager/deezercoverprovider.h"
 
 #include "lyrics/lyricsproviders.h"
-#include "lyrics/lyricsprovider.h"
 #include "lyrics/auddlyricsprovider.h"
 #include "lyrics/ovhlyricsprovider.h"
 #include "lyrics/lololyricsprovider.h"

src/core/application.h

@@ -28,7 +28,6 @@
 #include <memory>
 
 #include <QObject>
-#include <QThread>
 #include <QList>
 #include <QString>
 
@@ -36,6 +35,8 @@
 
 using std::unique_ptr;
 
+class QThread;
+
 class TaskManager;
 class ApplicationImpl;
 class TagReaderClient;

src/core/commandlineoptions.cpp

@@ -24,6 +24,7 @@
 #include <cstdlib>
 #include <getopt.h>
 #include <iostream>
+#include <type_traits>
 
 #include <QtGlobal>
 #include <QObject>

src/core/database.cpp

@@ -21,6 +21,7 @@
 
 #include "config.h"
 
+#include <stddef.h>
 #include <assert.h>
 #include <sqlite3.h>
 #include <boost/scope_exit.hpp>
@@ -31,7 +32,6 @@
 #include <QIODevice>
 #include <QDir>
 #include <QFile>
-#include <QChar>
 #include <QList>
 #include <QByteArray>
 #include <QVariant>
@@ -43,7 +43,6 @@
 #include <QSqlDriver>
 #include <QSqlDatabase>
 #include <QSqlQuery>
-#include <QSqlResult>
 #include <QSqlError>
 #include <QStandardPaths>
 #include <QtDebug>

src/core/database.h

@@ -29,8 +29,6 @@
 #include <QtGlobal>
 #include <QObject>
 #include <QMutex>
-#include <QByteArray>
-#include <QList>
 #include <QMap>
 #include <QSqlDatabase>
 #include <QSqlQuery>

src/core/deletefiles.h

@@ -26,12 +26,11 @@
 #include <memory>
 
 #include <QObject>
-#include <QThread>
-#include <QString>
 #include <QStringList>
 
 #include "song.h"
 
+class QThread;
 class TaskManager;
 class MusicStorage;
 

src/core/iconloader.h

@@ -20,7 +20,6 @@
 #ifndef ICONLOADER_H
 #define ICONLOADER_H
 
-#include <QList>
 #include <QString>
 #include <QIcon>
 

src/core/mainwindow.cpp

@@ -23,12 +23,14 @@
 
 #include <memory>
 #include <functional>
+#include <algorithm>
 #include <cmath>
 
 #include <QMainWindow>
 #include <QApplication>
 #include <QObject>
 #include <QWidget>
+#include <QThread>
 #include <QSystemTrayIcon>
 #include <QSortFilterProxyModel>
 #include <QByteArray>
@@ -47,7 +49,6 @@
 #include <QMimeData>
 #include <QPalette>
 #include <QTimer>
-#include <QtAlgorithms>
 #include <QKeySequence>
 #include <QMenu>
 #include <QAction>
@@ -56,7 +57,16 @@
 #include <QMessageBox>
 #include <QtEvents>
 #include <QSettings>
-#include <QtDebug>
+#include <QColor>
+#include <QFrame>
+#include <QItemSelectionModel>
+#include <QLabel>
+#include <QLayout>
+#include <QSize>
+#include <QSplitter>
+#include <QStackedWidget>
+#include <QTabBar>
+#include <QToolButton>
 
 #include "core/logging.h"
 #include "core/closure.h"
@@ -80,6 +90,7 @@
 #include "appearance.h"
 #include "engine/enginetype.h"
 #include "engine/enginebase.h"
+#include "engine/engine_fwd.h"
 #include "dialogs/errordialog.h"
 #include "dialogs/about.h"
 #include "dialogs/console.h"
@@ -94,7 +105,7 @@
 #include "widgets/osd.h"
 #include "widgets/trackslider.h"
 #include "context/contextview.h"
-#include "collection/collectionview.h"
+#include "context/contextalbumsview.h"
 #include "collection/collection.h"
 #include "collection/collectionbackend.h"
 #include "collection/collectiondirectorymodel.h"
@@ -138,11 +149,9 @@
 #  include "settings/tidalsettingspage.h"
 #endif
 #ifdef HAVE_QOBUZ
-#  include "qobuz/qobuzservice.h"
 #  include "settings/qobuzsettingspage.h"
 #endif
 #ifdef HAVE_SUBSONIC
-#  include "subsonic/subsonicservice.h"
 #  include "settings/subsonicsettingspage.h"
 #endif
 
@@ -150,6 +159,8 @@
 #include "internet/internetservice.h"
 #include "internet/internetsongsview.h"
 #include "internet/internettabsview.h"
+#include "internet/internetcollectionview.h"
+#include "internet/internetsearchview.h"
 
 #include "scrobbler/audioscrobbler.h"
 

src/core/mainwindow.h

@@ -39,8 +39,10 @@
 #include <QPoint>
 #include <QMimeData>
 #include <QList>
+#include <QByteArray>
 #include <QString>
 #include <QUrl>
+#include <QImage>
 #include <QPixmap>
 #include <QTimer>
 #include <QSettings>
@@ -48,6 +50,7 @@
 
 #include "core/lazy.h"
 #include "core/tagreaderclient.h"
+#include "core/song.h"
 #include "engine/enginetype.h"
 #include "engine/engine_fwd.h"
 #include "mac_startup.h"
@@ -67,7 +70,6 @@ class CollectionViewContainer;
 class AlbumCoverChoiceController;
 class CommandlineOptions;
 #ifndef Q_OS_WIN
-class DeviceView;
 class DeviceViewContainer;
 #endif
 class EditTagDialog;
@@ -79,7 +81,6 @@ class MimeData;
 class OrganiseDialog;
 class PlaylistListContainer;
 class QueueView;
-class Song;
 class SystemTrayIcon;
 #if defined(HAVE_GSTREAMER) && defined(HAVE_CHROMAPRINT)
 class TagFetcher;

src/core/mergedproxymodel.cpp

@@ -23,8 +23,11 @@
 #include <functional>
 #include <limits>
 
+#include <boost/multi_index/detail/ord_index_impl.hpp>
+
 #include <QObject>
 #include <QMimeData>
+#include <QList>
 #include <QStringList>
 #include <QtAlgorithms>
 #include <QAbstractItemModel>

src/core/mergedproxymodel.h

@@ -27,15 +27,15 @@
 #include <cstddef>
 
 #include <QObject>
-#include <QMimeData>
 #include <QAbstractItemModel>
 #include <QAbstractProxyModel>
-#include <QPersistentModelIndex>
 #include <QMap>
 #include <QVariant>
 #include <QString>
 #include <QStringList>
 
+class QMimeData;
+
 std::size_t hash_value(const QModelIndex &index);
 
 class MergedProxyModelPrivate;

src/core/metatypes.cpp

@@ -27,7 +27,7 @@
 #  include <gst/gstelement.h>
 #endif
 
-#include <QtGlobal>
+#include <QDataStream>
 #include <QAbstractSocket>
 #include <QMetaType>
 #include <QFileInfo>

src/core/multisortfilterproxy.cpp

@@ -22,11 +22,13 @@
 
 #include <QtGlobal>
 #include <QObject>
+#include <QAbstractItemModel>
 #include <QSortFilterProxyModel>
 #include <QMetaType>
 #include <QDateTime>
 #include <QVariant>
 #include <QString>
+#include <QChar>
 
 #include "multisortfilterproxy.h"
 

src/core/multisortfilterproxy.h

@@ -23,13 +23,13 @@
 
 #include "config.h"
 
-
-#include <QObject>
 #include <QSortFilterProxyModel>
 #include <QList>
 #include <QPair>
 #include <QVariant>
 
+class QObject;
+
 class MultiSortFilterProxy : public QSortFilterProxyModel {
  public:
   MultiSortFilterProxy(QObject *parent = nullptr);

src/core/musicstorage.h

@@ -23,6 +23,8 @@
 
 #include "config.h"
 
+#include <QtGlobal>
+
 #include <functional>
 #include <memory>
 

src/core/network.cpp

@@ -21,12 +21,16 @@
 
 #include "config.h"
 
+#include <type_traits>
+
 #include <QtGlobal>
 #include <QObject>
 #include <QCoreApplication>
 #include <QStandardPaths>
 #include <QIODevice>
 #include <QMutex>
+#include <QVariant>
+#include <QByteArray>
 #include <QString>
 #include <QUrl>
 #include <QNetworkAccessManager>
@@ -42,8 +46,7 @@ QMutex ThreadSafeNetworkDiskCache::sMutex;
 ThreadSafeNetworkDiskCache *ThreadSafeNetworkDiskCache::sInstance = nullptr;
 QNetworkDiskCache *ThreadSafeNetworkDiskCache::sCache = nullptr;
 
-ThreadSafeNetworkDiskCache::ThreadSafeNetworkDiskCache(QObject *parent)
-: QAbstractNetworkCache(parent) {
+ThreadSafeNetworkDiskCache::ThreadSafeNetworkDiskCache(QObject *parent) : QAbstractNetworkCache(parent) {
 
   QMutexLocker l(&sMutex);
   if (!sCache) {

src/core/network.h

@@ -24,19 +24,19 @@
 
 #include "config.h"
 
-
 #include <QtGlobal>
 #include <QObject>
 #include <QNetworkAccessManager>
 #include <QAbstractNetworkCache>
-#include <QIODevice>
 #include <QMutex>
 #include <QUrl>
 #include <QNetworkRequest>
-#include <QNetworkReply>
-#include <QNetworkDiskCache>
 #include <QNetworkCacheMetaData>
 
+class QIODevice;
+class QNetworkReply;
+class QNetworkDiskCache;
+
 class NetworkAccessManager : public QNetworkAccessManager {
   Q_OBJECT
 

src/core/networkproxyfactory.h

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

src/core/networktimeouts.h

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

src/core/player.h

@@ -37,9 +37,6 @@
 #include "urlhandler.h"
 #include "engine/engine_fwd.h"
 #include "engine/enginetype.h"
-#ifdef HAVE_GSTREAMER
-#include "engine/gststartup.h"
-#endif
 #include "playlist/playlistitem.h"
 #include "settings/behavioursettingspage.h"
 
@@ -47,6 +44,9 @@ class Application;
 class Song;
 class AnalyzerContainer;
 class Equalizer;
+#ifdef HAVE_GSTREAMER
+class GstStartup;
+#endif
 
 using std::unique_ptr;
 

src/core/qtfslistener.cpp

@@ -23,8 +23,6 @@
 #include <QFileSystemWatcher>
 #include <QString>
 
-#include "core/logging.h"
-
 #include "filesystemwatcherinterface.h"
 #include "qtfslistener.h"
 

src/core/qtsystemtrayicon.h

@@ -23,18 +23,18 @@
 
 #include "config.h"
 
-
 #include <QObject>
 #include <QSystemTrayIcon>
 #include <QString>
 #include <QUrl>
+#include <QIcon>
 #include <QPixmap>
 #include <QAction>
-#include <QMenu>
 #include <QtEvents>
 
 #include "systemtrayicon.h"
 
+class QMenu;
 class QEvent;
 
 class Song;

src/core/scangiomodulepath.cpp

@@ -22,7 +22,6 @@
 
 #include <gio/gio.h>
 
-#include <QApplication>
 #include <QCoreApplication>
 #include <QDir>
 #include <QByteArray>
@@ -32,6 +31,7 @@
 #include "core/logging.h"
 
 void ScanGIOModulePath() {
+
   QString gio_module_path;
 
 #if defined(Q_OS_WIN32)
@@ -43,4 +43,5 @@ void ScanGIOModulePath() {
     QByteArray bytes = gio_module_path.toLocal8Bit();
     g_io_modules_scan_all_in_directory(bytes.data());
   }
+
 }

src/core/scopedtransaction.h

@@ -25,7 +25,7 @@
 
 #include <boost/noncopyable.hpp>
 
-#include <QSqlDatabase>
+class QSqlDatabase;
 
 // Opens a transaction on a database.
 // Rolls back the transaction if the object goes out of scope before Commit() is called.

src/core/song.cpp

@@ -27,12 +27,10 @@
 #include <taglib/id3v1genres.h>
 
 #include <QtGlobal>
-#include <QCoreApplication>
 #include <QObject>
 #include <QFile>
 #include <QFileInfo>
 #include <QSharedData>
-#include <QtAlgorithms>
 #include <QHash>
 #include <QByteArray>
 #include <QVariant>

src/core/song.h

@@ -38,8 +38,9 @@
 #include <QUrl>
 #include <QImage>
 #include <QIcon>
-#include <QTextCodec>
-#include <QSqlQuery>
+
+class QTextCodec;
+class QSqlQuery;
 
 namespace Engine {
 struct SimpleMetaBundle;

src/core/songloader.cpp

@@ -33,7 +33,6 @@
 #include <QIODevice>
 #include <QBuffer>
 #include <QByteArray>
-#include <QtAlgorithms>
 #include <QDir>
 #include <QDirIterator>
 #include <QFile>

src/core/songloader.h

@@ -40,10 +40,10 @@
 #include <QString>
 #include <QStringList>
 #include <QUrl>
-#include <QTimer>
 
 #include "song.h"
 
+class QTimer;
 class Player;
 class CollectionBackendInterface;
 class PlaylistParser;

src/core/standarditemiconloader.cpp

@@ -23,9 +23,9 @@
 #include <QtGlobal>
 #include <QObject>
 #include <QAbstractItemModel>
+#include <QStandardItem>
 #include <QMap>
 #include <QSet>
-#include <QString>
 #include <QImage>
 #include <QPixmap>
 #include <QIcon>

src/core/standarditemiconloader.h

@@ -26,13 +26,13 @@
 #include <QtGlobal>
 #include <QObject>
 #include <QMap>
-#include <QString>
 #include <QImage>
-#include <QStandardItem>
-#include <QAbstractItemModel>
 
 #include "covermanager/albumcoverloaderoptions.h"
 
+class QAbstractItemModel;
+class QStandardItem;
+
 class Song;
 class AlbumCoverLoader;
 

src/core/stylesheetloader.cpp

@@ -21,13 +21,16 @@
 
 #include "config.h"
 
+#include <QtGlobal>
 #include <QObject>
 #include <QWidget>
 #include <QIODevice>
+#include <QTextStream>
 #include <QFile>
 #include <QString>
 #include <QColor>
 #include <QPalette>
+#include <QEvent>
 #include <QtDebug>
 
 #include "core/logging.h"

src/core/stylesheetloader.h

@@ -24,14 +24,15 @@
 
 #include "config.h"
 
-
 #include <QObject>
-#include <QWidget>
-#include <QEvent>
+#include <QPair>
 #include <QMap>
 #include <QPalette>
 #include <QString>
 
+class QWidget;
+class QEvent;
+
 class StyleSheetLoader : public QObject {
  public:
   explicit StyleSheetLoader(QObject *parent = nullptr);

src/core/systemtrayicon.h

@@ -23,11 +23,12 @@
 
 #include "config.h"
 
-
+#include <QtGlobal>
 #include <QObject>
 #include <QString>
 #include <QPixmap>
-#include <QAction>
+
+class QAction;
 
 class Song;
 

src/core/thread.h

@@ -20,11 +20,12 @@
 
 #include "config.h"
 
-#include <QObject>
 #include <QThread>
 
 #include "utilities.h"
 
+class QObject;
+
 // Improve QThread by adding a SetIoPriority function
 class Thread : public QThread {
  public:

src/core/translations.h

@@ -20,10 +20,11 @@
 #include "config.h"
 
 #include <QObject>
-#include <QTranslator>
 #include <QList>
 #include <QString>
 
+class QTranslator;
+
 class Translations : public QObject {
  public:
   Translations();

src/core/utilities.cpp

@@ -42,18 +42,19 @@
 #include <QFile>
 #include <QFileInfo>
 #include <QHostAddress>
-#include <QPoint>
-#include <QRect>
-#include <QSize>
-#include <QMap>
-#include <QList>
 #include <QSet>
+#include <QList>
+#include <QMap>
+#include <QVariant>
 #include <QString>
 #include <QStringList>
+#include <QUrl>
 #include <QRegExp>
 #include <QTcpServer>
 #include <QTemporaryFile>
-#include <QUrl>
+#include <QPoint>
+#include <QRect>
+#include <QSize>
 #include <QMetaEnum>
 #include <QXmlStreamReader>
 #include <QSettings>
@@ -62,6 +63,8 @@
 #include <QNetworkInterface>
 #include <QtDebug>
 
+#include <stdio.h>
+
 #ifdef Q_OS_LINUX
 #  include <unistd.h>
 #  include <sys/syscall.h>

src/core/utilities.h

@@ -27,8 +27,6 @@
 #include <memory>
 
 #include <QtGlobal>
-#include <QWidget>
-#include <QIODevice>
 #include <QByteArray>
 #include <QFile>
 #include <QSize>
@@ -40,11 +38,14 @@
 #include <QStringList>
 #include <QUrl>
 #include <QColor>
-#include <QXmlStreamReader>
 #include <QtEvents>
 
 #include "core/song.h"
 
+class QWidget;
+class QIODevice;
+class QXmlStreamReader;
+
 namespace Utilities {
 QString PrettyTime(int seconds);
 QString PrettyTimeDelta(int seconds);