From 2d5333250e09182840b749368a78bfb0148ae90d Mon Sep 17 00:00:00 2001
From: Kubat <mael.martin31@gmail.com>
Date: Sun, 20 Jun 2021 21:07:15 +0200
Subject: [PATCH] BUILD: Normalize file names and avoid UB with __NAME
 definitions in C++ files

---
 CMakeLists.txt                                         | 2 +-
 inc/{vivy/audioVisualizer.h => Vivy/AudioVisualizer.h} | 9 +++++----
 inc/{vivy/mainwindow.h => Vivy/MainWindow.h}           | 9 +++++----
 inc/{vivy/timer.h => Vivy/Timer.h}                     | 8 ++++----
 inc/{vivy/timingBar.h => Vivy/TimingBar.h}             | 6 +++---
 src/{audioVisualizer.cc => AudioVisualizer.cc}         | 2 +-
 src/{main.cc => Main.cc}                               | 3 +--
 src/{mainwindow.cc => MainWindow.cc}                   | 2 +-
 src/{timer.cc => Timer.cc}                             | 2 +-
 src/{timingBar.cc => TimingBar.cc}                     | 2 +-
 10 files changed, 23 insertions(+), 22 deletions(-)
 rename inc/{vivy/audioVisualizer.h => Vivy/AudioVisualizer.h} (74%)
 rename inc/{vivy/mainwindow.h => Vivy/MainWindow.h} (81%)
 rename inc/{vivy/timer.h => Vivy/Timer.h} (89%)
 rename inc/{vivy/timingBar.h => Vivy/TimingBar.h} (89%)
 rename src/{audioVisualizer.cc => AudioVisualizer.cc} (88%)
 rename src/{main.cc => Main.cc} (84%)
 rename src/{mainwindow.cc => MainWindow.cc} (99%)
 rename src/{timer.cc => Timer.cc} (97%)
 rename src/{timingBar.cc => TimingBar.cc} (97%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5d1d913f..be0aff1b 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}/inc/Vivy/*.h"
 )
 set(PROJECT_SOURCES
     ${Vivy_SRC}
diff --git a/inc/vivy/audioVisualizer.h b/inc/Vivy/AudioVisualizer.h
similarity index 74%
rename from inc/vivy/audioVisualizer.h
rename to inc/Vivy/AudioVisualizer.h
index 811e29e5..b2f93e73 100644
--- a/inc/vivy/audioVisualizer.h
+++ b/inc/Vivy/AudioVisualizer.h
@@ -1,5 +1,5 @@
-#ifndef AUDIOVISUALIZER_H
-#define AUDIOVISUALIZER_H
+#ifndef VIVY_AUDIOVISUALIZER_H
+#define VIVY_AUDIOVISUALIZER_H
 
 #include <QWidget>
 #include <QLabel>
@@ -8,7 +8,8 @@
 #include <QScrollBar>
 #include <QMessageBox>
 #include <QGraphicsPixmapItem>
-#include "timer.h"
+
+#include <Vivy/Timer.h>
 
 class AudioVisualizer : public QWidget {
     Q_OBJECT
@@ -21,4 +22,4 @@ public slots:
     void printSpectrum(QImage);
 };
 
-#endif
+#endif // VIVY_AUDIOVISUALIZER_H
diff --git a/inc/vivy/mainwindow.h b/inc/Vivy/MainWindow.h
similarity index 81%
rename from inc/vivy/mainwindow.h
rename to inc/Vivy/MainWindow.h
index 288d2843..b8bd8e9a 100644
--- a/inc/vivy/mainwindow.h
+++ b/inc/Vivy/MainWindow.h
@@ -1,5 +1,5 @@
-#ifndef MAINWINDOW_H
-#define MAINWINDOW_H
+#ifndef VIVY_MAINWINDOW_H
+#define VIVY_MAINWINDOW_H
 
 #include <QMainWindow>
 #include <QMenuBar>
@@ -7,10 +7,11 @@
 #include <QFileDialog>
 #include <QMessageBox>
 #include <QVBoxLayout>
-#include "audioVisualizer.h"
 #include <QPixmap>
 #include <QImage>
 
+#include <Vivy/AudioVisualizer.h>
+
 class MainWindow : public QMainWindow {
     Q_OBJECT
 
@@ -29,4 +30,4 @@ private:
     QMenu *helpMenu;
     QAction *openAudioFileAct;
 };
-#endif // MAINWINDOW_H
+#endif // VIVY_MAINWINDOW_H
diff --git a/inc/vivy/timer.h b/inc/Vivy/Timer.h
similarity index 89%
rename from inc/vivy/timer.h
rename to inc/Vivy/Timer.h
index 436b184b..7459a21e 100644
--- a/inc/vivy/timer.h
+++ b/inc/Vivy/Timer.h
@@ -1,5 +1,5 @@
-#ifndef __TIMER_H
-#define __TIMER_H
+#ifndef VIVY_TIMER_H
+#define VIVY_TIMER_H
 
 #include <QWidget>
 #include <QLabel>
@@ -15,7 +15,7 @@
 #include <QGraphicsLineItem>
 #include <QGraphicsPixmapItem>
 
-#include <vivy/timingBar.h>
+#include <Vivy/TimingBar.h>
 
 #define TO_ADD_TO_IMAGE_HEIGHT 2
 
@@ -41,4 +41,4 @@ protected:
 public slots:
 };
 
-#endif
+#endif // VIVY_TIMER_H
diff --git a/inc/vivy/timingBar.h b/inc/Vivy/TimingBar.h
similarity index 89%
rename from inc/vivy/timingBar.h
rename to inc/Vivy/TimingBar.h
index 47218189..0b342071 100644
--- a/inc/vivy/timingBar.h
+++ b/inc/Vivy/TimingBar.h
@@ -1,5 +1,5 @@
-#ifndef TIMING_BAR_H
-#define TIMING_BAR_H
+#ifndef VIVY_TIMING_BAR_H
+#define VIVY_TIMING_BAR_H
 
 #include <QWidget>
 #include <QLabel>
@@ -28,4 +28,4 @@ protected:
     */
 };
 
-#endif
+#endif // VIVY_TIMING_BAR_H
diff --git a/src/audioVisualizer.cc b/src/AudioVisualizer.cc
similarity index 88%
rename from src/audioVisualizer.cc
rename to src/AudioVisualizer.cc
index 5468b0d6..7946b59a 100644
--- a/src/audioVisualizer.cc
+++ b/src/AudioVisualizer.cc
@@ -1,4 +1,4 @@
-#include <vivy/audioVisualizer.h>
+#include <Vivy/AudioVisualizer.h>
 
 AudioVisualizer::AudioVisualizer(QWidget *parent)
     : QWidget(parent)
diff --git a/src/main.cc b/src/Main.cc
similarity index 84%
rename from src/main.cc
rename to src/Main.cc
index 85fbb00b..f9ea4198 100644
--- a/src/main.cc
+++ b/src/Main.cc
@@ -1,5 +1,4 @@
-#include <vivy/mainwindow.h>
-
+#include <Vivy/MainWindow.h>
 #include <QApplication>
 
 int
diff --git a/src/mainwindow.cc b/src/MainWindow.cc
similarity index 99%
rename from src/mainwindow.cc
rename to src/MainWindow.cc
index 6e45683f..bdc0a145 100644
--- a/src/mainwindow.cc
+++ b/src/MainWindow.cc
@@ -1,4 +1,4 @@
-#include <vivy/mainwindow.h>
+#include <Vivy/MainWindow.h>
 
 #include <iostream>
 #include <cstring>
diff --git a/src/timer.cc b/src/Timer.cc
similarity index 97%
rename from src/timer.cc
rename to src/Timer.cc
index 16df05f7..ea4acca1 100644
--- a/src/timer.cc
+++ b/src/Timer.cc
@@ -1,4 +1,4 @@
-#include <vivy/timer.h>
+#include <Vivy/Timer.h>
 
 Timer::Timer(QImage img, QWidget *parent)
     : QGraphicsView(parent)
diff --git a/src/timingBar.cc b/src/TimingBar.cc
similarity index 97%
rename from src/timingBar.cc
rename to src/TimingBar.cc
index 3efe7079..745c6e30 100644
--- a/src/timingBar.cc
+++ b/src/TimingBar.cc
@@ -1,4 +1,4 @@
-#include <vivy/timingBar.h>
+#include <Vivy/TimingBar.h>
 
 #define BAR_DEMI_WIDTH 2
 #define BAR_WIDTH      4
-- 
GitLab