From 5ad4ccc0dc62ec41935c2af3242d429ec11b2c83 Mon Sep 17 00:00:00 2001
From: Kubat <mael.martin31@gmail.com>
Date: Sun, 20 Jun 2021 22:20:01 +0200
Subject: [PATCH] MISC: Change back -> header are next to their source file

---
 CMakeLists.txt                      | 2 +-
 src/AudioVisualizer.cc              | 3 ++-
 {inc/Vivy => src}/AudioVisualizer.h | 3 +--
 src/Main.cc                         | 2 +-
 src/MainWindow.cc                   | 2 +-
 {inc/Vivy => src}/MainWindow.h      | 2 +-
 src/Timer.cc                        | 2 +-
 {inc/Vivy => src}/Timer.h           | 4 ++--
 src/TimingBar.cc                    | 2 +-
 {inc/Vivy => src}/TimingBar.h       | 0
 10 files changed, 11 insertions(+), 11 deletions(-)
 rename {inc/Vivy => src}/AudioVisualizer.h (92%)
 rename {inc/Vivy => src}/MainWindow.h (94%)
 rename {inc/Vivy => src}/Timer.h (95%)
 rename {inc/Vivy => src}/TimingBar.h (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index be0aff1b..2867edb1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,7 +27,7 @@ file(GLOB Vivy_SRC
     "${CMAKE_CURRENT_SOURCE_DIR}/src/*.c"
 )
 file(GLOB Vivy_INC
-    "${CMAKE_CURRENT_SOURCE_DIR}/inc/Vivy/*.h"
+    "${CMAKE_CURRENT_SOURCE_DIR}/src/*.h"
 )
 set(PROJECT_SOURCES
     ${Vivy_SRC}
diff --git a/src/AudioVisualizer.cc b/src/AudioVisualizer.cc
index 8de3f03c..a882eb27 100644
--- a/src/AudioVisualizer.cc
+++ b/src/AudioVisualizer.cc
@@ -1,4 +1,5 @@
-#include <Vivy/AudioVisualizer.h>
+#include "AudioVisualizer.h"
+#include "Timer.h"
 
 #include <QLabel>
 #include <QScrollArea>
diff --git a/inc/Vivy/AudioVisualizer.h b/src/AudioVisualizer.h
similarity index 92%
rename from inc/Vivy/AudioVisualizer.h
rename to src/AudioVisualizer.h
index 9b14e7b3..7929fe42 100644
--- a/inc/Vivy/AudioVisualizer.h
+++ b/src/AudioVisualizer.h
@@ -1,10 +1,9 @@
 #ifndef VIVY_AUDIOVISUALIZER_H
 #define VIVY_AUDIOVISUALIZER_H
 
+#include "Timer.h"
 #include <QWidget>
 
-#include <Vivy/Timer.h>
-
 class AudioVisualizer : public QWidget {
     Q_OBJECT
 
diff --git a/src/Main.cc b/src/Main.cc
index 22dc17c1..92644d33 100644
--- a/src/Main.cc
+++ b/src/Main.cc
@@ -1,4 +1,4 @@
-#include <Vivy/MainWindow.h>
+#include "MainWindow.h"
 #include <QApplication>
 
 int
diff --git a/src/MainWindow.cc b/src/MainWindow.cc
index af9926e1..7ac096d4 100644
--- a/src/MainWindow.cc
+++ b/src/MainWindow.cc
@@ -1,4 +1,4 @@
-#include <Vivy/MainWindow.h>
+#include "MainWindow.h"
 
 #include <iostream>
 #include <cstring>
diff --git a/inc/Vivy/MainWindow.h b/src/MainWindow.h
similarity index 94%
rename from inc/Vivy/MainWindow.h
rename to src/MainWindow.h
index 91509b34..e2166b04 100644
--- a/inc/Vivy/MainWindow.h
+++ b/src/MainWindow.h
@@ -1,8 +1,8 @@
 #ifndef VIVY_MAINWINDOW_H
 #define VIVY_MAINWINDOW_H
 
+#include "AudioVisualizer.h"
 #include <QMainWindow>
-#include <Vivy/AudioVisualizer.h>
 
 class QMenu;
 class QAction;
diff --git a/src/Timer.cc b/src/Timer.cc
index b964c953..de7dadf3 100644
--- a/src/Timer.cc
+++ b/src/Timer.cc
@@ -1,4 +1,4 @@
-#include <Vivy/Timer.h>
+#include "Timer.h"
 
 #include <QLabel>
 #include <QGraphicsLineItem>
diff --git a/inc/Vivy/Timer.h b/src/Timer.h
similarity index 95%
rename from inc/Vivy/Timer.h
rename to src/Timer.h
index 7bc6d473..2d0d93bd 100644
--- a/inc/Vivy/Timer.h
+++ b/src/Timer.h
@@ -1,13 +1,13 @@
 #ifndef VIVY_TIMER_H
 #define VIVY_TIMER_H
 
+#include "TimingBar.h"
+
 #include <QWidget>
 #include <QColor>
 #include <QVector>
 #include <QGraphicsView>
 
-#include <Vivy/TimingBar.h>
-
 class QGraphicsPixmapItem;
 
 class Timer final : public QGraphicsView {
diff --git a/src/TimingBar.cc b/src/TimingBar.cc
index a6502706..3c98a0b4 100644
--- a/src/TimingBar.cc
+++ b/src/TimingBar.cc
@@ -1,4 +1,4 @@
-#include <Vivy/TimingBar.h>
+#include "TimingBar.h"
 
 #include <QLabel>
 #include <QScrollArea>
diff --git a/inc/Vivy/TimingBar.h b/src/TimingBar.h
similarity index 100%
rename from inc/Vivy/TimingBar.h
rename to src/TimingBar.h
-- 
GitLab