From 8a6e4eb1dea318ecd1c0b313c28b764e89a524c4 Mon Sep 17 00:00:00 2001 From: Montel Laurent Date: Wed, 11 Dec 2013 09:31:35 +0100 Subject: [PATCH] Fix includes --- src/jogshuttle.h | 2 +- src/scopes/abstractscopewidget.cpp | 1 - src/scopes/abstractscopewidget.h | 4 ++-- src/scopes/audioscopes/abstractaudioscopewidget.cpp | 6 ------ src/scopes/audioscopes/abstractaudioscopewidget.h | 1 - src/scopes/audioscopes/audiosignal.cpp | 8 ++------ src/scopes/audioscopes/audiosignal.h | 1 - src/scopes/audioscopes/audiospectrum.cpp | 3 +-- src/scopes/audioscopes/audiospectrum.h | 1 - src/scopes/audioscopes/spectrogram.h | 1 - src/scopes/colorscopes/abstractgfxscopewidget.cpp | 6 ------ src/scopes/colorscopes/rgbparade.h | 1 - src/scopes/colorscopes/vectorscope.cpp | 4 +--- src/scopes/colorscopes/vectorscope.h | 1 - src/scopes/colorscopes/waveform.cpp | 3 +-- 15 files changed, 8 insertions(+), 35 deletions(-) diff --git a/src/jogshuttle.h b/src/jogshuttle.h index 6b70be86..d0bb7867 100644 --- a/src/jogshuttle.h +++ b/src/jogshuttle.h @@ -21,7 +21,7 @@ #ifndef SHUTTLE_H #define SHUTTLE_H -#include +#include #include #include diff --git a/src/scopes/abstractscopewidget.cpp b/src/scopes/abstractscopewidget.cpp index 0cc2aa39..4f94ba43 100644 --- a/src/scopes/abstractscopewidget.cpp +++ b/src/scopes/abstractscopewidget.cpp @@ -14,7 +14,6 @@ #include "renderer.h" #include "monitor.h" -#include #include #include #include diff --git a/src/scopes/abstractscopewidget.h b/src/scopes/abstractscopewidget.h index c15b4271..9499fea0 100644 --- a/src/scopes/abstractscopewidget.h +++ b/src/scopes/abstractscopewidget.h @@ -13,9 +13,9 @@ #ifndef ABSTRACTSCOPEWIDGET_H #define ABSTRACTSCOPEWIDGET_H -#include #include - +#include +#include class QMenu; /** \brief Abstract class for audio/colour scopes (receive data and paint it). diff --git a/src/scopes/audioscopes/abstractaudioscopewidget.cpp b/src/scopes/audioscopes/abstractaudioscopewidget.cpp index 0b8eedc8..a862ecf1 100644 --- a/src/scopes/audioscopes/abstractaudioscopewidget.cpp +++ b/src/scopes/audioscopes/abstractaudioscopewidget.cpp @@ -12,12 +12,6 @@ #include "renderer.h" #include "monitor.h" -#include -#include -#include -#include -#include -#include // Uncomment for debugging //#define DEBUG_AASW diff --git a/src/scopes/audioscopes/abstractaudioscopewidget.h b/src/scopes/audioscopes/abstractaudioscopewidget.h index 98c3fed7..2487a811 100644 --- a/src/scopes/audioscopes/abstractaudioscopewidget.h +++ b/src/scopes/audioscopes/abstractaudioscopewidget.h @@ -12,7 +12,6 @@ #define ABSTRACTAUDIOSCOPEWIDGET_H -#include #include #include diff --git a/src/scopes/audioscopes/audiosignal.cpp b/src/scopes/audioscopes/audiosignal.cpp index 4782c642..e9c53787 100644 --- a/src/scopes/audioscopes/audiosignal.cpp +++ b/src/scopes/audioscopes/audiosignal.cpp @@ -19,15 +19,11 @@ #include "audiosignal.h" -#include #include -#include -#include -#include #include -#include -#include +#include +#include #include diff --git a/src/scopes/audioscopes/audiosignal.h b/src/scopes/audioscopes/audiosignal.h index e4df41e5..37e2e1aa 100644 --- a/src/scopes/audioscopes/audiosignal.h +++ b/src/scopes/audioscopes/audiosignal.h @@ -24,7 +24,6 @@ #include #include -#include #include #include diff --git a/src/scopes/audioscopes/audiospectrum.cpp b/src/scopes/audioscopes/audiospectrum.cpp index 71f13ecd..63b477a3 100644 --- a/src/scopes/audioscopes/audiospectrum.cpp +++ b/src/scopes/audioscopes/audiospectrum.cpp @@ -14,9 +14,8 @@ #include "lib/audio/fftTools.h" #include "lib/external/kiss_fft/tools/kiss_fftr.h" -#include #include -#include +#include #include diff --git a/src/scopes/audioscopes/audiospectrum.h b/src/scopes/audioscopes/audiospectrum.h index e3517631..4a983ce5 100644 --- a/src/scopes/audioscopes/audiospectrum.h +++ b/src/scopes/audioscopes/audiospectrum.h @@ -18,7 +18,6 @@ // Show overmodulation #define DETECT_OVERMODULATION -#include #include #include diff --git a/src/scopes/audioscopes/spectrogram.h b/src/scopes/audioscopes/spectrogram.h index 4274eeb1..7f80b91a 100644 --- a/src/scopes/audioscopes/spectrogram.h +++ b/src/scopes/audioscopes/spectrogram.h @@ -25,7 +25,6 @@ #ifndef SPECTROGRAM_H #define SPECTROGRAM_H -#include #include "abstractaudioscopewidget.h" #include "ui_spectrogram_ui.h" diff --git a/src/scopes/colorscopes/abstractgfxscopewidget.cpp b/src/scopes/colorscopes/abstractgfxscopewidget.cpp index 9fda26f0..f39963f3 100644 --- a/src/scopes/colorscopes/abstractgfxscopewidget.cpp +++ b/src/scopes/colorscopes/abstractgfxscopewidget.cpp @@ -12,18 +12,12 @@ #include "renderer.h" #include "monitormanager.h" -#include -#include -#include -#include #include -#include // Uncomment for debugging. //#define DEBUG_AGSW #ifdef DEBUG_AGSW -#include #endif const int REALTIME_FPS = 30; diff --git a/src/scopes/colorscopes/rgbparade.h b/src/scopes/colorscopes/rgbparade.h index 1cb98e25..1e5523fc 100644 --- a/src/scopes/colorscopes/rgbparade.h +++ b/src/scopes/colorscopes/rgbparade.h @@ -11,7 +11,6 @@ #ifndef RGBPARADE_H #define RGBPARADE_H -#include #include "abstractgfxscopewidget.h" #include "ui_rgbparade_ui.h" diff --git a/src/scopes/colorscopes/vectorscope.cpp b/src/scopes/colorscopes/vectorscope.cpp index 569e45cc..49632a5d 100644 --- a/src/scopes/colorscopes/vectorscope.cpp +++ b/src/scopes/colorscopes/vectorscope.cpp @@ -10,13 +10,11 @@ #include -#include #include -#include -#include #include #include +#include #include "colorplaneexport.h" #include "colortools.h" diff --git a/src/scopes/colorscopes/vectorscope.h b/src/scopes/colorscopes/vectorscope.h index 9bf0746b..bc584506 100644 --- a/src/scopes/colorscopes/vectorscope.h +++ b/src/scopes/colorscopes/vectorscope.h @@ -11,7 +11,6 @@ #ifndef VECTORSCOPE_H #define VECTORSCOPE_H -#include #include "ui_vectorscope_ui.h" #include "abstractgfxscopewidget.h" diff --git a/src/scopes/colorscopes/waveform.cpp b/src/scopes/colorscopes/waveform.cpp index 0e7e60ba..d3f52d14 100644 --- a/src/scopes/colorscopes/waveform.cpp +++ b/src/scopes/colorscopes/waveform.cpp @@ -8,10 +8,9 @@ * (at your option) any later version. * ***************************************************************************/ -#include -#include #include #include +#include // For reading out the project resolution #include "kdenlivesettings.h" -- 2.39.2