diff --git a/CMakeLists.txt b/CMakeLists.txt index 5d1d913f01bcc3adfb2c394d6c8745125a3bdf25..be0aff1bc436914e4957922d122ff070b32e2f95 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 811e29e5543be44760e7bf50b70fc41850013169..b2f93e7301eb891e1dc6f444d2fbc1bbc398cbd1 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 288d2843b787529dfea2433000e9cbe4b6dad8c6..b8bd8e9a2c445054b250216dba3f5eeaf2220ab7 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 436b184b7fa631e2cc73df0889aa9f77f5b58bac..7459a21e5e8ff84051b58c4b3c1a420ee701f9d1 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 47218189966d695a865054707aaaa5ffaeee5223..0b3420715cf47dea7908be88cbaf59c0b4ba4761 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 5468b0d68782a6ea29acd5f5dc668c969adbc57d..7946b59addcf9de4fdbabc0b2b2668e0045d9fd7 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 85fbb00b017ee0551e9713d2773aa9cd7f22ab2c..f9ea4198c5cf74cb258fe1c4952ad57dc723cac1 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 6e45683f5ad3d8822f5de7156174fe57cf2474e5..bdc0a1455104dcf64f2aa13d0ccefdb41dbbe3dd 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 16df05f7f58aec6294fd6d8b31588755075daca1..ea4acca1033aabe602bddbe9e4e44b25bb57537b 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 3efe7079fa5828c114d2e6b16b1806fbb71e9397..745c6e30707e217e6da90edac77d26c42e84bef9 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