Reduce includes

src/widgets/autoexpandingtreeview.h

@@ -23,15 +23,16 @@
 
 #include "config.h"
 
-
+#include <QtGlobal>
 #include <QObject>
-#include <QWidget>
 #include <QString>
-#include <QMimeData>
 #include <QTreeView>
-#include <QtEvents>
 
+class QMimeData;
+class QWidget;
 class QModelIndex;
+class QKeyEvent;
+class QMouseEvent;
 
 class AutoExpandingTreeView : public QTreeView {
   Q_OBJECT

src/widgets/busyindicator.cpp

@@ -27,7 +27,6 @@
 #include <QLabel>
 #include <QSizePolicy>
 #include <QBoxLayout>
-#include <QtEvents>
 
 #include "busyindicator.h"
 
@@ -70,11 +69,11 @@ BusyIndicator::~BusyIndicator() {
   delete movie_;
 }
 
-void BusyIndicator::showEvent(QShowEvent *) {
+void BusyIndicator::showEvent(QShowEvent*) {
   movie_->start();
 }
 
-void BusyIndicator::hideEvent(QHideEvent *) {
+void BusyIndicator::hideEvent(QHideEvent*) {
   movie_->stop();
 }
 

src/widgets/busyindicator.h

@@ -23,17 +23,18 @@
 
 #include "config.h"
 
+#include <QObject>
 #include <QWidget>
 #include <QString>
-#include <QMovie>
-#include <QLabel>
-#include <QtEvents>
 
+class QMovie;
+class QLabel;
 class QShowEvent;
 class QHideEvent;
 
 class BusyIndicator : public QWidget {
   Q_OBJECT
+
   Q_PROPERTY(QString text READ text WRITE set_text)
 
  public:

src/widgets/clickablelabel.h

@@ -21,11 +21,10 @@
 #include "config.h"
 
 #include <QObject>
-#include <QWidget>
 #include <QString>
 #include <QLabel>
-#include <QtEvents>
 
+class QWidget;
 class QMouseEvent;
 
 class ClickableLabel : public QLabel {

src/widgets/fancytabwidget.cpp

@@ -19,37 +19,40 @@
  *
  */
 
-#include "fancytabwidget.h"
-#include "core/stylehelper.h"
-#include "core/logging.h"
-#include "settings/appearancesettingspage.h"
-
-#include <QDebug>
+#include <algorithm>
 
+#include <QtGlobal>
 #include <QObject>
 #include <QTabBar>
 #include <QWidget>
+#include <QTimer>
+#include <QList>
 #include <QMap>
-#include <QHash>
+#include <QVariant>
 #include <QString>
 #include <QIcon>
 #include <QPainter>
+#include <QStylePainter>
 #include <QColor>
 #include <QRect>
 #include <QFont>
-#include <QStylePainter>
-#include <QTimer>
-#include <QLayout>
-#include <QVBoxLayout>
 #include <QSize>
 #include <QPoint>
+#include <QBrush>
+#include <QPen>
 #include <QTransform>
 #include <QMenu>
 #include <QAction>
 #include <QActionGroup>
 #include <QSettings>
-#include <QMouseEvent>
 #include <QPixmapCache>
+#include <QLayout>
+#include <QBoxLayout>
+#include <QtEvents>
+
+#include "fancytabwidget.h"
+#include "core/stylehelper.h"
+#include "settings/appearancesettingspage.h"
 
 const QSize FancyTabWidget::IconSize_LargeSidebar = QSize(24, 24);
 const QSize FancyTabWidget::IconSize_SmallSidebar = QSize(22, 22);

src/widgets/fancytabwidget.h

@@ -22,18 +22,19 @@
 #ifndef FANCYTABWIDGET_H
 #define FANCYTABWIDGET_H
 
-#include <memory>
-
+#include <QObject>
 #include <QTabWidget>
 #include <QMap>
 #include <QString>
 #include <QIcon>
 #include <QPixmap>
 #include <QSize>
-#include <QtEvents>
+#include <QColor>
 
 class QMenu;
 class QActionGroup;
+class QContextMenuEvent;
+class QPaintEvent;
 class TabData;
 
 namespace Core {

src/widgets/favoritewidget.cpp

@@ -20,12 +20,13 @@
 
 #include "config.h"
 
-
+#include <QtGlobal>
 #include <QWidget>
 #include <QSize>
 #include <QStyle>
 #include <QStylePainter>
-#include <QtEvents>
+#include <QPaintEvent>
+#include <QMouseEvent>
 
 #include "favoritewidget.h"
 

src/widgets/favoritewidget.h

@@ -20,14 +20,12 @@
 
 #include "config.h"
 
-
 #include <QObject>
 #include <QWidget>
 #include <QString>
 #include <QPixmap>
 #include <QRect>
 #include <QSize>
-#include <QtEvents>
 
 class QMouseEvent;
 class QPaintEvent;

src/widgets/fileview.cpp

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

src/widgets/fileview.h

@@ -27,20 +27,18 @@
 
 #include <QObject>
 #include <QWidget>
-#include <QFileSystemModel>
 #include <QAbstractItemModel>
 #include <QList>
 #include <QString>
 #include <QStringList>
 #include <QUrl>
-#include <QMimeData>
-#include <QUndoStack>
 #include <QUndoCommand>
-#include <QtEvents>
 
 #include "core/song.h"
 
-class QModelIndex;
+class QMimeData;
+class QFileSystemModel;
+class QUndoStack;
 class QKeyEvent;
 class QShowEvent;
 

src/widgets/fileviewlist.h

@@ -24,17 +24,16 @@
 #include "config.h"
 
 #include <QObject>
-#include <QWidget>
-#include <QMimeData>
 #include <QListView>
+#include <QItemSelectionModel>
 #include <QList>
 #include <QUrl>
 #include <QString>
 #include <QStringList>
-#include <QMenu>
-#include <QItemSelectionModel>
-#include <QtEvents>
 
+class QWidget;
+class QMimeData;
+class QMenu;
 class QMouseEvent;
 class QContextMenuEvent;
 

src/widgets/forcescrollperpixel.cpp

@@ -23,7 +23,7 @@
 #include <QObject>
 #include <QAbstractItemView>
 #include <QScrollBar>
-#include <QtEvents>
+#include <QEvent>
 
 #include "forcescrollperpixel.h"
 

src/widgets/forcescrollperpixel.h

@@ -24,9 +24,8 @@
 #include "config.h"
 
 #include <QObject>
-#include <QtEvents>
-#include <QAbstractItemView>
 
+class QAbstractItemView;
 class QEvent;
 
 // Some KDE styles override the ScrollMode property of QAbstractItemViews.

src/widgets/freespacebar.cpp

@@ -39,7 +39,6 @@
 #include <QSize>
 #include <QTransform>
 #include <QLinearGradient>
-#include <QtEvents>
 
 #include "core/utilities.h"
 #include "freespacebar.h"
@@ -78,7 +77,7 @@ QSize FreeSpaceBar::sizeHint() const {
   return QSize(150, kBarHeight + kLabelBoxPadding + fontMetrics().height());
 }
 
-void FreeSpaceBar::paintEvent(QPaintEvent *) {
+void FreeSpaceBar::paintEvent(QPaintEvent*) {
 
   // Geometry
   QRect bar_rect(rect());

src/widgets/freespacebar.h

@@ -27,12 +27,12 @@
 #include <QObject>
 #include <QWidget>
 #include <QString>
-#include <QPainter>
 #include <QColor>
+#include <QRgb>
 #include <QRect>
 #include <QSize>
-#include <QtEvents>
 
+class QPainter;
 class QPaintEvent;
 
 class FreeSpaceBar : public QWidget {

src/widgets/groupediconview.cpp

@@ -49,9 +49,6 @@
 #include "core/multisortfilterproxy.h"
 #include "groupediconview.h"
 
-class QModelIndex;
-class QResizeEvent;
-
 const int GroupedIconView::kBarThickness = 2;
 const int GroupedIconView::kBarMarginTop = 3;
 

src/widgets/groupediconview.h

@@ -24,21 +24,20 @@
 #include "config.h"
 
 #include <QObject>
-#include <QWidget>
 #include <QListView>
 #include <QAbstractItemModel>
 #include <QAbstractItemView>
 #include <QItemSelectionModel>
 #include <QString>
 #include <QFont>
-#include <QPainter>
 #include <QPalette>
 #include <QPoint>
 #include <QRect>
 #include <QRegion>
 #include <QVector>
-#include <QtEvents>
 
+class QWidget;
+class QPainter;
 class QModelIndex;
 class QPaintEvent;
 class QResizeEvent;

src/widgets/lineedit.cpp

@@ -37,14 +37,12 @@
 #include <QPlainTextEdit>
 #include <QSpinBox>
 #include <QFlags>
-#include <QtEvents>
+#include <QPaintEvent>
+#include <QResizeEvent>
 
 #include "core/iconloader.h"
 #include "lineedit.h"
 
-class QPaintEvent;
-class QResizeEvent;
-
 ExtendedEditor::ExtendedEditor(QWidget *widget, int extra_right_padding, bool draw_hint)
     : LineEditInterface(widget),
       has_clear_button_(true),

src/widgets/lineedit.h

@@ -23,7 +23,6 @@
 
 #include "config.h"
 
-
 #include <QtGlobal>
 #include <QObject>
 #include <QWidget>
@@ -31,15 +30,14 @@
 #include <QLineEdit>
 #include <QPlainTextEdit>
 #include <QSpinBox>
-#include <QToolButton>
-#include <QPaintDevice>
-#include <QtEvents>
 
+class QToolButton;
+class QPaintDevice;
 class QPaintEvent;
 class QResizeEvent;
 
 class LineEditInterface {
-public:
+ public:
   LineEditInterface(QWidget *widget) : widget_(widget) {}
 
   QWidget *widget() const { return widget_; }
@@ -62,7 +60,7 @@ protected:
 };
 
 class ExtendedEditor : public LineEditInterface {
-public:
+ public:
   ExtendedEditor(QWidget *widget, int extra_right_padding = 0, bool draw_hint = true);
   virtual ~ExtendedEditor() {}
 
@@ -81,14 +79,14 @@ public:
   qreal font_point_size() const { return font_point_size_; }
   void set_font_point_size(qreal size) { font_point_size_ = size; }
 
-protected:
+ protected:
   void Paint(QPaintDevice *device);
   void Resize();
 
-private:
+ private:
   void UpdateButtonGeometry();
 
-protected:
+ protected:
   QString hint_;
 
   bool has_clear_button_;
@@ -118,7 +116,7 @@ class LineEdit : public QLineEdit, public ExtendedEditor {
   void set_text(const QString& text) { QLineEdit::setText(text); }
   void set_enabled(bool enabled) { QLineEdit::setEnabled(enabled); }
 
-protected:
+ protected:
   void paintEvent(QPaintEvent*);
   void resizeEvent(QResizeEvent*);
 
@@ -129,7 +127,7 @@ protected:
  private slots:
   void text_changed(const QString& text);
 
-signals:
+ signals:
   void Reset();
 };
 
@@ -148,11 +146,11 @@ class TextEdit : public QPlainTextEdit, public ExtendedEditor {
   void set_text(const QString& text) { QPlainTextEdit::setPlainText(text); }
   void set_enabled(bool enabled) { QPlainTextEdit::setEnabled(enabled); }
 
-protected:
+ protected:
   void paintEvent(QPaintEvent*);
   void resizeEvent(QResizeEvent*);
 
-signals:
+ signals:
   void Reset();
 };
 
@@ -175,11 +173,11 @@ class SpinBox : public QSpinBox, public ExtendedEditor {
   void set_text(const QString& text) { QSpinBox::setValue(text.toInt()); }
   void set_enabled(bool enabled) { QSpinBox::setEnabled(enabled); }
 
-protected:
+ protected:
   void paintEvent(QPaintEvent*);
   void resizeEvent(QResizeEvent*);
 
-signals:
+ signals:
   void Reset();
 };
 

src/widgets/linetextedit.h

@@ -24,12 +24,11 @@
 #include "config.h"
 
 #include <QObject>
-#include <QWidget>
 #include <QSize>
 #include <QString>
 #include <QTextEdit>
-#include <QtEvents>
 
+class QWidget;
 class QKeyEvent;
 
 class LineTextEdit : public QTextEdit {

src/widgets/loginstatewidget.cpp

@@ -26,7 +26,8 @@
 #include <QDate>
 #include <QString>
 #include <QLineEdit>
-#include <QtEvents>
+#include <QEvent>
+#include <QKeyEvent>
 
 LoginStateWidget::LoginStateWidget(QWidget *parent)
     : QWidget(parent), ui_(new Ui_LoginStateWidget), state_(LoggedOut) {

src/widgets/loginstatewidget.h

@@ -25,7 +25,8 @@
 #include <QList>
 #include <QString>
 #include <QDate>
-#include <QtEvents>
+
+class QEvent;
 
 class Ui_LoginStateWidget;
 

src/widgets/multiloadingindicator.cpp

@@ -31,14 +31,12 @@
 #include <QSizePolicy>
 #include <QStringList>
 #include <QFontMetrics>
-#include <QtEvents>
+#include <QPaintEvent>
 
 #include "core/taskmanager.h"
 #include "multiloadingindicator.h"
 #include "widgets/busyindicator.h"
 
-class QPaintEvent;
-
 const int MultiLoadingIndicator::kVerticalPadding = 4;
 const int MultiLoadingIndicator::kHorizontalPadding = 6;
 const int MultiLoadingIndicator::kSpacing = 6;

src/widgets/multiloadingindicator.h

@@ -27,7 +27,6 @@
 #include <QWidget>
 #include <QSize>
 #include <QString>
-#include <QtEvents>
 
 class QPaintEvent;
 

src/widgets/osd.cpp

@@ -26,11 +26,9 @@
 
 #include <QObject>
 #include <QCoreApplication>
-#include <QList>
 #include <QVariant>
 #include <QString>
 #include <QStringList>
-#include <QRegExp>
 #include <QImage>
 #include <QSettings>
 #ifdef HAVE_DBUS

src/widgets/osd.h

@@ -28,6 +28,7 @@
 #include <QtGlobal>
 #include <QObject>
 #include <QString>
+#include <QUrl>
 #include <QDateTime>
 #include <QImage>
 #ifdef HAVE_DBUS
@@ -36,7 +37,6 @@
 #endif
 
 #include "core/song.h"
-#include "engine/engine_fwd.h"
 #include "playlist/playlistsequence.h"
 
 class Application;

src/widgets/osd_x11.cpp

@@ -35,7 +35,6 @@
 #include <QString>
 #include <QStringList>
 #include <QImage>
-#include <QColor>
 #ifdef HAVE_DBUS
 #  include <QCoreApplication>
 #  include <QDBusArgument>

src/widgets/osdpretty.cpp

@@ -27,6 +27,7 @@
 #include <QWindow>
 #include <QScreen>
 #include <QWidget>
+#include <QList>
 #include <QVariant>
 #include <QString>
 #include <QImage>
@@ -59,7 +60,6 @@
 # include <QtWin>
 #endif
 
-#include "core/logging.h"
 #include "osdpretty.h"
 #include "ui_osdpretty.h"
 

src/widgets/osdpretty.h

@@ -24,11 +24,10 @@
 
 #include "config.h"
 
-
 #include <QtGlobal>
+#include <QObject>
 #include <QWidget>
 #include <QMap>
-#include <QScreen>
 #include <QString>
 #include <QImage>
 #include <QPixmap>
@@ -36,8 +35,9 @@
 #include <QFont>
 #include <QPoint>
 #include <QRect>
-#include <QtEvents>
+#include <QRgb>
 
+class QScreen;
 class QTimer;
 class QTimeLine;
 class QEvent;

src/widgets/playingwidget.cpp

@@ -27,6 +27,7 @@
 #include <QByteArray>
 #include <QVariant>
 #include <QString>
+#include <QUrl>
 #include <QImage>
 #include <QPixmap>
 #include <QSize>
@@ -45,7 +46,6 @@
 #include "core/application.h"
 #include "covermanager/albumcoverchoicecontroller.h"
 #include "covermanager/albumcoverloader.h"
-#include "covermanager/currentalbumcoverloader.h"
 #include "playingwidget.h"
 
 using std::unique_ptr;

src/widgets/playingwidget.h

@@ -34,7 +34,7 @@
 #include <QImage>
 #include <QPixmap>
 #include <QSize>
-#include <QMenu>
+#include <QAction>
 #include <QMovie>
 
 #include "core/song.h"
@@ -46,7 +46,6 @@ class QTimeLine;
 class QTextDocument;
 class QPainter;
 class QMenu;
-class QAction;
 class QActionGroup;
 class QContextMenuEvent;
 class QDragEnterEvent;

src/widgets/qsearchfield_nonmac.cpp

@@ -22,16 +22,20 @@ THE SOFTWARE.
 
 #include "qsearchfield.h"
 
+#include <QtGlobal>
+#include <QObject>
+#include <QWidget>
 #include <QApplication>
+#include <QString>
+#include <QIcon>
 #include <QPointer>
 #include <QLineEdit>
-#include <QVBoxLayout>
 #include <QToolButton>
 #include <QStyle>
+#include <QSize>
+#include <QBoxLayout>
 #include <QEvent>
-
-#include <QDir>
-#include <QDebug>
+#include <QResizeEvent>
 
 #include "core/iconloader.h"
 

src/widgets/renametablineedit.cpp

@@ -20,16 +20,18 @@
 
 #include "config.h"
 
+#include <QtGlobal>
 #include <QWidget>
 #include <QLineEdit>
-#include <QtEvents>
+#include <QKeyEvent>
+#include <QFocusEvent>
 
 #include "renametablineedit.h"
 
 RenameTabLineEdit::RenameTabLineEdit(QWidget *parent) :
     QLineEdit(parent) {}
 
-void RenameTabLineEdit::keyPressEvent (QKeyEvent *e) {
+void RenameTabLineEdit::keyPressEvent(QKeyEvent *e) {
 
   if (e->key() == Qt::Key_Escape) {
     e->accept();

src/widgets/renametablineedit.h

@@ -27,7 +27,6 @@
 #include <QWidget>
 #include <QString>
 #include <QLineEdit>
-#include <QtEvents>
 
 class QFocusEvent;
 class QKeyEvent;

src/widgets/stickyslider.cpp

@@ -22,11 +22,10 @@
 
 #include <QWidget>
 #include <QSlider>
+#include <QMouseEvent>
 
 #include "stickyslider.h"
 
-class QMouseEvent;
-
 StickySlider::StickySlider(QWidget *parent)
   : QSlider(parent),
     sticky_center_(-1),

src/widgets/stretchheaderview.cpp

@@ -32,7 +32,8 @@
 #include <QByteArray>
 #include <QDataStream>
 #include <QList>
-#include <QtEvents>
+#include <QResizeEvent>
+#include <QMouseEvent>
 
 #include "stretchheaderview.h"
 

src/widgets/stretchheaderview.h

@@ -23,17 +23,15 @@
 
 #include "config.h"
 
-
 #include <QObject>
-#include <QWidget>
-#include <QAbstractItemModel>
 #include <QByteArray>
 #include <QHeaderView>
 #include <QList>
 #include <QString>
 #include <QVector>
-#include <QtEvents>
 
+class QWidget;
+class QAbstractItemModel;
 class QMouseEvent;
 class QResizeEvent;
 

src/widgets/trackslider.cpp

@@ -26,7 +26,7 @@
 #include <QSize>
 #include <QLabel>
 #include <QSettings>
-#include <QtEvents>
+#include <QEvent>
 
 #include "core/timeconstants.h"
 #include "core/utilities.h"

src/widgets/trackslider.h

@@ -28,8 +28,8 @@
 #include <QWidget>
 #include <QString>
 #include <QSize>
-#include <QLabel>
 
+class QLabel;
 class QEvent;
 
 class Application;

src/widgets/tracksliderpopup.cpp

@@ -35,13 +35,11 @@
 #include <QVector>
 #include <QPoint>
 #include <QPolygon>
-#include <QtEvents>
+#include <QPaintEvent>
 
 #include "core/qt_blurimage.h"
 #include "tracksliderpopup.h"
 
-class QPaintEvent;
-
 const int TrackSliderPopup::kTextMargin = 4;
 const int TrackSliderPopup::kPointLength = 16;
 const int TrackSliderPopup::kPointWidth = 4;

src/widgets/tracksliderpopup.h

@@ -31,7 +31,6 @@
 #include <QFont>
 #include <QFontMetrics>
 #include <QPoint>
-#include <QtEvents>
 
 class QMouseEvent;
 class QPaintEvent;

src/widgets/tracksliderslider.cpp

@@ -27,7 +27,10 @@
 #include <QRect>
 #include <QStyle>
 #include <QStyleOption>
-#include <QtEvents>
+#include <QEvent>
+#include <QKeyEvent>
+#include <QMouseEvent>
+#include <QWheelEvent>
 
 #include "core/timeconstants.h"
 #include "core/utilities.h"

src/widgets/tracksliderslider.h

@@ -24,11 +24,10 @@
 #include "config.h"
 
 #include <QObject>
-#include <QWidget>
 #include <QString>
 #include <QSlider>
-#include <QtEvents>
 
+class QWidget;
 class QEvent;
 class QKeyEvent;
 class QMouseEvent;

src/widgets/volumeslider.h

@@ -22,7 +22,6 @@
 
 #include "config.h"
 
-
 #include <QtGlobal>
 #include <QObject>
 #include <QWidget>
@@ -32,9 +31,8 @@
 #include <QColor>
 #include <QPalette>
 #include <QSlider>
-#include <QTimer>
-#include <QtEvents>
 
+class QTimer;
 class QEvent;
 class QMouseEvent;
 class QPaintEvent;