Funkwhale/strawberry-audio-player-windows-mac-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Reduce includes

Browse Source
This commit is contained in:
Jonas Kvinge 2020-02-09 02:29:35 +01:00
parent 84cd65dd6c
commit 1851f26e3f
284 changed files with 742 additions and 665 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/core/dbusscreensaver.h
View File

@ -26,7 +26,6 @@
#include <QtGlobal> #include <QtGlobal>
#include <QString> #include <QString>
#include "config.h"
#include "screensaver.h" #include "screensaver.h"
class DBusScreensaver : public Screensaver { class DBusScreensaver : public Screensaver {

1
src/core/mpris.h
View File

@ -30,7 +30,6 @@ class Application;
namespace mpris { namespace mpris {
class Mpris1;
class Mpris2; class Mpris2;
class Mpris : public QObject { class Mpris : public QObject {

2
src/core/mpris2.cpp
View File

@ -26,6 +26,7 @@
#include <QApplication> #include <QApplication>
#include <QCoreApplication> #include <QCoreApplication>
#include <QGuiApplication>
#include <QObject> #include <QObject>
#include <QFile> #include <QFile>
#include <QList> #include <QList>
@ -35,6 +36,7 @@
#include <QString> #include <QString>
#include <QStringList> #include <QStringList>
#include <QUrl> #include <QUrl>
#include <QImage>
#include <QDBusConnection> #include <QDBusConnection>
#include <QDBusMessage> #include <QDBusMessage>
#include <QDBusArgument> #include <QDBusArgument>

2
src/core/mpris2.h
View File

@ -23,7 +23,6 @@
#include "config.h" #include "config.h"
#include <QtGlobal> #include <QtGlobal>
#include <QObject> #include <QObject>
#include <QList> #include <QList>
@ -34,7 +33,6 @@
#include <QString> #include <QString>
#include <QStringList> #include <QStringList>
#include <QImage> #include <QImage>
#include <QVector>
#include <QtDBus> #include <QtDBus>
#include <QDBusArgument> #include <QDBusArgument>
#include <qdbusextratypes.h> #include <qdbusextratypes.h>

11
src/covermanager/albumcoverchoicecontroller.cpp
View File

@ -28,14 +28,13 @@
#include <QWidget> #include <QWidget>
#include <QDialog> #include <QDialog>
#include <QDir> #include <QDir>
#include <QFile>
#include <QFileInfo> #include <QFileInfo>
#include <QList>
#include <QSet>
#include <QMimeData> #include <QMimeData>
#include <QByteArray> #include <QSet>
#include <QList>
#include <QVariant> #include <QVariant>
#include <QString> #include <QString>
#include <QStringBuilder>
#include <QRegExp> #include <QRegExp>
#include <QUrl> #include <QUrl>
#include <QImage> #include <QImage>
@ -43,12 +42,12 @@
#include <QPixmap> #include <QPixmap>
#include <QIcon> #include <QIcon>
#include <QRect> #include <QRect>
#include <QAction>
#include <QFileDialog> #include <QFileDialog>
#include <QLabel> #include <QLabel>
#include <QAction>
#include <QSettings>
#include <QtEvents> #include <QtEvents>
#include "core/utilities.h"
#include "core/song.h" #include "core/song.h"
#include "core/iconloader.h" #include "core/iconloader.h"
#include "core/application.h" #include "core/application.h"

14
src/covermanager/albumcoverchoicecontroller.h
View File

@ -24,22 +24,24 @@
#include "config.h" #include "config.h"
#include <QtGlobal> #include <QtGlobal>
#include <QObject> #include <QObject>
#include <QWidget> #include <QWidget>
#include <QSet>
#include <QList> #include <QList>
#include <QMap> #include <QMap>
#include <QSet>
#include <QString> #include <QString>
#include <QUrl>
#include <QImage> #include <QImage>
#include <QAction>
#include <QFileDialog>
#include <QtEvents>
#include "core/song.h"
#include "settings/collectionsettingspage.h" #include "settings/collectionsettingspage.h"
class Song; class QFileDialog;
class QAction;
class QDragEnterEvent;
class QDropEvent;
class Application; class Application;
class AlbumCoverFetcher; class AlbumCoverFetcher;
class AlbumCoverSearcher; class AlbumCoverSearcher;

3
src/covermanager/albumcoverexport.h
View File

@ -23,12 +23,11 @@
#include "config.h" #include "config.h"
#include <QObject> #include <QObject>
#include <QWidget>
#include <QDialog> #include <QDialog>
#include <QString> #include <QString>
class QWidget;
class Ui_AlbumCoverExport; class Ui_AlbumCoverExport;
// Controller for the "Export covers" dialog. // Controller for the "Export covers" dialog.

1
src/covermanager/albumcoverexporter.cpp
View File

@ -24,6 +24,7 @@
#include <QThreadPool> #include <QThreadPool>
#include "core/song.h" #include "core/song.h"
#include "albumcoverexport.h"
#include "albumcoverexporter.h" #include "albumcoverexporter.h"
#include "coverexportrunnable.h" #include "coverexportrunnable.h"

2
src/covermanager/albumcoverexporter.h
View File

@ -24,12 +24,12 @@
#include "config.h" #include "config.h"
#include <QObject> #include <QObject>
#include <QThreadPool>
#include <QQueue> #include <QQueue>
#include <QString> #include <QString>
#include "albumcoverexport.h" #include "albumcoverexport.h"
class QThreadPool;
class Song; class Song;
class CoverExportRunnable; class CoverExportRunnable;

2
src/covermanager/albumcoverfetchersearch.cpp
View File

@ -24,7 +24,6 @@
#include <cmath> #include <cmath>
#include <QObject> #include <QObject>
#include <QtAlgorithms>
#include <QTimer> #include <QTimer>
#include <QList> #include <QList>
#include <QString> #include <QString>
@ -37,7 +36,6 @@
#include "core/closure.h" #include "core/closure.h"
#include "core/logging.h" #include "core/logging.h"
#include "core/network.h"
#include "core/networktimeouts.h" #include "core/networktimeouts.h"
#include "albumcoverfetcher.h" #include "albumcoverfetcher.h"
#include "albumcoverfetchersearch.h" #include "albumcoverfetchersearch.h"

7
src/covermanager/albumcoverfetchersearch.h
View File

@ -23,19 +23,18 @@
#include "config.h" #include "config.h"
#include <QtGlobal> #include <QtGlobal>
#include <QObject> #include <QObject>
#include <QList>
#include <QMap>
#include <QPair> #include <QPair>
#include <QMap>
#include <QString> #include <QString>
#include <QUrl>
#include <QImage> #include <QImage>
#include <QNetworkAccessManager>
#include "albumcoverfetcher.h" #include "albumcoverfetcher.h"
#include "coversearchstatistics.h" #include "coversearchstatistics.h"
class QNetworkAccessManager;
class QNetworkReply; class QNetworkReply;
class CoverProvider; class CoverProvider;
class CoverProviders; class CoverProviders;

4
src/covermanager/albumcoverloader.cpp
View File

@ -27,18 +27,16 @@
#include <QDir> #include <QDir>
#include <QThread> #include <QThread>
#include <QMutex> #include <QMutex>
#include <QSet>
#include <QList> #include <QList>
#include <QQueue> #include <QQueue>
#include <QSet>
#include <QVariant> #include <QVariant>
#include <QString> #include <QString>
#include <QStringBuilder>
#include <QUrl> #include <QUrl>
#include <QImage> #include <QImage>
#include <QPixmap> #include <QPixmap>
#include <QPainter> #include <QPainter>
#include <QSize> #include <QSize>
#include <QNetworkAccessManager>
#include <QNetworkReply> #include <QNetworkReply>
#include <QNetworkRequest> #include <QNetworkRequest>
#include <QSettings> #include <QSettings>

10
src/covermanager/albumcoverloader.h
View File

@ -24,24 +24,22 @@
#include "config.h" #include "config.h"
#include <QtGlobal> #include <QtGlobal>
#include <QObject> #include <QObject>
#include <QMutex> #include <QMutex>
#include <QQueue>
#include <QMap>
#include <QSet> #include <QSet>
#include <QMap>
#include <QQueue>
#include <QString> #include <QString>
#include <QImage> #include <QImage>
#include <QPixmap> #include <QPixmap>
#include <QNetworkReply>
#include "core/song.h" #include "core/song.h"
#include "settings/collectionsettingspage.h" #include "settings/collectionsettingspage.h"
#include "albumcoverloaderoptions.h" #include "albumcoverloaderoptions.h"
class QThread; class QThread;
class Song; class QNetworkReply;
class NetworkAccessManager; class NetworkAccessManager;
class AlbumCoverLoader : public QObject { class AlbumCoverLoader : public QObject {
@ -117,7 +115,7 @@ class AlbumCoverLoader : public QObject {
QMutex mutex_; QMutex mutex_;
QQueue<Task> tasks_; QQueue<Task> tasks_;
QMap<QNetworkReply *, Task> remote_tasks_; QMap<QNetworkReply*, Task> remote_tasks_;
quint64 next_id_; quint64 next_id_;
NetworkAccessManager *network_; NetworkAccessManager *network_;

6
src/covermanager/albumcoversearcher.cpp
View File

@ -20,15 +20,13 @@
#include "config.h" #include "config.h"
#include <QWidget> #include <QWidget>
#include <QDialog> #include <QDialog>
#include <QStandardItem>
#include <QStandardItemModel> #include <QStandardItemModel>
#include <QAbstractItemModel> #include <QAbstractItemModel>
#include <QStyledItemDelegate> #include <QStyledItemDelegate>
#include <QStyleOptionViewItem> #include <QStyleOptionViewItem>
#include <QSize> #include <QStandardItem>
#include <QList> #include <QList>
#include <QVariant> #include <QVariant>
#include <QString> #include <QString>
@ -41,6 +39,7 @@
#include <QFontMetrics> #include <QFontMetrics>
#include <QColor> #include <QColor>
#include <QRect> #include <QRect>
#include <QSize>
#include <QDialogButtonBox> #include <QDialogButtonBox>
#include <QPushButton> #include <QPushButton>
#include <QKeySequence> #include <QKeySequence>
@ -55,6 +54,7 @@
#include "albumcoversearcher.h" #include "albumcoversearcher.h"
#include "albumcoverfetcher.h" #include "albumcoverfetcher.h"
#include "albumcoverloader.h" #include "albumcoverloader.h"
#include "albumcoverloaderoptions.h"
#include "ui_albumcoversearcher.h" #include "ui_albumcoversearcher.h"
const int SizeOverlayDelegate::kMargin = 4; const int SizeOverlayDelegate::kMargin = 4;

18
src/covermanager/albumcoversearcher.h
View File

@ -25,24 +25,24 @@
#include <QtGlobal> #include <QtGlobal>
#include <QObject> #include <QObject>
#include <QWidget>
#include <QDialog> #include <QDialog>
#include <QStandardItem> #include <QStyleOption>
#include <QStandardItemModel> #include <QStyledItemDelegate>
#include <QStyleOptionViewItem>
#include <QMap> #include <QMap>
#include <QString> #include <QString>
#include <QImage> #include <QImage>
#include <QIcon> #include <QIcon>
#include <QPainter>
#include <QStyleOption>
#include <QStyledItemDelegate>
#include <QStyleOptionViewItem>
#include <QtEvents>
#include "albumcoverfetcher.h" #include "albumcoverfetcher.h"
#include "albumcoverloaderoptions.h" #include "albumcoverloaderoptions.h"
class QWidget;
class QStandardItem;
class QStandardItemModel;
class QPainter;
class QModelIndex; class QModelIndex;
class QKeyEvent;
class Application; class Application;
class Ui_AlbumCoverSearcher; class Ui_AlbumCoverSearcher;
@ -83,7 +83,7 @@ public:
QImage Exec(const QString &artist, const QString &album); QImage Exec(const QString &artist, const QString &album);
protected: protected:
void keyPressEvent(QKeyEvent *); void keyPressEvent(QKeyEvent*);
private slots: private slots:
void Search(); void Search();

1
src/covermanager/coverexportrunnable.cpp
View File

@ -29,6 +29,7 @@
#include "core/song.h" #include "core/song.h"
#include "core/tagreaderclient.h" #include "core/tagreaderclient.h"
#include "albumcoverexport.h"
#include "coverexportrunnable.h" #include "coverexportrunnable.h"
CoverExportRunnable::CoverExportRunnable(const AlbumCoverExport::DialogResult &dialog_result, const Song &song) : CoverExportRunnable::CoverExportRunnable(const AlbumCoverExport::DialogResult &dialog_result, const Song &song) :

2
src/covermanager/coverexportrunnable.h
View File

@ -30,8 +30,6 @@
#include "core/song.h" #include "core/song.h"
#include "albumcoverexport.h" #include "albumcoverexport.h"
class AlbumCoverExporter;
class CoverExportRunnable : public QObject, public QRunnable { class CoverExportRunnable : public QObject, public QRunnable {
Q_OBJECT Q_OBJECT

3
src/covermanager/coverfromurldialog.h
View File

@ -24,11 +24,12 @@
#include "config.h" #include "config.h"
#include <QObject> #include <QObject>
#include <QWidget>
#include <QDialog> #include <QDialog>
#include <QString> #include <QString>
#include <QImage> #include <QImage>
class QWidget;
class NetworkAccessManager; class NetworkAccessManager;
class Ui_CoverFromURLDialog; class Ui_CoverFromURLDialog;

3
src/covermanager/coverprovider.h
View File

@ -23,9 +23,8 @@
#include "config.h" #include "config.h"
#include <QtGlobal>
#include <QObject> #include <QObject>
#include <QList>
#include <QString> #include <QString>
#include "albumcoverfetcher.h" #include "albumcoverfetcher.h"

1
src/covermanager/coverproviders.h
View File

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

1
src/covermanager/coversearchstatistics.h
View File

@ -24,6 +24,7 @@
#include "config.h" #include "config.h"
#include <QtGlobal> #include <QtGlobal>
#include <QList>
#include <QMap> #include <QMap>
#include <QString> #include <QString>

3
src/covermanager/coversearchstatisticsdialog.cpp
View File

@ -22,14 +22,15 @@
#include <algorithm> #include <algorithm>
#include <QtGlobal>
#include <QWidget> #include <QWidget>
#include <QList>
#include <QMap> #include <QMap>
#include <QString> #include <QString>
#include <QStringList> #include <QStringList>
#include <QBoxLayout> #include <QBoxLayout>
#include <QLabel> #include <QLabel>
#include <QFrame> #include <QFrame>
#include <QtAlgorithms>
#include "core/utilities.h" #include "core/utilities.h"
#include "coversearchstatistics.h" #include "coversearchstatistics.h"

5
src/covermanager/coversearchstatisticsdialog.h
View File

@ -25,9 +25,10 @@
#include <QObject> #include <QObject>
#include <QDialog> #include <QDialog>
#include <QWidget>
#include <QString> #include <QString>
#include <QBoxLayout>
class QWidget;
class QVBoxLayout;
class Ui_CoverSearchStatisticsDialog; class Ui_CoverSearchStatisticsDialog;
struct CoverSearchStatistics; struct CoverSearchStatistics;

2
src/covermanager/currentalbumcoverloader.cpp
View File

@ -27,12 +27,12 @@
#include <QString> #include <QString>
#include <QStringBuilder> #include <QStringBuilder>
#include <QImage> #include <QImage>
#include <QStandardPaths>
#include <QTemporaryFile> #include <QTemporaryFile>
#include "core/application.h" #include "core/application.h"
#include "playlist/playlistmanager.h" #include "playlist/playlistmanager.h"
#include "albumcoverloader.h" #include "albumcoverloader.h"
#include "albumcoverloaderoptions.h"
#include "currentalbumcoverloader.h" #include "currentalbumcoverloader.h"
CurrentAlbumCoverLoader::CurrentAlbumCoverLoader(Application *app, QObject *parent) CurrentAlbumCoverLoader::CurrentAlbumCoverLoader(Application *app, QObject *parent)

8
src/covermanager/deezercoverprovider.cpp
View File

@ -19,10 +19,10 @@
#include "config.h" #include "config.h"
#include <algorithm> #include <QtGlobal>
#include <functional>
#include <QObject> #include <QObject>
#include <QPair>
#include <QSet>
#include <QList> #include <QList>
#include <QVariant> #include <QVariant>
#include <QByteArray> #include <QByteArray>
@ -36,11 +36,13 @@
#include <QJsonValue> #include <QJsonValue>
#include <QJsonObject> #include <QJsonObject>
#include <QJsonArray> #include <QJsonArray>
#include <QtDebug>
#include "core/application.h" #include "core/application.h"
#include "core/closure.h" #include "core/closure.h"
#include "core/network.h" #include "core/network.h"
#include "core/logging.h" #include "core/logging.h"
#include "core/song.h"
#include "albumcoverfetcher.h" #include "albumcoverfetcher.h"
#include "coverprovider.h" #include "coverprovider.h"
#include "deezercoverprovider.h" #include "deezercoverprovider.h"

6
src/covermanager/deezercoverprovider.h
View File

@ -22,19 +22,17 @@
#include "config.h" #include "config.h"
#include <QObject> #include <QObject>
#include <QVariant> #include <QVariant>
#include <QByteArray> #include <QByteArray>
#include <QString> #include <QString>
#include <QNetworkAccessManager>
#include <QNetworkReply>
#include <QJsonValue> #include <QJsonValue>
#include <QJsonObject> #include <QJsonObject>
#include <QJsonArray>
#include "coverprovider.h" #include "coverprovider.h"
class QNetworkAccessManager;
class QNetworkReply;
class Application; class Application;
class DeezerCoverProvider : public CoverProvider { class DeezerCoverProvider : public CoverProvider {

7
src/covermanager/discogscoverprovider.cpp
View File

@ -21,13 +21,17 @@
#include "config.h" #include "config.h"
#include <algorithm>
#include <type_traits>
#include <QtGlobal>
#include <QObject> #include <QObject>
#include <QByteArray> #include <QByteArray>
#include <QList> #include <QList>
#include <QPair> #include <QPair>
#include <QSet>
#include <QVariant> #include <QVariant>
#include <QString> #include <QString>
#include <QStringBuilder>
#include <QStringList> #include <QStringList>
#include <QUrl> #include <QUrl>
#include <QUrlQuery> #include <QUrlQuery>
@ -38,6 +42,7 @@
#include <QJsonObject> #include <QJsonObject>
#include <QJsonValue> #include <QJsonValue>
#include <QJsonArray> #include <QJsonArray>
#include <QtDebug>
#include "core/application.h" #include "core/application.h"
#include "core/closure.h" #include "core/closure.h"

11
src/covermanager/discogscoverprovider.h
View File

@ -24,17 +24,20 @@
#include "config.h" #include "config.h"
#include <QObject> #include <QObject>
#include <QHash>
#include <QMetaType> #include <QMetaType>
#include <QHash>
#include <QVariant>
#include <QByteArray>
#include <QString> #include <QString>
#include <QNetworkAccessManager> #include <QJsonObject>
#include <QNetworkReply> #include <QJsonValue>
#include "coverprovider.h" #include "coverprovider.h"
#include "albumcoverfetcher.h" #include "albumcoverfetcher.h"
class QNetworkAccessManager;
class QNetworkReply;
class Application; class Application;
// This struct represents a single search-for-cover request. It identifies and describes the request. // This struct represents a single search-for-cover request. It identifies and describes the request.

6
src/covermanager/lastfmcoverprovider.cpp
View File

@ -19,14 +19,17 @@
#include "config.h" #include "config.h"
#include <QtGlobal>
#include <QObject> #include <QObject>
#include <QLocale>
#include <QList> #include <QList>
#include <QPair> #include <QPair>
#include <QSet>
#include <QByteArray> #include <QByteArray>
#include <QString> #include <QString>
#include <QStringBuilder>
#include <QUrl> #include <QUrl>
#include <QUrlQuery> #include <QUrlQuery>
#include <QNetworkAccessManager>
#include <QNetworkRequest> #include <QNetworkRequest>
#include <QNetworkReply> #include <QNetworkReply>
#include <QCryptographicHash> #include <QCryptographicHash>
@ -34,6 +37,7 @@
#include <QJsonValue> #include <QJsonValue>
#include <QJsonObject> #include <QJsonObject>
#include <QJsonArray> #include <QJsonArray>
#include <QtDebug>
#include "core/application.h" #include "core/application.h"
#include "core/closure.h" #include "core/closure.h"

6
src/covermanager/lastfmcoverprovider.h
View File

@ -22,19 +22,17 @@
#include "config.h" #include "config.h"
#include <QObject> #include <QObject>
#include <QVariant> #include <QVariant>
#include <QByteArray> #include <QByteArray>
#include <QString> #include <QString>
#include <QNetworkAccessManager>
#include <QNetworkReply>
#include <QJsonValue> #include <QJsonValue>
#include <QJsonObject> #include <QJsonObject>
#include <QJsonArray>
#include "coverprovider.h" #include "coverprovider.h"
class QNetworkAccessManager;
class QNetworkReply;
class Application; class Application;
class LastFmCoverProvider : public CoverProvider { class LastFmCoverProvider : public CoverProvider {

6
src/covermanager/musicbrainzcoverprovider.cpp
View File

@ -19,11 +19,8 @@
#include "config.h" #include "config.h"
#include <algorithm> #include <QtGlobal>
#include <functional>
#include <QObject> #include <QObject>
#include <QList>
#include <QVariant> #include <QVariant>
#include <QByteArray> #include <QByteArray>
#include <QString> #include <QString>
@ -36,6 +33,7 @@
#include <QJsonValue> #include <QJsonValue>
#include <QJsonObject> #include <QJsonObject>
#include <QJsonArray> #include <QJsonArray>
#include <QtDebug>
#include "core/application.h" #include "core/application.h"
#include "core/closure.h" #include "core/closure.h"

6
src/covermanager/musicbrainzcoverprovider.h
View File

@ -22,18 +22,16 @@
#include "config.h" #include "config.h"
#include <QObject> #include <QObject>
#include <QByteArray> #include <QByteArray>
#include <QVariant> #include <QVariant>
#include <QString> #include <QString>
#include <QNetworkAccessManager>
#include <QNetworkReply>
#include <QJsonObject> #include <QJsonObject>
#include "coverprovider.h" #include "coverprovider.h"
#include "albumcoverfetcher.h"
class QNetworkAccessManager;
class QNetworkReply;
class Application; class Application;
class MusicbrainzCoverProvider : public CoverProvider { class MusicbrainzCoverProvider : public CoverProvider {

6
src/covermanager/tidalcoverprovider.cpp
View File

@ -19,7 +19,7 @@
#include "config.h" #include "config.h"
#include <QtGlobal>
#include <QObject> #include <QObject>
#include <QList> #include <QList>
#include <QVariant> #include <QVariant>
@ -27,19 +27,21 @@
#include <QString> #include <QString>
#include <QUrl> #include <QUrl>
#include <QUrlQuery> #include <QUrlQuery>
#include <QNetworkAccessManager>
#include <QNetworkRequest> #include <QNetworkRequest>
#include <QNetworkReply> #include <QNetworkReply>
#include <QJsonDocument> #include <QJsonDocument>
#include <QJsonValue> #include <QJsonValue>
#include <QJsonObject> #include <QJsonObject>
#include <QJsonArray> #include <QJsonArray>
#include <QtDebug>
#include "core/application.h" #include "core/application.h"
#include "core/closure.h" #include "core/closure.h"
#include "core/network.h" #include "core/network.h"
#include "core/logging.h" #include "core/logging.h"
#include "core/song.h"
#include "internet/internetservices.h" #include "internet/internetservices.h"
#include "settings/tidalsettingspage.h"
#include "tidal/tidalservice.h" #include "tidal/tidalservice.h"
#include "albumcoverfetcher.h" #include "albumcoverfetcher.h"
#include "coverprovider.h" #include "coverprovider.h"

8
src/covermanager/tidalcoverprovider.h
View File

@ -22,18 +22,20 @@
#include "config.h" #include "config.h"
#include <QObject> #include <QObject>
#include <QPair>
#include <QSet>
#include <QList>
#include <QVariant> #include <QVariant>
#include <QByteArray> #include <QByteArray>
#include <QString> #include <QString>
#include <QNetworkAccessManager>
#include <QNetworkReply>
#include <QJsonValue> #include <QJsonValue>
#include <QJsonObject> #include <QJsonObject>
#include "coverprovider.h" #include "coverprovider.h"
class QNetworkAccessManager;
class QNetworkReply;
class Application; class Application;
class TidalService; class TidalService;

1
src/device/cddadevice.h
View File

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

1
src/device/cddalister.h
View File

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

2
src/device/connecteddevice.cpp
View File

@ -20,6 +20,7 @@
*/ */
#include <QObject> #include <QObject>
#include <QThread>
#include <QAbstractItemModel> #include <QAbstractItemModel>
#include <QVariant> #include <QVariant>
#include <QString> #include <QString>
@ -35,6 +36,7 @@
#include "connecteddevice.h" #include "connecteddevice.h"
#include "devicelister.h" #include "devicelister.h"
#include "devicemanager.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) ConnectedDevice::ConnectedDevice(const QUrl &url, DeviceLister *lister, const QString &unique_id, DeviceManager *manager, Application *app, int database_id, bool first_time)
: QObject(manager), : QObject(manager),

2
src/device/devicedatabasebackend.cpp
View File

@ -23,7 +23,6 @@
#include <assert.h> #include <assert.h>
#include <QObject> #include <QObject>
#include <QApplication>
#include <QThread> #include <QThread>
#include <QMutex> #include <QMutex>
#include <QIODevice> #include <QIODevice>
@ -36,7 +35,6 @@
#include "core/database.h" #include "core/database.h"
#include "core/scopedtransaction.h" #include "core/scopedtransaction.h"
#include "core/logging.h"
#include "devicedatabasebackend.h" #include "devicedatabasebackend.h"
const int DeviceDatabaseBackend::kDeviceSchemaVersion = 1; const int DeviceDatabaseBackend::kDeviceSchemaVersion = 1;

3
src/device/devicedatabasebackend.h
View File

@ -25,10 +25,9 @@
#include <QtGlobal> #include <QtGlobal>
#include <QObject> #include <QObject>
#include <QList>
#include <QSet> #include <QSet>
#include <QList>
#include <QString> #include <QString>
#include <QVector>
#include "core/song.h" #include "core/song.h"
#include "core/musicstorage.h" #include "core/musicstorage.h"

8
src/device/deviceinfo.cpp
View File

@ -21,20 +21,18 @@
#include "config.h" #include "config.h"
#include <QObject>
#include <QVariant> #include <QVariant>
#include <QVariantList>
#include <QString> #include <QString>
#include <QStringList> #include <QStringList>
#include <QIcon> #include <QIcon>
#include <QPixmap> #include <QPixmap>
#include "core/iconloader.h" #include "core/iconloader.h"
#include "core/logging.h"
#include "core/simpletreemodel.h"
#include "deviceinfo.h" #include "devicelister.h"
#include "devicedatabasebackend.h" #include "devicedatabasebackend.h"
#include "deviceinfo.h"
DeviceDatabaseBackend::Device DeviceInfo::SaveToDb() const { DeviceDatabaseBackend::Device DeviceInfo::SaveToDb() const {

8
src/device/deviceinfo.h
View File

@ -27,21 +27,19 @@
#include <memory> #include <memory>
#include <QtGlobal> #include <QtGlobal>
#include <QObject> #include <QMetaType>
#include <QList> #include <QList>
#include <QVariant> #include <QVariantList>
#include <QString> #include <QString>
#include <QStringList>
#include <QIcon> #include <QIcon>
#include "core/song.h" #include "core/song.h"
#include "core/musicstorage.h" #include "core/musicstorage.h"
#include "core/simpletreemodel.h" #include "core/simpletreemodel.h"
#include "core/simpletreeitem.h" #include "core/simpletreeitem.h"
#include "collection/collectionmodel.h"
#include "devicedatabasebackend.h" #include "devicedatabasebackend.h"
#include "devicelister.h"
class DeviceLister;
class ConnectedDevice; class ConnectedDevice;
// Devices can be in three different states: // Devices can be in three different states:

3
src/device/devicelister.h
View File

@ -26,13 +26,14 @@
#include <QtGlobal> #include <QtGlobal>
#include <QObject> #include <QObject>
#include <QThread>
#include <QList> #include <QList>
#include <QMetaType> #include <QMetaType>
#include <QString> #include <QString>
#include <QStringList> #include <QStringList>
#include <QUrl> #include <QUrl>
class QThread;
class DeviceLister : public QObject { class DeviceLister : public QObject {
Q_OBJECT Q_OBJECT

1
src/device/devicemanager.cpp
View File

@ -24,6 +24,7 @@
#include <memory> #include <memory>
#include <functional> #include <functional>
#include <QtGlobal>
#include <QApplication> #include <QApplication>
#include <QObject> #include <QObject>
#include <QMetaObject> #include <QMetaObject>

5
src/device/devicemanager.h
View File

@ -26,7 +26,6 @@
#include <memory> #include <memory>
#include <QtGlobal>
#include <QObject> #include <QObject>
#include <QMetaObject> #include <QMetaObject>
#include <QThreadPool> #include <QThreadPool>
@ -34,7 +33,6 @@
#include <QList> #include <QList>
#include <QMap> #include <QMap>
#include <QMultiMap> #include <QMultiMap>
#include <QMetaType>
#include <QVariant> #include <QVariant>
#include <QString> #include <QString>
#include <QStringList> #include <QStringList>
@ -48,6 +46,9 @@
#include "devicedatabasebackend.h" #include "devicedatabasebackend.h"
#include "deviceinfo.h" #include "deviceinfo.h"
class QModelIndex;
class QPersistentModelIndex;
class Application; class Application;
class ConnectedDevice; class ConnectedDevice;
class DeviceLister; class DeviceLister;

2
src/device/deviceproperties.cpp
View File

@ -29,7 +29,6 @@
#include <QDialog> #include <QDialog>
#include <QtConcurrentRun> #include <QtConcurrentRun>
#include <QFuture> #include <QFuture>
#include <QMetaType>
#include <QMap> #include <QMap>
#include <QSize> #include <QSize>
#include <QByteArray> #include <QByteArray>
@ -55,7 +54,6 @@
#include "connecteddevice.h" #include "connecteddevice.h"
#include "devicelister.h" #include "devicelister.h"
#include "devicemanager.h" #include "devicemanager.h"
#include "deviceinfo.h"
#include "deviceproperties.h" #include "deviceproperties.h"
#ifdef HAVE_GSTREAMER #ifdef HAVE_GSTREAMER
# include "transcoder/transcoder.h" # include "transcoder/transcoder.h"

5
src/device/deviceproperties.h
View File

@ -24,18 +24,17 @@
#include "config.h" #include "config.h"
#include <QObject> #include <QObject>
#include <QDialog> #include <QDialog>
#include <QWidget>
#include <QFuture> #include <QFuture>
#include <QAbstractItemModel> #include <QAbstractItemModel>
#include <QPersistentModelIndex>
#include <QList> #include <QList>
#include <QString> #include <QString>
#include "core/song.h" #include "core/song.h"
class QWidget;
class DeviceManager; class DeviceManager;
class Ui_DeviceProperties; class Ui_DeviceProperties;

1
src/device/devicestatefiltermodel.cpp
View File

@ -20,6 +20,7 @@
#include "config.h" #include "config.h"
#include <QtGlobal>
#include <QObject> #include <QObject>
#include <QSortFilterProxyModel> #include <QSortFilterProxyModel>
#include <QAbstractItemModel> #include <QAbstractItemModel>

5
src/device/devicestatefiltermodel.h
View File

@ -23,14 +23,15 @@
#include "config.h" #include "config.h"
#include <QObject> #include <QObject>
#include <QString> #include <QString>
#include <QAbstractItemModel>
#include <QSortFilterProxyModel> #include <QSortFilterProxyModel>
#include "devicemanager.h" #include "devicemanager.h"
class QAbstractItemModel;
class QModelIndex;
class DeviceStateFilterModel : public QSortFilterProxyModel { class DeviceStateFilterModel : public QSortFilterProxyModel {
Q_OBJECT Q_OBJECT

2
src/device/deviceview.cpp
View File

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

17
src/device/deviceview.h
View File

@ -27,22 +27,23 @@
#include <memory> #include <memory>
#include <QObject> #include <QObject>
#include <QWidget>
#include <QString>
#include <QStyleOption> #include <QStyleOption>
#include <QStyleOptionViewItem> #include <QStyleOptionViewItem>
#include <QSortFilterProxyModel>
#include <QAbstractItemModel> #include <QAbstractItemModel>
#include <QPainter> #include <QString>
#include <QAction>
#include <QMenu>
#include <QMouseEvent>
#include <QContextMenuEvent>
#include "core/song.h" #include "core/song.h"
#include "collection/collectionitemdelegate.h" #include "collection/collectionitemdelegate.h"
#include "widgets/autoexpandingtreeview.h" #include "widgets/autoexpandingtreeview.h"
class QSortFilterProxyModel;
class QPainter;
class QWidget;
class QMenu;
class QAction;
class QMouseEvent;
class QContextMenuEvent;
class Application; class Application;
class DeviceProperties; class DeviceProperties;
class MergedProxyModel; class MergedProxyModel;

1
src/device/deviceviewcontainer.cpp
View File

@ -20,7 +20,6 @@
#include "config.h" #include "config.h"
#include <QtGlobal>
#include <QWidget> #include <QWidget>
#include "deviceviewcontainer.h" #include "deviceviewcontainer.h"

2
src/device/deviceviewcontainer.h
View File

@ -23,11 +23,9 @@
#include "config.h" #include "config.h"
#include <QObject> #include <QObject>
#include <QWidget> #include <QWidget>
#include <QString> #include <QString>
#include <QShowEvent>
class DeviceView; class DeviceView;
class Ui_DeviceViewContainer; class Ui_DeviceViewContainer;

2
src/device/filesystemdevice.cpp
View File

@ -23,9 +23,9 @@
#include <assert.h> #include <assert.h>
#include <QThread> #include <QThread>
#include <QVariant>
#include <QString> #include <QString>
#include <QUrl> #include <QUrl>
#include <QtDebug>
#include "core/application.h" #include "core/application.h"
#include "core/logging.h" #include "core/logging.h"

3
src/device/filesystemdevice.h
View File

@ -23,9 +23,7 @@
#include "config.h" #include "config.h"
#include <QObject> #include <QObject>
#include <QThread>
#include <QList> #include <QList>
#include <QString> #include <QString>
#include <QStringList> #include <QStringList>
@ -34,6 +32,7 @@
#include "core/filesystemmusicstorage.h" #include "core/filesystemmusicstorage.h"
#include "connecteddevice.h" #include "connecteddevice.h"
class QThread;
class Application; class Application;
class CollectionWatcher; class CollectionWatcher;
class DeviceLister; class DeviceLister;

1
src/device/gpoddevice.cpp
View File

@ -32,6 +32,7 @@
#include <QList> #include <QList>
#include <QString> #include <QString>
#include <QUrl> #include <QUrl>
#include <QImage>
#include <QtDebug> #include <QtDebug>
#include "core/logging.h" #include "core/logging.h"

2
src/device/gpoddevice.h
View File

@ -27,7 +27,6 @@
#include <QObject> #include <QObject>
#include <QMutex> #include <QMutex>
#include <QThread>
#include <QWaitCondition> #include <QWaitCondition>
#include <QList> #include <QList>
#include <QString> #include <QString>
@ -39,6 +38,7 @@
#include "connecteddevice.h" #include "connecteddevice.h"
#include "gpodloader.h" #include "gpodloader.h"
class QThread;
class Application; class Application;
class DeviceLister; class DeviceLister;
class DeviceManager; class DeviceManager;

2
src/device/gpodloader.h
View File

@ -27,11 +27,11 @@
#include <gpod/itdb.h> #include <gpod/itdb.h>
#include <QObject> #include <QObject>
#include <QThread>
#include <QString> #include <QString>
#include "core/song.h" #include "core/song.h"
class QThread;
class TaskManager; class TaskManager;
class CollectionBackend; class CollectionBackend;
class ConnectedDevice; class ConnectedDevice;

2
src/device/mtpconnection.cpp
View File

@ -22,7 +22,9 @@
#include "config.h" #include "config.h"
#include <stdlib.h> #include <stdlib.h>
#include <stdint.h>
#include <QList>
#include <QByteArray> #include <QByteArray>
#include <QString> #include <QString>
#include <QRegExp> #include <QRegExp>

1
src/device/mtpconnection.h
View File

@ -28,6 +28,7 @@
#include <libmtp.h> #include <libmtp.h>
#include <QtGlobal> #include <QtGlobal>
#include <QObject>
#include <QList> #include <QList>
#include <QUrl> #include <QUrl>

1
src/device/mtpdevice.cpp
View File

@ -25,7 +25,6 @@
#include <stdint.h> #include <stdint.h>
#include <stdlib.h> #include <stdlib.h>
#include <QtGlobal>
#include <QThread> #include <QThread>
#include <QMutex> #include <QMutex>
#include <QFile> #include <QFile>

5
src/device/mtpdevice.h
View File

@ -27,7 +27,6 @@
#include <memory> #include <memory>
#include <QObject> #include <QObject>
#include <QThread>
#include <QMutex> #include <QMutex>
#include <QList> #include <QList>
#include <QString> #include <QString>
@ -36,12 +35,12 @@
#include "core/song.h" #include "core/song.h"
#include "connecteddevice.h" #include "connecteddevice.h"
#include "mtploader.h"
class QThread;
class Application; class Application;
class DeviceLister; class DeviceLister;
class DeviceManager; class DeviceManager;
class DeviceConnection; class MtpLoader;
class MtpConnection; class MtpConnection;
struct LIBMTP_mtpdevice_struct; struct LIBMTP_mtpdevice_struct;

3
src/device/mtploader.cpp
View File

@ -28,10 +28,7 @@
#include "core/taskmanager.h" #include "core/taskmanager.h"
#include "core/song.h" #include "core/song.h"
#include "core/logging.h"
#include "collection/collectionbackend.h" #include "collection/collectionbackend.h"
#include "connecteddevice.h"
#include "mtpdevice.h"
#include "mtpconnection.h" #include "mtpconnection.h"
#include "mtploader.h" #include "mtploader.h"

4
src/device/mtploader.h
View File

@ -27,14 +27,12 @@
#include <memory> #include <memory>
#include <QObject> #include <QObject>
#include <QThread>
#include <QString> #include <QString>
#include <QUrl> #include <QUrl>
class QThread;
class TaskManager; class TaskManager;
class CollectionBackend; class CollectionBackend;
class ConnectedDevice;
class MtpDevice;
class MtpConnection; class MtpConnection;
class MtpLoader : public QObject { class MtpLoader : public QObject {

1
src/device/udisks2lister.h
View File

@ -30,7 +30,6 @@
#include <QMutex> #include <QMutex>
#include <QList> #include <QList>
#include <QMap> #include <QMap>
#include <QMetaType>
#include <QReadWriteLock> #include <QReadWriteLock>
#include <QString> #include <QString>
#include <QStringList> #include <QStringList>

1
src/dialogs/about.cpp
View File

@ -32,6 +32,7 @@
#include <QLabel> #include <QLabel>
#include <QPushButton> #include <QPushButton>
#include <QKeySequence> #include <QKeySequence>
#include <QTextBrowser>
#include "about.h" #include "about.h"
#include "ui_about.h" #include "ui_about.h"

4
src/dialogs/about.h
View File

@ -24,15 +24,15 @@
#include "config.h" #include "config.h"
#include <QObject> #include <QObject>
#include <QWidget>
#include <QDialog> #include <QDialog>
#include <QList> #include <QList>
#include <QString> #include <QString>
#include "ui_about.h" #include "ui_about.h"
class QWidget;
class About : public QDialog { class About : public QDialog {
Q_OBJECT Q_OBJECT

1
src/dialogs/edittagdialog.cpp
View File

@ -85,6 +85,7 @@
#include "edittagdialog.h" #include "edittagdialog.h"
#include "trackselectiondialog.h" #include "trackselectiondialog.h"
#include "ui_edittagdialog.h" #include "ui_edittagdialog.h"
#include "tagreadermessages.pb.h"
const char *EditTagDialog::kHintText = QT_TR_NOOP("(different across multiple songs)"); const char *EditTagDialog::kHintText = QT_TR_NOOP("(different across multiple songs)");
const char *EditTagDialog::kSettingsGroup = "EditTagDialog"; const char *EditTagDialog::kSettingsGroup = "EditTagDialog";

15
src/dialogs/edittagdialog.h
View File

@ -23,28 +23,27 @@
#include "config.h" #include "config.h"
#include <QtGlobal> #include <QtGlobal>
#include <QObject> #include <QObject>
#include <QAbstractItemModel>
#include <QDialog> #include <QDialog>
#include <QWidget>
#include <QFuture> #include <QFuture>
#include <QModelIndexList>
#include <QList> #include <QList>
#include <QVariant> #include <QVariant>
#include <QString> #include <QString>
#include <QUrl>
#include <QImage> #include <QImage>
#include <QMenu>
#include <QAbstractButton>
#include <QLabel>
#include <QPushButton>
#include <QtEvents>
#include "core/song.h" #include "core/song.h"
#include "core/tagreaderclient.h" #include "core/tagreaderclient.h"
#include "playlist/playlistitem.h" #include "playlist/playlistitem.h"
#include "covermanager/albumcoverloaderoptions.h" #include "covermanager/albumcoverloaderoptions.h"
class QWidget;
class QMenu;
class QLabel;
class QAbstractButton;
class QPushButton;
class QEvent; class QEvent;
class QShowEvent; class QShowEvent;
class QHideEvent; class QHideEvent;

7
src/dialogs/trackselectiondialog.h
View File

@ -21,18 +21,17 @@
#ifndef TRACKSELECTIONDIALOG_H #ifndef TRACKSELECTIONDIALOG_H
#define TRACKSELECTIONDIALOG_H #define TRACKSELECTIONDIALOG_H
#include <QObject> #include <QObject>
#include <QDialog> #include <QDialog>
#include <QWidget>
#include <QList> #include <QList>
#include <QString> #include <QString>
#include <QTreeWidget>
#include <QPushButton>
#include "config.h" #include "config.h"
#include "core/song.h" #include "core/song.h"
class QWidget;
class QTreeWidget;
class QPushButton;
class Ui_TrackSelectionDialog; class Ui_TrackSelectionDialog;
class TrackSelectionDialog : public QDialog { class TrackSelectionDialog : public QDialog {

6
src/engine/gstengine.cpp
View File

@ -43,14 +43,12 @@
#include <QStringList> #include <QStringList>
#include <QUrl> #include <QUrl>
#include <QTimeLine> #include <QTimeLine>
#include <QTimerEvent>
#include <QMetaObject> #include <QMetaObject>
#include <QFlags> #include <QFlags>
#include <QSettings> #include <QTimerEvent>
#include <QtDebug> #include <QtDebug>
#include "core/closure.h" #include "core/closure.h"
#include "core/utilities.h"
#include "core/logging.h" #include "core/logging.h"
#include "core/taskmanager.h" #include "core/taskmanager.h"
#include "core/timeconstants.h" #include "core/timeconstants.h"
@ -60,8 +58,6 @@
#include "gstenginepipeline.h" #include "gstenginepipeline.h"
#include "gstbufferconsumer.h" #include "gstbufferconsumer.h"
#include "settings/backendsettingspage.h"
using std::shared_ptr; using std::shared_ptr;
using std::vector; using std::vector;

5
src/engine/gstengine.h
View File

@ -34,11 +34,8 @@
#include <QFuture> #include <QFuture>
#include <QByteArray> #include <QByteArray>
#include <QList> #include <QList>
#include <QVariant>
#include <QString> #include <QString>
#include <QUrl> #include <QUrl>
#include <QTimer>
#include <QTimerEvent>
#include "core/timeconstants.h" #include "core/timeconstants.h"
#include "engine_fwd.h" #include "engine_fwd.h"
@ -46,6 +43,8 @@
#include "gststartup.h" #include "gststartup.h"
#include "gstbufferconsumer.h" #include "gstbufferconsumer.h"
class QTimer;
class QTimerEvent;
class TaskManager; class TaskManager;
class GstEnginePipeline; class GstEnginePipeline;

5
src/engine/gstenginepipeline.cpp
View File

@ -22,6 +22,8 @@
#include "config.h" #include "config.h"
#include <stdlib.h> #include <stdlib.h>
#include <stdint.h>
#include <string>
#include <glib.h> #include <glib.h>
#include <glib-object.h> #include <glib-object.h>
#include <gst/gst.h> #include <gst/gst.h>
@ -39,13 +41,14 @@
#include <QUrl> #include <QUrl>
#include <QTimeLine> #include <QTimeLine>
#include <QMetaObject> #include <QMetaObject>
#include <QtDebug>
#include <QUuid> #include <QUuid>
#include <QtDebug>
#include "core/concurrentrun.h" #include "core/concurrentrun.h"
#include "core/logging.h" #include "core/logging.h"
#include "core/signalchecker.h" #include "core/signalchecker.h"
#include "core/timeconstants.h" #include "core/timeconstants.h"
#include "core/song.h"
#include "enginebase.h" #include "enginebase.h"
#include "gstengine.h" #include "gstengine.h"
#include "gstenginepipeline.h" #include "gstenginepipeline.h"

4
src/engine/gstenginepipeline.h
View File

@ -38,15 +38,15 @@
#include <QFuture> #include <QFuture>
#include <QTimeLine> #include <QTimeLine>
#include <QBasicTimer> #include <QBasicTimer>
#include <QByteArray>
#include <QList> #include <QList>
#include <QByteArray>
#include <QVariant> #include <QVariant>
#include <QString> #include <QString>
#include <QUrl> #include <QUrl>
#include <QTimerEvent>
using std::unique_ptr; using std::unique_ptr;
class QTimerEvent;
class GstEngine; class GstEngine;
class GstBufferConsumer; class GstBufferConsumer;
class GstElementDeleter; class GstElementDeleter;

1
src/engine/gststartup.cpp
View File

@ -22,7 +22,6 @@
#include <gst/gst.h> #include <gst/gst.h>
#include <gst/pbutils/pbutils.h> #include <gst/pbutils/pbutils.h>
#include <QtGlobal>
#include <QObject> #include <QObject>
#include <QCoreApplication> #include <QCoreApplication>
#include <QStandardPaths> #include <QStandardPaths>

1
src/engine/gststartup.h
View File

@ -24,7 +24,6 @@
#include <gst/gst.h> #include <gst/gst.h>
#include <QtGlobal>
#include <QObject> #include <QObject>
#include <QFuture> #include <QFuture>

3
src/engine/vlcengine.cpp
View File

@ -21,12 +21,13 @@
#include "config.h" #include "config.h"
#include <stddef.h>
#include <vlc/vlc.h> #include <vlc/vlc.h>
#include <QtGlobal> #include <QtGlobal>
#include <QVariant>
#include <QByteArray> #include <QByteArray>
#include <QUrl> #include <QUrl>
#include <QtDebug>
#include "core/timeconstants.h" #include "core/timeconstants.h"
#include "core/taskmanager.h" #include "core/taskmanager.h"

11
src/engine/xineengine.cpp
View File

@ -27,6 +27,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <time.h> #include <time.h>
#include <unistd.h> #include <unistd.h>
#include <errno.h>
#include <xine.h> #include <xine.h>
#ifdef XINE_ANALYZER #ifdef XINE_ANALYZER
# include <xine/metronom.h> # include <xine/metronom.h>
@ -34,20 +35,13 @@
#include <memory> #include <memory>
#include <cstdlib> #include <cstdlib>
#include <algorithm>
#include <climits> #include <climits>
#include <vector>
#include <QtGlobal> #include <QtGlobal>
#include <QApplication>
#include <QThread>
#include <QMutex> #include <QMutex>
#include <QByteArray> #include <QByteArray>
#include <QChar> #include <QChar>
#include <QDir>
#include <QFile>
#include <QFileInfo> #include <QFileInfo>
#include <QDateTime>
#include <QLocale> #include <QLocale>
#include <QVariant> #include <QVariant>
#include <QString> #include <QString>
@ -56,7 +50,6 @@
#include <QUrl> #include <QUrl>
#include <QTimer> #include <QTimer>
#include <QtDebug> #include <QtDebug>
#include <QSettings>
#include "core/logging.h" #include "core/logging.h"
#include <core/timeconstants.h> #include <core/timeconstants.h>
@ -68,8 +61,6 @@
# include "xinescope.h" # include "xinescope.h"
#endif #endif
#include "settings/backendsettingspage.h"
using std::shared_ptr; using std::shared_ptr;
#ifndef LLONG_MAX #ifndef LLONG_MAX

2
src/engine/xineengine.h
View File

@ -31,8 +31,8 @@
#include <QObject> #include <QObject>
#include <QMutex> #include <QMutex>
#include <QThread> #include <QThread>
#include <QEvent>
#include <QList> #include <QList>
#include <QVariant>
#include <QString> #include <QString>
#include <QUrl> #include <QUrl>

6
src/globalshortcuts/globalshortcut-win.cpp
View File

@ -18,16 +18,10 @@
*/ */
#include <QtGlobal> #include <QtGlobal>
#include <QObject>
#include <QAbstractEventDispatcher>
#include <QByteArray> #include <QByteArray>
#include <qt_windows.h> #include <qt_windows.h>
#include "core/logging.h"
#include "globalshortcuts.h"
#include "globalshortcutbackend.h"
#include "globalshortcut.h" #include "globalshortcut.h"
#include "keymapper_win.h" #include "keymapper_win.h"

12
src/globalshortcuts/globalshortcut-x11.cpp
View File

@ -20,20 +20,14 @@
#include "config.h" #include "config.h"
#include <QtGlobal> #include <QtGlobal>
#include <QApplication> #include <QMap>
#include <QObject>
#include <QAbstractEventDispatcher>
#include <QDataStream>
#include <QVector> #include <QVector>
#include <QByteArray> #include <QByteArray>
#include <QString>
#include <QX11Info> #include <QX11Info>
#include <QKeySequence> #include <QKeySequence>
#include <QtAlgorithms> #include <QFlags>
#include "core/logging.h"
#include "globalshortcuts.h"
#include "globalshortcutbackend.h"
#include "globalshortcut.h" #include "globalshortcut.h"
#include "keymapper_x11.h" #include "keymapper_x11.h"

3
src/globalshortcuts/globalshortcut.cpp
View File

@ -21,15 +21,14 @@
#include <QtGlobal> #include <QtGlobal>
#include <QObject> #include <QObject>
#include <QApplication>
#include <QAbstractEventDispatcher> #include <QAbstractEventDispatcher>
#include <QPair> #include <QPair>
#include <QHash> #include <QHash>
#include <QFlags>
#include <QtDebug> #include <QtDebug>
#include "core/logging.h" #include "core/logging.h"
#include "globalshortcutbackend.h"
#include "globalshortcut.h" #include "globalshortcut.h"
GlobalShortcut *GlobalShortcut::initialized_ = nullptr; GlobalShortcut *GlobalShortcut::initialized_ = nullptr;

2
src/globalshortcuts/globalshortcut.h
View File

@ -22,7 +22,6 @@
#include "config.h" #include "config.h"
#include <QtGlobal> #include <QtGlobal>
#include <QObject> #include <QObject>
#include <QAbstractNativeEventFilter> #include <QAbstractNativeEventFilter>
@ -31,6 +30,7 @@
#include <QVector> #include <QVector>
#include <QHash> #include <QHash>
#include <QByteArray> #include <QByteArray>
#include <QString>
class GlobalShortcutBackend; class GlobalShortcutBackend;

2
src/globalshortcuts/globalshortcutbackend-gsd.cpp
View File

@ -30,6 +30,8 @@
#include <QDBusMessage> #include <QDBusMessage>
#include <QDBusPendingCallWatcher> #include <QDBusPendingCallWatcher>
#include <QDBusPendingReply> #include <QDBusPendingReply>
#include <QAction>
#include <QtDebug>
#include "core/closure.h" #include "core/closure.h"
#include "core/logging.h" #include "core/logging.h"

7
src/globalshortcuts/globalshortcutbackend-gsd.h
View File

@ -23,17 +23,12 @@
#include "config.h" #include "config.h"
#include <QObject> #include <QObject>
#include <QtGlobal>
#include <QPair>
#include <QVector>
#include <QHash>
#include <QString> #include <QString>
#include <QDBusPendingCallWatcher>
#include "globalshortcutbackend.h" #include "globalshortcutbackend.h"
class QDBusPendingCallWatcher;
class GlobalShortcuts; class GlobalShortcuts;
class OrgGnomeSettingsDaemonMediaKeysInterface; class OrgGnomeSettingsDaemonMediaKeysInterface;

3
src/globalshortcuts/globalshortcutbackend-system.cpp
View File

@ -23,9 +23,10 @@
#include "core/logging.h" #include "core/logging.h"
#include <QtGlobal>
#include <QObject> #include <QObject>
#include <QMap>
#include <QAction> #include <QAction>
#include <QKeySequence>
#include <QtAlgorithms> #include <QtAlgorithms>
#include "globalshortcuts.h" #include "globalshortcuts.h"

6
src/globalshortcuts/globalshortcutbackend-system.h
View File

@ -24,15 +24,13 @@
#include "core/logging.h" #include "core/logging.h"
#include <QObject> #include <QObject>
#include <QtGlobal>
#include <QAction>
#include <QList> #include <QList>
#include <QKeySequence> #include <QString>
#include "globalshortcutbackend.h" #include "globalshortcutbackend.h"
class QAction;
class GlobalShortcuts; class GlobalShortcuts;
class GlobalShortcut; class GlobalShortcut;

4
src/globalshortcuts/globalshortcutbackend.h
View File

@ -23,11 +23,7 @@
#include "config.h" #include "config.h"
#include <QtGlobal>
#include <QObject> #include <QObject>
#include <QPair>
#include <QHash>
#include <QString> #include <QString>
class GlobalShortcuts; class GlobalShortcuts;

11
src/globalshortcuts/globalshortcutgrabber.cpp
View File

@ -23,18 +23,17 @@
#include <QDialog> #include <QDialog>
#include <QWidget> #include <QWidget>
#include <QString> #include <QString>
#include <QStringBuilder>
#include <QLabel> #include <QLabel>
#include <QKeySequence> #include <QKeySequence>
#include <QtEvents> #include <QDialogButtonBox>
#include <QEvent>
#include <QShowEvent>
#include <QHideEvent>
#include <QKeyEvent>
#include "globalshortcutgrabber.h" #include "globalshortcutgrabber.h"
#include "ui_globalshortcutgrabber.h" #include "ui_globalshortcutgrabber.h"
class QShowEvent;
class QHideEvent;
class QKeyEvent;
GlobalShortcutGrabber::GlobalShortcutGrabber(QWidget *parent) GlobalShortcutGrabber::GlobalShortcutGrabber(QWidget *parent)
: QDialog(parent), ui_(new Ui::GlobalShortcutGrabber) { : QDialog(parent), ui_(new Ui::GlobalShortcutGrabber) {
ui_->setupUi(this); ui_->setupUi(this);

2
src/globalshortcuts/globalshortcutgrabber.h
View File

@ -23,14 +23,12 @@
#include "config.h" #include "config.h"
#include <QObject> #include <QObject>
#include <QWidget> #include <QWidget>
#include <QDialog> #include <QDialog>
#include <QList> #include <QList>
#include <QString> #include <QString>
#include <QKeySequence> #include <QKeySequence>
#include <QtEvents>
class QEvent; class QEvent;
class QHideEvent; class QHideEvent;

2
src/globalshortcuts/globalshortcuts.cpp
View File

@ -34,8 +34,6 @@
#include <QX11Info> #include <QX11Info>
#endif #endif
#include "core/logging.h"
#include "globalshortcuts.h" #include "globalshortcuts.h"
#include "globalshortcutbackend.h" #include "globalshortcutbackend.h"

7
src/globalshortcuts/globalshortcuts.h
View File

@ -24,18 +24,15 @@
#include "config.h" #include "config.h"
#include <QObject> #include <QObject>
#include <QWidget> #include <QWidget>
#include <QMap> #include <QMap>
#include <QString> #include <QString>
#include <QAction>
#include <QShortcut>
#include <QKeySequence> #include <QKeySequence>
#include <QSettings> #include <QSettings>
#include "globalshortcut.h" class QShortcut;
class QAction;
class GlobalShortcutBackend; class GlobalShortcutBackend;
class GlobalShortcuts : public QWidget { class GlobalShortcuts : public QWidget {

5
src/internet/internetcollectionview.cpp
View File

@ -21,18 +21,21 @@
#include "config.h" #include "config.h"
#include <QtGlobal> #include <QWidget>
#include <QTreeView> #include <QTreeView>
#include <QSortFilterProxyModel> #include <QSortFilterProxyModel>
#include <QAbstractItemView> #include <QAbstractItemView>
#include <QItemSelectionModel>
#include <QVariant> #include <QVariant>
#include <QString> #include <QString>
#include <QUrl>
#include <QPainter> #include <QPainter>
#include <QRect> #include <QRect>
#include <QFont> #include <QFont>
#include <QFontMetrics> #include <QFontMetrics>
#include <QMimeData> #include <QMimeData>
#include <QMenu> #include <QMenu>
#include <QAction>
#include <QtEvents> #include <QtEvents>
#include "core/application.h" #include "core/application.h"

11
src/internet/internetcollectionview.h
View File

@ -24,21 +24,20 @@
#include "config.h" #include "config.h"
#include <QObject> #include <QObject>
#include <QWidget> #include <QAbstractItemModel>
#include <QAbstractItemView>
#include <QSet> #include <QSet>
#include <QString> #include <QString>
#include <QPixmap> #include <QPixmap>
#include <QAction>
#include <QMenu>
#include <QtEvents>
#include "widgets/autoexpandingtreeview.h" #include "widgets/autoexpandingtreeview.h"
#include "core/song.h" #include "core/song.h"
class QWidget;
class QMenu;
class QAction;
class QContextMenuEvent; class QContextMenuEvent;
class QHelpEvent;
class QMouseEvent; class QMouseEvent;
class QPaintEvent; class QPaintEvent;

7
src/internet/internetcollectionviewcontainer.cpp
View File

@ -19,19 +19,16 @@
#include "config.h" #include "config.h"
#include <QtGlobal>
#include <QWidget> #include <QWidget>
#include <QPushButton>
#include <QLabel>
#include <QProgressBar> #include <QProgressBar>
#include <QKeyEvent> #include <QKeyEvent>
#include <QContextMenuEvent> #include <QContextMenuEvent>
#include "core/application.h" #include "collection/collectionfilterwidget.h"
#include "internetcollectionview.h" #include "internetcollectionview.h"
#include "internetcollectionviewcontainer.h" #include "internetcollectionviewcontainer.h"
#include "ui_internetcollectionviewcontainer.h" #include "ui_internetcollectionviewcontainer.h"
#include "collection/collectionfilterwidget.h"
#include "internetservice.h"
InternetCollectionViewContainer::InternetCollectionViewContainer(QWidget *parent) : InternetCollectionViewContainer::InternetCollectionViewContainer(QWidget *parent) :
QWidget(parent), QWidget(parent),

6
src/internet/internetcollectionviewcontainer.h
View File

@ -22,19 +22,21 @@
#include "config.h" #include "config.h"
#include <QObject>
#include <QWidget> #include <QWidget>
#include <QString>
#include "internetcollectionview.h"
#include "ui_internetcollectionviewcontainer.h" #include "ui_internetcollectionviewcontainer.h"
class QStackedWidget; class QStackedWidget;
class QPushButton; class QPushButton;
class QLabel; class QLabel;
class QProgressBar; class QProgressBar;
class QContextMenuEvent;
class Application; class Application;
class InternetCollectionView;
class CollectionFilterWidget; class CollectionFilterWidget;
class InternetService; class InternetService;
class Ui_InternetCollectionViewContainer;
class InternetCollectionViewContainer : public QWidget { class InternetCollectionViewContainer : public QWidget {
Q_OBJECT Q_OBJECT

1
src/internet/internetplaylistitem.cpp
View File

@ -25,6 +25,7 @@
#include <QSettings> #include <QSettings>
#include <QVariant> #include <QVariant>
#include <QString> #include <QString>
#include <QStringList>
#include <QtDebug> #include <QtDebug>
#include "internetplaylistitem.h" #include "internetplaylistitem.h"

2
src/internet/internetplaylistitem.h
View File

@ -23,11 +23,11 @@
#include "config.h" #include "config.h"
#include <QString>
#include <QVariant> #include <QVariant>
#include <QUrl> #include <QUrl>
#include "core/song.h" #include "core/song.h"
#include "collection/sqlrow.h"
#include "playlist/playlistitem.h" #include "playlist/playlistitem.h"
class InternetService; class InternetService;

7
src/internet/internetsearch.cpp
View File

@ -29,17 +29,16 @@
#include <QStringList> #include <QStringList>
#include <QStringBuilder> #include <QStringBuilder>
#include <QUrl> #include <QUrl>
#include <QRegExp>
#include <QImage> #include <QImage>
#include <QPixmap> #include <QPixmap>
#include <QIcon>
#include <QPainter> #include <QPainter>
#include <QSize>
#include <QTimerEvent> #include <QTimerEvent>
#include <QSettings>
#include "core/application.h" #include "core/application.h"
#include "core/logging.h"
#include "core/song.h" #include "core/song.h"
#include "playlist/songmimedata.h" #include "core/mimedata.h"
#include "covermanager/albumcoverloader.h" #include "covermanager/albumcoverloader.h"
#include "internet/internetsongmimedata.h" #include "internet/internetsongmimedata.h"
#include "internetsearch.h" #include "internetsearch.h"

5
src/internet/internetsearch.h
View File

@ -26,9 +26,13 @@
#include <QtGlobal> #include <QtGlobal>
#include <QObject> #include <QObject>
#include <QMetaType>
#include <QSet>
#include <QList>
#include <QMap> #include <QMap>
#include <QString> #include <QString>
#include <QStringList> #include <QStringList>
#include <QUrl>
#include <QImage> #include <QImage>
#include <QPixmap> #include <QPixmap>
#include <QPixmapCache> #include <QPixmapCache>
@ -36,6 +40,7 @@
#include "core/song.h" #include "core/song.h"
#include "covermanager/albumcoverloaderoptions.h" #include "covermanager/albumcoverloaderoptions.h"
class QTimerEvent;
class Application; class Application;
class MimeData; class MimeData;
class AlbumCoverLoader; class AlbumCoverLoader;

2
src/internet/internetsearchitemdelegate.h
View File

@ -22,10 +22,12 @@
#define INTERNETSEARCHITEMDELEGATE_H #define INTERNETSEARCHITEMDELEGATE_H
#include <QStyleOptionViewItem> #include <QStyleOptionViewItem>
#include <QStyleOption>
#include "collection/collectionitemdelegate.h" #include "collection/collectionitemdelegate.h"
class QPainter; class QPainter;
class QModelIndex;
class InternetSearchView; class InternetSearchView;
class InternetSearchItemDelegate : public CollectionItemDelegate { class InternetSearchItemDelegate : public CollectionItemDelegate {

Some files were not shown because too many files have changed in this diff Show More