From 85a7d4d5afc91b3aa6e9c42194f9b6c7a3dea963 Mon Sep 17 00:00:00 2001
From: Kubat <mael.martin31@gmail.com>
Date: Mon, 28 Jun 2021 18:03:06 +0200
Subject: [PATCH] MISC: Move UI related files into their own folder

---
 CMakeLists.txt                   | 6 ++----
 src/Main.cc                      | 1 -
 src/{ => UI}/AudioVisualizer.cc  | 2 +-
 src/{ => UI}/AudioVisualizer.hh  | 0
 src/{ => UI}/DialogHelp.cc       | 2 +-
 src/{ => UI}/DialogHelp.hh       | 0
 src/{ => UI}/MainWindow.cc       | 4 ++--
 src/{ => UI}/MainWindow.hh       | 4 ++--
 src/{ => UI}/TimingBar.cc        | 0
 src/{ => UI}/TimingBar.hh        | 0
 src/{ => UI}/TimingScene.cc      | 2 +-
 src/{ => UI}/TimingScene.hh      | 4 ++--
 src/{ => UI}/TimingView.cc       | 0
 src/{ => UI}/TimingView.hh       | 2 +-
 src/{ => UI}/VivyDocumentView.cc | 2 +-
 src/{ => UI}/VivyDocumentView.hh | 2 +-
 src/VivyApplication.cc           | 2 +-
 17 files changed, 15 insertions(+), 18 deletions(-)
 rename src/{ => UI}/AudioVisualizer.cc (98%)
 rename src/{ => UI}/AudioVisualizer.hh (100%)
 rename src/{ => UI}/DialogHelp.cc (94%)
 rename src/{ => UI}/DialogHelp.hh (100%)
 rename src/{ => UI}/MainWindow.cc (99%)
 rename src/{ => UI}/MainWindow.hh (94%)
 rename src/{ => UI}/TimingBar.cc (100%)
 rename src/{ => UI}/TimingBar.hh (100%)
 rename src/{ => UI}/TimingScene.cc (98%)
 rename src/{ => UI}/TimingScene.hh (96%)
 rename src/{ => UI}/TimingView.cc (100%)
 rename src/{ => UI}/TimingView.hh (96%)
 rename src/{ => UI}/VivyDocumentView.cc (98%)
 rename src/{ => UI}/VivyDocumentView.hh (94%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6baee4fd..75ad7037 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,17 +30,15 @@ file(GLOB Vivy_SRC
     "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cc"
     "${CMAKE_CURRENT_SOURCE_DIR}/src/*.c"
     "${CMAKE_CURRENT_SOURCE_DIR}/src/Document/*.cc"
-    "${CMAKE_CURRENT_SOURCE_DIR}/src/Document/*.c"
     "${CMAKE_CURRENT_SOURCE_DIR}/src/Ass/*.cc"
-    "${CMAKE_CURRENT_SOURCE_DIR}/src/Ass/*.c"
+    "${CMAKE_CURRENT_SOURCE_DIR}/src/UI/*.cc"
 )
 file(GLOB Vivy_INC
     "${CMAKE_CURRENT_SOURCE_DIR}/src/*.h"
     "${CMAKE_CURRENT_SOURCE_DIR}/src/*.hh"
-    "${CMAKE_CURRENT_SOURCE_DIR}/src/Document/*.h"
     "${CMAKE_CURRENT_SOURCE_DIR}/src/Document/*.hh"
-    "${CMAKE_CURRENT_SOURCE_DIR}/src/Ass/*.h"
     "${CMAKE_CURRENT_SOURCE_DIR}/src/Ass/*.hh"
+    "${CMAKE_CURRENT_SOURCE_DIR}/src/UI/*.hh"
 )
 set(PROJECT_SOURCES
     ${Vivy_SRC}
diff --git a/src/Main.cc b/src/Main.cc
index a47f666c..1fcc24a1 100644
--- a/src/Main.cc
+++ b/src/Main.cc
@@ -1,4 +1,3 @@
-#include "MainWindow.hh"
 #include "VivyApplication.hh"
 
 int
diff --git a/src/AudioVisualizer.cc b/src/UI/AudioVisualizer.cc
similarity index 98%
rename from src/AudioVisualizer.cc
rename to src/UI/AudioVisualizer.cc
index 79ac7a93..b53c20d8 100644
--- a/src/AudioVisualizer.cc
+++ b/src/UI/AudioVisualizer.cc
@@ -1,5 +1,5 @@
 #include "AudioVisualizer.hh"
-#include "AudioUtils.h"
+#include "../AudioUtils.h"
 
 #include <QGraphicsPixmapItem>
 #include <QLabel>
diff --git a/src/AudioVisualizer.hh b/src/UI/AudioVisualizer.hh
similarity index 100%
rename from src/AudioVisualizer.hh
rename to src/UI/AudioVisualizer.hh
diff --git a/src/DialogHelp.cc b/src/UI/DialogHelp.cc
similarity index 94%
rename from src/DialogHelp.cc
rename to src/UI/DialogHelp.cc
index f3e34eb1..1eabd5c7 100644
--- a/src/DialogHelp.cc
+++ b/src/UI/DialogHelp.cc
@@ -1,5 +1,5 @@
 #include "DialogHelp.hh"
-#include "VivyApplication.hh"
+#include "../VivyApplication.hh"
 
 #include <QWidget>
 #include <QLabel>
diff --git a/src/DialogHelp.hh b/src/UI/DialogHelp.hh
similarity index 100%
rename from src/DialogHelp.hh
rename to src/UI/DialogHelp.hh
diff --git a/src/MainWindow.cc b/src/UI/MainWindow.cc
similarity index 99%
rename from src/MainWindow.cc
rename to src/UI/MainWindow.cc
index 10d54bba..2a5c1566 100644
--- a/src/MainWindow.cc
+++ b/src/UI/MainWindow.cc
@@ -1,8 +1,8 @@
 #include "MainWindow.hh"
 #include "DialogHelp.hh"
 #include "VivyDocumentView.hh"
-#include "Utils.hh"
-#include "VivyApplication.hh"
+#include "../Utils.hh"
+#include "../VivyApplication.hh"
 
 #include <functional>
 #include <optional>
diff --git a/src/MainWindow.hh b/src/UI/MainWindow.hh
similarity index 94%
rename from src/MainWindow.hh
rename to src/UI/MainWindow.hh
index 9beb5785..7947e04a 100644
--- a/src/MainWindow.hh
+++ b/src/UI/MainWindow.hh
@@ -5,9 +5,9 @@
 #error "This is a C++ header"
 #endif
 
-#include "Utils.hh"
+#include "../Utils.hh"
 #include "AudioVisualizer.hh"
-#include "Document/VivyDocumentStore.hh"
+#include "../Document/VivyDocumentStore.hh"
 #include "VivyDocumentView.hh"
 #include <QMainWindow>
 
diff --git a/src/TimingBar.cc b/src/UI/TimingBar.cc
similarity index 100%
rename from src/TimingBar.cc
rename to src/UI/TimingBar.cc
diff --git a/src/TimingBar.hh b/src/UI/TimingBar.hh
similarity index 100%
rename from src/TimingBar.hh
rename to src/UI/TimingBar.hh
diff --git a/src/TimingScene.cc b/src/UI/TimingScene.cc
similarity index 98%
rename from src/TimingScene.cc
rename to src/UI/TimingScene.cc
index 3d61703f..042149bd 100644
--- a/src/TimingScene.cc
+++ b/src/UI/TimingScene.cc
@@ -1,5 +1,5 @@
 #include "TimingScene.hh"
-#include "Utils.hh"
+#include "../Utils.hh"
 
 #include <QGraphicsLineItem>
 #include <QGraphicsPixmapItem>
diff --git a/src/TimingScene.hh b/src/UI/TimingScene.hh
similarity index 96%
rename from src/TimingScene.hh
rename to src/UI/TimingScene.hh
index a47560c1..ed6742f9 100644
--- a/src/TimingScene.hh
+++ b/src/UI/TimingScene.hh
@@ -1,8 +1,8 @@
 #ifndef VIVY_TIMING_SCENE_H
 #define VIVY_TIMING_SCENE_H
 
-#include "Utils.hh"
-#include "Ass/Ass.hh"
+#include "../Utils.hh"
+#include "../Ass/Ass.hh"
 #include "TimingBar.hh"
 
 #include <QWidget>
diff --git a/src/TimingView.cc b/src/UI/TimingView.cc
similarity index 100%
rename from src/TimingView.cc
rename to src/UI/TimingView.cc
diff --git a/src/TimingView.hh b/src/UI/TimingView.hh
similarity index 96%
rename from src/TimingView.hh
rename to src/UI/TimingView.hh
index bb64bc40..3358226c 100644
--- a/src/TimingView.hh
+++ b/src/UI/TimingView.hh
@@ -5,7 +5,7 @@
 #error "This is a C++ header"
 #endif
 
-#include "Utils.hh"
+#include "../Utils.hh"
 #include "TimingBar.hh"
 #include "TimingScene.hh"
 
diff --git a/src/VivyDocumentView.cc b/src/UI/VivyDocumentView.cc
similarity index 98%
rename from src/VivyDocumentView.cc
rename to src/UI/VivyDocumentView.cc
index 9d731c51..d9a0cc4c 100644
--- a/src/VivyDocumentView.cc
+++ b/src/UI/VivyDocumentView.cc
@@ -1,6 +1,6 @@
 #include "VivyDocumentView.hh"
 #include "AudioVisualizer.hh"
-#include "Document/VivyDocument.hh"
+#include "../Document/VivyDocument.hh"
 
 #include <QVBoxLayout>
 
diff --git a/src/VivyDocumentView.hh b/src/UI/VivyDocumentView.hh
similarity index 94%
rename from src/VivyDocumentView.hh
rename to src/UI/VivyDocumentView.hh
index 5bdd43f1..89788e56 100644
--- a/src/VivyDocumentView.hh
+++ b/src/UI/VivyDocumentView.hh
@@ -5,7 +5,7 @@
 #error "This is a C++ header"
 #endif
 
-#include "Document/VivyDocument.hh"
+#include "../Document/VivyDocument.hh"
 #include "AudioVisualizer.hh"
 
 #include <QWidget>
diff --git a/src/VivyApplication.cc b/src/VivyApplication.cc
index a5fe158a..5b231213 100644
--- a/src/VivyApplication.cc
+++ b/src/VivyApplication.cc
@@ -1,5 +1,5 @@
 #include "VivyApplication.hh"
-#include "MainWindow.hh"
+#include "UI/MainWindow.hh"
 
 using namespace Vivy;
 
-- 
GitLab