Fix includes

diff --git a/src/jogshuttle.h b/src/jogshuttle.h
index 6b70be86d5c086f025630281a29704541e66041e..d0bb786753e4984091d60f3153e5f3674957c46a 100644 (file)
--- a/src/jogshuttle.h
+++ b/src/jogshuttle.h
@@ -21,7 +21,7 @@
 #ifndef SHUTTLE_H
 #define SHUTTLE_H
 
-#include <qthread.h>
+#include <QThread>
 #include <QObject>
 
 #include <linux/input.h>

diff --git a/src/scopes/abstractscopewidget.cpp b/src/scopes/abstractscopewidget.cpp
index 0cc2aa39276e8878212ca50e3de5c271f5c4a876..4f94ba43297f66a4d6523b622abb09eb1e82cebf 100644 (file)
--- a/src/scopes/abstractscopewidget.cpp
+++ b/src/scopes/abstractscopewidget.cpp
@@ -14,7 +14,6 @@
 #include "renderer.h"
 #include "monitor.h"
 
-#include <QFuture>
 #include <QColor>
 #include <QMenu>
 #include <QMouseEvent>

diff --git a/src/scopes/abstractscopewidget.h b/src/scopes/abstractscopewidget.h
index c15b42712a9ee53b57b56b5ac613f007248cd76d..9499fea05b0ab5bfeff683f30d6ae32e7262d566 100644 (file)
--- a/src/scopes/abstractscopewidget.h
+++ b/src/scopes/abstractscopewidget.h
@@ -13,9 +13,9 @@
 #ifndef ABSTRACTSCOPEWIDGET_H
 #define ABSTRACTSCOPEWIDGET_H
 
-#include <QtCore>
 #include <QWidget>
-
+#include <QSemaphore>
+#include <QFuture>
 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 0b8eedc84f7adeedc887b2b91f0b7c909f40ce3f..a862ecf186757f179945bbdde03d60d54e8643d1 100644 (file)
--- a/src/scopes/audioscopes/abstractaudioscopewidget.cpp
+++ b/src/scopes/audioscopes/abstractaudioscopewidget.cpp
@@ -12,12 +12,6 @@
 #include "renderer.h"
 #include "monitor.h"
 
-#include <QtConcurrentRun>
-#include <QFuture>
-#include <QColor>
-#include <QMenu>
-#include <QMouseEvent>
-#include <QPainter>
 
 // Uncomment for debugging
 //#define DEBUG_AASW

diff --git a/src/scopes/audioscopes/abstractaudioscopewidget.h b/src/scopes/audioscopes/abstractaudioscopewidget.h
index 98c3fed7faa9945c375a34148ac72f9567283f03..2487a811716eb87bee88fd6c0a8496b878ff1cb0 100644 (file)
--- a/src/scopes/audioscopes/abstractaudioscopewidget.h
+++ b/src/scopes/audioscopes/abstractaudioscopewidget.h
@@ -12,7 +12,6 @@
 #define ABSTRACTAUDIOSCOPEWIDGET_H
 
 
-#include <QtCore>
 #include <QWidget>
 
 #include <stdint.h>

diff --git a/src/scopes/audioscopes/audiosignal.cpp b/src/scopes/audioscopes/audiosignal.cpp
index 4782c6420dc80741e4ab1b817a2287f2ac741beb..e9c537877e2e3ceee03dc7b6c0e11e13ee337b01 100644 (file)
--- a/src/scopes/audioscopes/audiosignal.cpp
+++ b/src/scopes/audioscopes/audiosignal.cpp
@@ -19,15 +19,11 @@
 
 #include "audiosignal.h"
 
-#include <KLocale>
 #include <KDebug>
 
-#include <QVBoxLayout>
-#include <QAction>
-#include <QMenu>
 #include <QPainter>
-#include <QDebug>
-#include <QList>
+#include <QMenu>
+#include <QTime>
 
 #include <math.h>
 

diff --git a/src/scopes/audioscopes/audiosignal.h b/src/scopes/audioscopes/audiosignal.h
index e4df41e5083dd0b1ff5faef3e993288900592847..37e2e1aaada836c104e147547ab57cbf5b15734e 100644 (file)
--- a/src/scopes/audioscopes/audiosignal.h
+++ b/src/scopes/audioscopes/audiosignal.h
@@ -24,7 +24,6 @@
 
 #include <QByteArray>
 #include <QList>
-#include <QColor>
 #include <QTimer>
 
 #include  <QWidget>

diff --git a/src/scopes/audioscopes/audiospectrum.cpp b/src/scopes/audioscopes/audiospectrum.cpp
index 71f13ecd928ba9dedc5ba41b3487b1c71255fe7c..63b477a3579670d5200cb1a93dd9c4dd84ef686b 100644 (file)
--- 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 <QMenu>
 #include <QPainter>
-#include <QMouseEvent>
+#include <QMenu>
 
 #include <iostream>
 

diff --git a/src/scopes/audioscopes/audiospectrum.h b/src/scopes/audioscopes/audiospectrum.h
index e35176313f10c1e502386639e04ac4741744a71a..4a983ce52da3fc4bb39e06315db6d9405359b8be 100644 (file)
--- a/src/scopes/audioscopes/audiospectrum.h
+++ b/src/scopes/audioscopes/audiospectrum.h
@@ -18,7 +18,6 @@
 // Show overmodulation
 #define DETECT_OVERMODULATION
 
-#include <QtCore>
 #include <QVector>
 #include <QHash>
 

diff --git a/src/scopes/audioscopes/spectrogram.h b/src/scopes/audioscopes/spectrogram.h
index 4274eeb15297785c1d701e2327b1c0718caae678..7f80b91a6b7f8d54fd933e95b64bc4bebc24541f 100644 (file)
--- a/src/scopes/audioscopes/spectrogram.h
+++ b/src/scopes/audioscopes/spectrogram.h
@@ -25,7 +25,6 @@
 #ifndef SPECTROGRAM_H
 #define SPECTROGRAM_H
 
-#include <QtCore>
 
 #include "abstractaudioscopewidget.h"
 #include "ui_spectrogram_ui.h"

diff --git a/src/scopes/colorscopes/abstractgfxscopewidget.cpp b/src/scopes/colorscopes/abstractgfxscopewidget.cpp
index 9fda26f0bb4f25e4a4ffaa68b97585bd296f31fa..f39963f3e6a1c48ec4cf1dcc66fa2ef6d88f6cd6 100644 (file)
--- a/src/scopes/colorscopes/abstractgfxscopewidget.cpp
+++ b/src/scopes/colorscopes/abstractgfxscopewidget.cpp
@@ -12,18 +12,12 @@
 #include "renderer.h"
 #include "monitormanager.h"
 
-#include <QtConcurrentRun>
-#include <QFuture>
-#include <QColor>
-#include <QMenu>
 #include <QMouseEvent>
-#include <QPainter>
 
 // Uncomment for debugging.
 //#define DEBUG_AGSW
 
 #ifdef DEBUG_AGSW
-#include <QDebug>
 #endif
 
 const int REALTIME_FPS = 30;

diff --git a/src/scopes/colorscopes/rgbparade.h b/src/scopes/colorscopes/rgbparade.h
index 1cb98e25b573e54cbf817c9fac02a815f3c9e57e..1e5523fc97f5eff077e0c28a01562388102b51f1 100644 (file)
--- a/src/scopes/colorscopes/rgbparade.h
+++ b/src/scopes/colorscopes/rgbparade.h
@@ -11,7 +11,6 @@
 #ifndef RGBPARADE_H
 #define RGBPARADE_H
 
-#include <QObject>
 #include "abstractgfxscopewidget.h"
 #include "ui_rgbparade_ui.h"
 

diff --git a/src/scopes/colorscopes/vectorscope.cpp b/src/scopes/colorscopes/vectorscope.cpp
index 569e45ccb31edfa37edf49b53a47757ecd39805b..49632a5d96a22854465b566a340239f0726b11f6 100644 (file)
--- a/src/scopes/colorscopes/vectorscope.cpp
+++ b/src/scopes/colorscopes/vectorscope.cpp
@@ -10,13 +10,11 @@
 
 
 #include <QAction>
-#include <QColor>
 #include <QDebug>
-#include <QMouseEvent>
-#include <QMenu>
 #include <QPainter>
 
 #include <QTime>
+#include <QMenu>
 
 #include "colorplaneexport.h"
 #include "colortools.h"

diff --git a/src/scopes/colorscopes/vectorscope.h b/src/scopes/colorscopes/vectorscope.h
index 9bf0746beb3c270f482f11c930a9fdfaba85af72..bc5845065565d3cdd32cbbbdf43d691719bf76fe 100644 (file)
--- a/src/scopes/colorscopes/vectorscope.h
+++ b/src/scopes/colorscopes/vectorscope.h
@@ -11,7 +11,6 @@
 #ifndef VECTORSCOPE_H
 #define VECTORSCOPE_H
 
-#include <QtCore>
 #include "ui_vectorscope_ui.h"
 #include "abstractgfxscopewidget.h"
 

diff --git a/src/scopes/colorscopes/waveform.cpp b/src/scopes/colorscopes/waveform.cpp
index 0e7e60ba8c77eff6bb5228a62e7700b1d4a0b2c1..d3f52d14aa4e3bfa6c2553334aa134cf557916bf 100644 (file)
--- a/src/scopes/colorscopes/waveform.cpp
+++ b/src/scopes/colorscopes/waveform.cpp
@@ -8,10 +8,9 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-#include <QMenu>
-#include <QMouseEvent>
 #include <QPainter>
 #include <QPoint>
+#include <QMenu>
 
 // For reading out the project resolution
 #include "kdenlivesettings.h"