Reduce includes

2020-02-09 02:29:35 +01:00
parent 84cd65dd6c
commit 1851f26e3f
284 changed files with 742 additions and 665 deletions
--- a/src/device/cddadevice.h
+++ b/src/device/cddadevice.h
@@ -23,7 +23,6 @@

 #include "config.h"

-
 #include <QObject>
 #include <QString>
 #include <QStringList>
--- a/src/device/cddalister.h
+++ b/src/device/cddalister.h
@@ -23,7 +23,6 @@

 #include <config.h>

-
 #include <QtGlobal>
 #include <QObject>
 #include <QMetaType>
--- a/src/device/connecteddevice.cpp
+++ b/src/device/connecteddevice.cpp
@@ -20,6 +20,7 @@
 */

 #include <QObject>
+#include <QThread>
 #include <QAbstractItemModel>
 #include <QVariant>
 #include <QString>
@@ -35,6 +36,7 @@
 #include "connecteddevice.h"
 #include "devicelister.h"
 #include "devicemanager.h"
+#include "deviceinfo.h"

 ConnectedDevice::ConnectedDevice(const QUrl &url, DeviceLister *lister, const QString &unique_id, DeviceManager *manager, Application *app, int database_id, bool first_time)
    : QObject(manager),
--- a/src/device/devicedatabasebackend.cpp
+++ b/src/device/devicedatabasebackend.cpp
@@ -23,7 +23,6 @@
 #include <assert.h>

 #include <QObject>
-#include <QApplication>
 #include <QThread>
 #include <QMutex>
 #include <QIODevice>
@@ -36,7 +35,6 @@

 #include "core/database.h"
 #include "core/scopedtransaction.h"
-#include "core/logging.h"
 #include "devicedatabasebackend.h"

 const int DeviceDatabaseBackend::kDeviceSchemaVersion = 1;
--- a/src/device/devicedatabasebackend.h
+++ b/src/device/devicedatabasebackend.h
@@ -25,10 +25,9 @@

 #include <QtGlobal>
 #include <QObject>
-#include <QList>
 #include <QSet>
+#include <QList>
 #include <QString>
-#include <QVector>

 #include "core/song.h"
 #include "core/musicstorage.h"
--- a/src/device/deviceinfo.cpp
+++ b/src/device/deviceinfo.cpp
@@ -21,20 +21,18 @@

 #include "config.h"

-
-#include <QObject>
 #include <QVariant>
+#include <QVariantList>
 #include <QString>
 #include <QStringList>
 #include <QIcon>
 #include <QPixmap>

 #include "core/iconloader.h"
-#include "core/logging.h"
-#include "core/simpletreemodel.h"

-#include "deviceinfo.h"
+#include "devicelister.h"
 #include "devicedatabasebackend.h"
+#include "deviceinfo.h"

 DeviceDatabaseBackend::Device DeviceInfo::SaveToDb() const {

--- a/src/device/deviceinfo.h
+++ b/src/device/deviceinfo.h
@@ -27,21 +27,19 @@
 #include <memory>

 #include <QtGlobal>
-#include <QObject>
+#include <QMetaType>
 #include <QList>
-#include <QVariant>
+#include <QVariantList>
 #include <QString>
-#include <QStringList>
 #include <QIcon>

 #include "core/song.h"
 #include "core/musicstorage.h"
 #include "core/simpletreemodel.h"
 #include "core/simpletreeitem.h"
-#include "collection/collectionmodel.h"
 #include "devicedatabasebackend.h"
-#include "devicelister.h"

+class DeviceLister;
 class ConnectedDevice;

 // Devices can be in three different states:
--- a/src/device/devicelister.h
+++ b/src/device/devicelister.h
@@ -26,13 +26,14 @@

 #include <QtGlobal>
 #include <QObject>
-#include <QThread>
 #include <QList>
 #include <QMetaType>
 #include <QString>
 #include <QStringList>
 #include <QUrl>

+class QThread;
+
 class DeviceLister : public QObject {
  Q_OBJECT

--- a/src/device/devicemanager.cpp
+++ b/src/device/devicemanager.cpp
@@ -24,6 +24,7 @@
 #include <memory>
 #include <functional>

+#include <QtGlobal>
 #include <QApplication>
 #include <QObject>
 #include <QMetaObject>
--- a/src/device/devicemanager.h
+++ b/src/device/devicemanager.h
@@ -26,7 +26,6 @@

 #include <memory>

-#include <QtGlobal>
 #include <QObject>
 #include <QMetaObject>
 #include <QThreadPool>
@@ -34,7 +33,6 @@
 #include <QList>
 #include <QMap>
 #include <QMultiMap>
-#include <QMetaType>
 #include <QVariant>
 #include <QString>
 #include <QStringList>
@@ -48,6 +46,9 @@
 #include "devicedatabasebackend.h"
 #include "deviceinfo.h"

+class QModelIndex;
+class QPersistentModelIndex;
+
 class Application;
 class ConnectedDevice;
 class DeviceLister;
--- a/src/device/deviceproperties.cpp
+++ b/src/device/deviceproperties.cpp
@@ -29,7 +29,6 @@
 #include <QDialog>
 #include <QtConcurrentRun>
 #include <QFuture>
-#include <QMetaType>
 #include <QMap>
 #include <QSize>
 #include <QByteArray>
@@ -55,7 +54,6 @@
 #include "connecteddevice.h"
 #include "devicelister.h"
 #include "devicemanager.h"
-#include "deviceinfo.h"
 #include "deviceproperties.h"
 #ifdef HAVE_GSTREAMER
 #  include "transcoder/transcoder.h"
--- a/src/device/deviceproperties.h
+++ b/src/device/deviceproperties.h
@@ -24,18 +24,17 @@

 #include "config.h"

-
 #include <QObject>
 #include <QDialog>
-#include <QWidget>
 #include <QFuture>
 #include <QAbstractItemModel>
-#include <QPersistentModelIndex>
 #include <QList>
 #include <QString>

 #include "core/song.h"

+class QWidget;
+
 class DeviceManager;
 class Ui_DeviceProperties;

--- a/src/device/devicestatefiltermodel.cpp
+++ b/src/device/devicestatefiltermodel.cpp
@@ -20,6 +20,7 @@

 #include "config.h"

+#include <QtGlobal>
 #include <QObject>
 #include <QSortFilterProxyModel>
 #include <QAbstractItemModel>
--- a/src/device/devicestatefiltermodel.h
+++ b/src/device/devicestatefiltermodel.h
@@ -23,14 +23,15 @@

 #include "config.h"

-
 #include <QObject>
 #include <QString>
-#include <QAbstractItemModel>
 #include <QSortFilterProxyModel>

 #include "devicemanager.h"

+class QAbstractItemModel;
+class QModelIndex;
+
 class DeviceStateFilterModel : public QSortFilterProxyModel {
  Q_OBJECT

--- a/src/device/deviceview.cpp
+++ b/src/device/deviceview.cpp
@@ -50,7 +50,6 @@
 #include <QMessageBox>
 #include <QtEvents>

-#include "core/logging.h"
 #include "core/iconloader.h"
 #include "core/application.h"
 #include "core/deletefiles.h"
@@ -65,7 +64,6 @@
 #include "connecteddevice.h"
 #include "devicelister.h"
 #include "devicemanager.h"
-#include "deviceinfo.h"
 #include "deviceproperties.h"
 #include "deviceview.h"

--- a/src/device/deviceview.h
+++ b/src/device/deviceview.h
@@ -27,22 +27,23 @@
 #include <memory>

 #include <QObject>
-#include <QWidget>
-#include <QString>
 #include <QStyleOption>
 #include <QStyleOptionViewItem>
-#include <QSortFilterProxyModel>
 #include <QAbstractItemModel>
-#include <QPainter>
-#include <QAction>
-#include <QMenu>
-#include <QMouseEvent>
-#include <QContextMenuEvent>
+#include <QString>

 #include "core/song.h"
 #include "collection/collectionitemdelegate.h"
 #include "widgets/autoexpandingtreeview.h"

+class QSortFilterProxyModel;
+class QPainter;
+class QWidget;
+class QMenu;
+class QAction;
+class QMouseEvent;
+class QContextMenuEvent;
+
 class Application;
 class DeviceProperties;
 class MergedProxyModel;
--- a/src/device/deviceviewcontainer.cpp
+++ b/src/device/deviceviewcontainer.cpp
@@ -20,7 +20,6 @@

 #include "config.h"

-#include <QtGlobal>
 #include <QWidget>

 #include "deviceviewcontainer.h"
--- a/src/device/deviceviewcontainer.h
+++ b/src/device/deviceviewcontainer.h
@@ -23,11 +23,9 @@

 #include "config.h"

-
 #include <QObject>
 #include <QWidget>
 #include <QString>
-#include <QShowEvent>

 class DeviceView;
 class Ui_DeviceViewContainer;
--- a/src/device/filesystemdevice.cpp
+++ b/src/device/filesystemdevice.cpp
@@ -23,9 +23,9 @@
 #include <assert.h>

 #include <QThread>
-#include <QVariant>
 #include <QString>
 #include <QUrl>
+#include <QtDebug>

 #include "core/application.h"
 #include "core/logging.h"
--- a/src/device/filesystemdevice.h
+++ b/src/device/filesystemdevice.h
@@ -23,9 +23,7 @@

 #include "config.h"

-
 #include <QObject>
-#include <QThread>
 #include <QList>
 #include <QString>
 #include <QStringList>
@@ -34,6 +32,7 @@
 #include "core/filesystemmusicstorage.h"
 #include "connecteddevice.h"

+class QThread;
 class Application;
 class CollectionWatcher;
 class DeviceLister;
--- a/src/device/gpoddevice.cpp
+++ b/src/device/gpoddevice.cpp
@@ -32,6 +32,7 @@
 #include <QList>
 #include <QString>
 #include <QUrl>
+#include <QImage>
 #include <QtDebug>

 #include "core/logging.h"
--- a/src/device/gpoddevice.h
+++ b/src/device/gpoddevice.h
@@ -27,7 +27,6 @@

 #include <QObject>
 #include <QMutex>
-#include <QThread>
 #include <QWaitCondition>
 #include <QList>
 #include <QString>
@@ -39,6 +38,7 @@
 #include "connecteddevice.h"
 #include "gpodloader.h"

+class QThread;
 class Application;
 class DeviceLister;
 class DeviceManager;
--- a/src/device/gpodloader.h
+++ b/src/device/gpodloader.h
@@ -27,11 +27,11 @@
 #include <gpod/itdb.h>

 #include <QObject>
-#include <QThread>
 #include <QString>

 #include "core/song.h"

+class QThread;
 class TaskManager;
 class CollectionBackend;
 class ConnectedDevice;
--- a/src/device/mtpconnection.cpp
+++ b/src/device/mtpconnection.cpp
@@ -22,7 +22,9 @@
 #include "config.h"

 #include <stdlib.h>
+#include <stdint.h>

+#include <QList>
 #include <QByteArray>
 #include <QString>
 #include <QRegExp>
--- a/src/device/mtpconnection.h
+++ b/src/device/mtpconnection.h
@@ -28,6 +28,7 @@
 #include <libmtp.h>

 #include <QtGlobal>
+#include <QObject>
 #include <QList>
 #include <QUrl>

--- a/src/device/mtpdevice.cpp
+++ b/src/device/mtpdevice.cpp
@@ -25,7 +25,6 @@
 #include <stdint.h>
 #include <stdlib.h>

-#include <QtGlobal>
 #include <QThread>
 #include <QMutex>
 #include <QFile>
--- a/src/device/mtpdevice.h
+++ b/src/device/mtpdevice.h
@@ -27,7 +27,6 @@
 #include <memory>

 #include <QObject>
-#include <QThread>
 #include <QMutex>
 #include <QList>
 #include <QString>
@@ -36,12 +35,12 @@

 #include "core/song.h"
 #include "connecteddevice.h"
-#include "mtploader.h"

+class QThread;
 class Application;
 class DeviceLister;
 class DeviceManager;
-class DeviceConnection;
+class MtpLoader;
 class MtpConnection;
 struct LIBMTP_mtpdevice_struct;

--- a/src/device/mtploader.cpp
+++ b/src/device/mtploader.cpp
@@ -28,10 +28,7 @@

 #include "core/taskmanager.h"
 #include "core/song.h"
-#include "core/logging.h"
 #include "collection/collectionbackend.h"
-#include "connecteddevice.h"
-#include "mtpdevice.h"
 #include "mtpconnection.h"
 #include "mtploader.h"

--- a/src/device/mtploader.h
+++ b/src/device/mtploader.h
@@ -27,14 +27,12 @@
 #include <memory>

 #include <QObject>
-#include <QThread>
 #include <QString>
 #include <QUrl>

+class QThread;
 class TaskManager;
 class CollectionBackend;
-class ConnectedDevice;
-class MtpDevice;
 class MtpConnection;

 class MtpLoader : public QObject {
--- a/src/device/udisks2lister.h
+++ b/src/device/udisks2lister.h
@@ -30,7 +30,6 @@
 #include <QMutex>
 #include <QList>
 #include <QMap>
-#include <QMetaType>
 #include <QReadWriteLock>
 #include <QString>
 #include <QStringList>