MISC: Move most of the #include <Q...> to the source files

inc/Vivy/AudioVisualizer.h

@@ -2,12 +2,6 @@
 #define VIVY_AUDIOVISUALIZER_H
 
 #include <QWidget>
-#include <QLabel>
-#include <QScrollArea>
-#include <QVBoxLayout>
-#include <QScrollBar>
-#include <QMessageBox>
-#include <QGraphicsPixmapItem>
 
 #include <Vivy/Timer.h>
 

inc/Vivy/MainWindow.h

@@ -2,16 +2,11 @@
 #define VIVY_MAINWINDOW_H
 
 #include <QMainWindow>
-#include <QMenuBar>
-#include <QStatusBar>
-#include <QFileDialog>
-#include <QMessageBox>
-#include <QVBoxLayout>
-#include <QPixmap>
-#include <QImage>
-
 #include <Vivy/AudioVisualizer.h>
 
+class QMenu;
+class QAction;
+
 class MainWindow : public QMainWindow {
     Q_OBJECT
 

inc/Vivy/Timer.h

@@ -2,37 +2,30 @@
 #define VIVY_TIMER_H
 
 #include <QWidget>
-#include <QLabel>
-#include <QScrollArea>
-#include <QVBoxLayout>
-#include <QScrollBar>
-#include <QMessageBox>
-#include <QMouseEvent>
-#include <QPainter>
 #include <QColor>
-#include <QGraphicsView>
 #include <QVector>
-#include <QGraphicsLineItem>
-#include <QGraphicsPixmapItem>
+#include <QGraphicsView>
 
 #include <Vivy/TimingBar.h>
 
-class Timer : public QGraphicsView {
+class QGraphicsPixmapItem;
+
+class Timer final : public QGraphicsView {
     Q_OBJECT
 
 public:
+    static inline constexpr QColor startColour = QColor(127, 0, 127);
+    static inline constexpr QColor endColour   = QColor(0, 127, 0);
+
     Timer(QImage img, QWidget *parent = nullptr);
     ~Timer() = default;
 
-    QPainter painter;
+private:
     QGraphicsPixmapItem *bg = nullptr;
     QGraphicsScene *scene   = new QGraphicsScene;
-    QColor startColour      = QColor(127, 0, 127);
-    QColor endColour        = QColor(0, 127, 0);
     QImage img;
     QVector<QLine> lines;
 
-protected:
     void mousePressEvent(QMouseEvent *event);
 
 public slots:

inc/Vivy/TimingBar.h

@@ -2,17 +2,8 @@
 #define VIVY_TIMING_BAR_H
 
 #include <QWidget>
-#include <QLabel>
-#include <QScrollArea>
-#include <QVBoxLayout>
-#include <QScrollBar>
-#include <QMessageBox>
-#include <QMouseEvent>
 #include <QGraphicsItem>
 #include <QGraphicsLineItem>
-#include <QPen>
-#include <QGraphicsSceneMouseEvent>
-#include <QApplication>
 
 class TimingBar : public QGraphicsLineItem {
 public:

src/AudioVisualizer.cc

 #include <Vivy/AudioVisualizer.h>
 
+#include <QLabel>
+#include <QScrollArea>
+#include <QVBoxLayout>
+#include <QScrollBar>
+#include <QMessageBox>
+#include <QGraphicsPixmapItem>
+
 AudioVisualizer::AudioVisualizer(QWidget *parent)
     : QWidget(parent)
 {

src/Main.cc

@@ -2,7 +2,7 @@
 #include <QApplication>
 
 int
-main(int argc, char *argv[])
+main(int argc, char **argv)
 {
     QApplication app(argc, argv);
     MainWindow window;

src/MainWindow.cc

@@ -4,6 +4,13 @@
 #include <cstring>
 #include <cstdio>
 #include <QStandardPaths>
+#include <QPixmap>
+#include <QVBoxLayout>
+#include <QMessageBox>
+#include <QFileDialog>
+#include <QStatusBar>
+#include <QMenuBar>
+#include <QImage>
 
 extern "C" {
 #include <libavutil/opt.h>

src/Timer.cc

 #include <Vivy/Timer.h>
 
+#include <QLabel>
+#include <QGraphicsLineItem>
+#include <QGraphicsView>
+#include <QGraphicsPixmapItem>
+#include <QScrollArea>
+#include <QVBoxLayout>
+#include <QScrollBar>
+#include <QMessageBox>
+#include <QMouseEvent>
+#include <QPainter>
+
 #define TO_ADD_TO_IMAGE_HEIGHT 2 /* Used for alignement */
 
 Timer::Timer(QImage img, QWidget *parent)

src/TimingBar.cc

 #include <Vivy/TimingBar.h>
 
+#include <QLabel>
+#include <QScrollArea>
+#include <QPen>
+#include <QMessageBox>
+#include <QMouseEvent>
+#include <QGraphicsSceneMouseEvent>
+#include <QApplication>
+#include <QVBoxLayout>
+#include <QScrollBar>
+
 #define BAR_WIDTH      4
 #define BAR_DEMI_WIDTH ((int)(BAR_WIDTH / 2))