Skip to content
Extraits de code Groupes Projets
Vérifiée Valider 2d533325 rédigé par Kubat's avatar Kubat
Parcourir les fichiers

BUILD: Normalize file names and avoid UB with __NAME definitions in C++ files

parent b2e215c7
Aucune branche associée trouvée
Aucune étiquette associée trouvée
1 requête de fusion!1MISC: Some changes done to cmake files and project organisation
......@@ -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}
......
#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
#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
#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
#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
#include <vivy/audioVisualizer.h>
#include <Vivy/AudioVisualizer.h>
AudioVisualizer::AudioVisualizer(QWidget *parent)
: QWidget(parent)
......
#include <vivy/mainwindow.h>
#include <Vivy/MainWindow.h>
#include <QApplication>
int
......
#include <vivy/mainwindow.h>
#include <Vivy/MainWindow.h>
#include <iostream>
#include <cstring>
......
#include <vivy/timer.h>
#include <Vivy/Timer.h>
Timer::Timer(QImage img, QWidget *parent)
: QGraphicsView(parent)
......
#include <vivy/timingBar.h>
#include <Vivy/TimingBar.h>
#define BAR_DEMI_WIDTH 2
#define BAR_WIDTH 4
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter