Update include paths in all source/header files

OpenShot · Oct 18, 2020 · aa40ea2 · aa40ea2
1 parent a6441d8
commit aa40ea2
Show file tree

Hide file tree

Showing 77 changed files with 143 additions and 174 deletions.
diff --git a/src/AudioBufferSource.cpp b/src/AudioBufferSource.cpp
@@ -28,7 +28,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/AudioBufferSource.h"
+#include "AudioBufferSource.h"
 
 using namespace std;
 using namespace openshot;

diff --git a/src/AudioReaderSource.cpp b/src/AudioReaderSource.cpp
@@ -28,7 +28,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/AudioReaderSource.h"
+#include "AudioReaderSource.h"
 
 using namespace std;
 using namespace openshot;

diff --git a/src/AudioResampler.cpp b/src/AudioResampler.cpp
@@ -28,7 +28,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/AudioResampler.h"
+#include "AudioResampler.h"
 
 using namespace std;
 using namespace openshot;

diff --git a/src/CacheBase.cpp b/src/CacheBase.cpp
@@ -28,7 +28,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/CacheBase.h"
+#include "CacheBase.h"
 
 using namespace std;
 using namespace openshot;

diff --git a/src/CacheDisk.cpp b/src/CacheDisk.cpp
@@ -28,8 +28,8 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/CacheDisk.h"
-#include "../include/QtUtilities.h"
+#include "CacheDisk.h"
+#include "QtUtilities.h"
 #include <Qt>
 #include <QString>
 #include <QTextStream>

diff --git a/src/CacheMemory.cpp b/src/CacheMemory.cpp
@@ -28,7 +28,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/CacheMemory.h"
+#include "CacheMemory.h"
 
 using namespace std;
 using namespace openshot;

diff --git a/src/ChunkReader.cpp b/src/ChunkReader.cpp
@@ -28,8 +28,10 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/ChunkReader.h"
-#include "../include/FFmpegReader.h"
+#include "ChunkReader.h"
+#include "FFmpegReader.h"
+
+#include <QDir>
 
 using namespace openshot;
 

diff --git a/src/ChunkReader.h b/src/ChunkReader.h
@@ -32,18 +32,12 @@
 #define OPENSHOT_CHUNK_READER_H
 
 #include "ReaderBase.h"
-#include <cmath>
-#include <ctime>
-#include <iostream>
-#include <fstream>
-#include <omp.h>
-#include <cstdio>
-#include <cstdlib>
+#include <string>
 #include <memory>
-#include <QtCore/QDir>
+
+#include "Frame.h"
 #include "Json.h"
 #include "CacheMemory.h"
-#include "Exceptions.h"
 
 namespace openshot
 {

diff --git a/src/ChunkWriter.cpp b/src/ChunkWriter.cpp
@@ -28,7 +28,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/ChunkWriter.h"
+#include "ChunkWriter.h"
 
 using namespace openshot;
 

diff --git a/src/Clip.cpp b/src/Clip.cpp
@@ -28,17 +28,17 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/Clip.h"
-#include "../include/FFmpegReader.h"
-#include "../include/FrameMapper.h"
+#include "Clip.h"
+#include "FFmpegReader.h"
+#include "FrameMapper.h"
 #ifdef USE_IMAGEMAGICK
-	#include "../include/ImageReader.h"
-	#include "../include/TextReader.h"
+	#include "ImageReader.h"
+	#include "TextReader.h"
 #endif
-#include "../include/QtImageReader.h"
-#include "../include/ChunkReader.h"
-#include "../include/DummyReader.h"
-#include "../include/Timeline.h"
+#include "QtImageReader.h"
+#include "ChunkReader.h"
+#include "DummyReader.h"
+#include "Timeline.h"
 
 using namespace openshot;
 

diff --git a/src/ClipBase.cpp b/src/ClipBase.cpp
@@ -28,7 +28,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/ClipBase.h"
+#include "ClipBase.h"
 
 using namespace openshot;
 

diff --git a/src/Color.cpp b/src/Color.cpp
@@ -28,7 +28,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/Color.h"
+#include "Color.h"
 
 using namespace openshot;
 

diff --git a/src/Coordinate.cpp b/src/Coordinate.cpp
@@ -28,7 +28,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/Coordinate.h"
+#include "Coordinate.h"
 
 using namespace std;
 using namespace openshot;

diff --git a/src/CrashHandler.cpp b/src/CrashHandler.cpp
@@ -28,7 +28,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/CrashHandler.h"
+#include "CrashHandler.h"
 
 using namespace std;
 using namespace openshot;

diff --git a/src/DecklinkInput.cpp b/src/DecklinkInput.cpp
@@ -53,7 +53,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/DecklinkInput.h"
+#include "DecklinkInput.h"
 
 using namespace std;
 

diff --git a/src/DecklinkOutput.cpp b/src/DecklinkOutput.cpp
@@ -53,7 +53,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/DecklinkOutput.h"
+#include "DecklinkOutput.h"
 
 using namespace std;
 

diff --git a/src/DecklinkReader.cpp b/src/DecklinkReader.cpp
@@ -28,7 +28,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/DecklinkReader.h"
+#include "DecklinkReader.h"
 
 using namespace openshot;
 

diff --git a/src/DecklinkWriter.cpp b/src/DecklinkWriter.cpp
@@ -28,7 +28,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/DecklinkWriter.h"
+#include "DecklinkWriter.h"
 
 using namespace openshot;
 

diff --git a/src/DummyReader.cpp b/src/DummyReader.cpp
@@ -28,7 +28,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/DummyReader.h"
+#include "DummyReader.h"
 
 using namespace openshot;
 

diff --git a/src/EffectBase.cpp b/src/EffectBase.cpp
@@ -28,7 +28,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/EffectBase.h"
+#include "EffectBase.h"
 
 using namespace openshot;
 

diff --git a/src/EffectInfo.cpp b/src/EffectInfo.cpp
@@ -28,8 +28,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/EffectInfo.h"
-
+#include "EffectInfo.h"
 
 using namespace openshot;
 

diff --git a/src/FFmpegReader.cpp b/src/FFmpegReader.cpp
@@ -31,7 +31,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/FFmpegReader.h"
+#include "FFmpegReader.h"
 
 #include <thread>    // for std::this_thread::sleep_for
 #include <chrono>    // for std::chrono::milliseconds

diff --git a/src/FFmpegWriter.cpp b/src/FFmpegWriter.cpp
@@ -31,7 +31,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/FFmpegWriter.h"
+#include "FFmpegWriter.h"
 
 #include <iostream>
 

diff --git a/src/Fraction.cpp b/src/Fraction.cpp
@@ -28,7 +28,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/Fraction.h"
+#include "Fraction.h"
 
 using namespace openshot;
 

diff --git a/src/Frame.cpp b/src/Frame.cpp
@@ -28,7 +28,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/Frame.h"
+#include "Frame.h"
 #include "JuceHeader.h"
 
 #include <QApplication>

diff --git a/src/FrameMapper.cpp b/src/FrameMapper.cpp
@@ -28,7 +28,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/FrameMapper.h"
+#include "FrameMapper.h"
 
 using namespace std;
 using namespace openshot;

diff --git a/src/ImageReader.cpp b/src/ImageReader.cpp
@@ -31,7 +31,7 @@
 // Require ImageMagick support
 #ifdef USE_IMAGEMAGICK
 
-#include "../include/ImageReader.h"
+#include "ImageReader.h"
 
 using namespace openshot;
 

diff --git a/src/ImageWriter.cpp b/src/ImageWriter.cpp
@@ -34,7 +34,7 @@
 //Require ImageMagick support
 #ifdef USE_IMAGEMAGICK
 
-#include "../include/ImageWriter.h"
+#include "ImageWriter.h"
 
 using namespace openshot;
 

diff --git a/src/Json.cpp b/src/Json.cpp
@@ -28,7 +28,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/Json.h"
+#include "Json.h"
 
 const Json::Value openshot::stringToJson(const std::string value) {
 

diff --git a/src/KeyFrame.cpp b/src/KeyFrame.cpp
@@ -28,7 +28,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/KeyFrame.h"
+#include "KeyFrame.h"
 #include <algorithm>
 #include <functional>
 #include <utility>

diff --git a/src/PlayerBase.cpp b/src/PlayerBase.cpp
@@ -28,7 +28,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/PlayerBase.h"
+#include "PlayerBase.h"
 
 using namespace openshot;
 

diff --git a/src/Point.cpp b/src/Point.cpp
@@ -28,7 +28,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/Point.h"
+#include "Point.h"
 
 using namespace std;
 using namespace openshot;

diff --git a/src/Profiles.cpp b/src/Profiles.cpp
@@ -28,7 +28,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/Profiles.h"
+#include "Profiles.h"
 
 using namespace openshot;
 

diff --git a/src/Qt/AudioPlaybackThread.cpp b/src/Qt/AudioPlaybackThread.cpp
@@ -29,7 +29,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../../include/Qt/AudioPlaybackThread.h"
+#include "AudioPlaybackThread.h"
 
 #include <thread>    // for std::this_thread::sleep_for
 #include <chrono>    // for std::chrono::milliseconds

diff --git a/src/Qt/PlayerDemo.cpp b/src/Qt/PlayerDemo.cpp
@@ -28,9 +28,11 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <cstdio>
-#include "../../include/QtPlayer.h"
-#include "../../include/Qt/PlayerDemo.h"
+#include <string>
+
+#include "PlayerDemo.h"
+#include "../QtPlayer.h"
+
 #include <QMessageBox>
 #include <QFileDialog>
 #include <QWidget>

diff --git a/src/Qt/PlayerPrivate.cpp b/src/Qt/PlayerPrivate.cpp
@@ -29,7 +29,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../../include/Qt/PlayerPrivate.h"
+#include "PlayerPrivate.h"
 
 #include <thread>    // for std::this_thread::sleep_for
 #include <chrono>    // for std::chrono milliseconds, high_resolution_clock

diff --git a/src/Qt/VideoCacheThread.cpp b/src/Qt/VideoCacheThread.cpp
@@ -28,7 +28,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../../include/Qt/VideoCacheThread.h"
+#include "VideoCacheThread.h"
 #include <algorithm>
 
 #include <thread>    // for std::this_thread::sleep_for

diff --git a/src/Qt/VideoPlaybackThread.cpp b/src/Qt/VideoPlaybackThread.cpp
@@ -29,7 +29,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../../include/Qt/VideoPlaybackThread.h"
+#include "VideoPlaybackThread.h"
 
 namespace openshot
 {

diff --git a/src/Qt/VideoRenderWidget.cpp b/src/Qt/VideoRenderWidget.cpp
@@ -28,7 +28,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../../include/Qt/VideoRenderWidget.h"
+#include "VideoRenderWidget.h"
 #include <QWidget>
 #include <QImage>
 #include <QPainter>