Move Exceptions.h includes to .cpp files

OpenShot · Jan 26, 2021 · 2f3615f · 2f3615f
1 parent 7722914
commit 2f3615f
Show file tree

Hide file tree

Showing 76 changed files with 77 additions and 39 deletions.
diff --git a/src/AudioReaderSource.cpp b/src/AudioReaderSource.cpp
@@ -29,6 +29,7 @@
  */
 
 #include "AudioReaderSource.h"
+#include "Exceptions.h"
 
 using namespace std;
 using namespace openshot;

diff --git a/src/AudioResampler.h b/src/AudioResampler.h
@@ -32,7 +32,6 @@
 #define OPENSHOT_RESAMPLER_H
 
 #include "AudioBufferSource.h"
-#include "Exceptions.h"
 #include "JuceHeader.h"
 
 namespace openshot {

diff --git a/src/CacheBase.h b/src/CacheBase.h
@@ -34,7 +34,6 @@
 #include <memory>
 #include <cstdlib>
 #include "Frame.h"
-#include "Exceptions.h"
 #include "Json.h"
 
 namespace openshot {

diff --git a/src/CacheDisk.cpp b/src/CacheDisk.cpp
@@ -29,6 +29,7 @@
  */
 
 #include "CacheDisk.h"
+#include "Exceptions.h"
 #include "QtUtilities.h"
 #include <Qt>
 #include <QString>

diff --git a/src/CacheDisk.h b/src/CacheDisk.h
@@ -36,7 +36,6 @@
 #include <memory>
 #include "CacheBase.h"
 #include "Frame.h"
-#include "Exceptions.h"
 #include <QDir>
 
 namespace openshot {

diff --git a/src/CacheMemory.cpp b/src/CacheMemory.cpp
@@ -29,6 +29,7 @@
  */
 
 #include "CacheMemory.h"
+#include "Exceptions.h"
 
 using namespace std;
 using namespace openshot;

diff --git a/src/CacheMemory.h b/src/CacheMemory.h
@@ -36,7 +36,6 @@
 #include <memory>
 #include "CacheBase.h"
 #include "Frame.h"
-#include "Exceptions.h"
 
 namespace openshot {
 

diff --git a/src/ChunkReader.cpp b/src/ChunkReader.cpp
@@ -29,6 +29,7 @@
  */
 
 #include "ChunkReader.h"
+#include "Exceptions.h"
 #include "FFmpegReader.h"
 
 #include <QDir>

diff --git a/src/ChunkWriter.cpp b/src/ChunkWriter.cpp
@@ -29,6 +29,7 @@
  */
 
 #include "ChunkWriter.h"
+#include "Exceptions.h"
 
 using namespace openshot;
 

diff --git a/src/ChunkWriter.h b/src/ChunkWriter.h
@@ -35,7 +35,6 @@
 #include "WriterBase.h"
 #include "FFmpegWriter.h"
 #include "CacheMemory.h"
-#include "Exceptions.h"
 #include "Json.h"
 
 #include <cmath>

diff --git a/src/Clip.cpp b/src/Clip.cpp
@@ -29,6 +29,7 @@
  */
 
 #include "Clip.h"
+#include "Exceptions.h"
 #include "FFmpegReader.h"
 #include "FrameMapper.h"
 #ifdef USE_IMAGEMAGICK

diff --git a/src/ClipBase.h b/src/ClipBase.h
@@ -34,7 +34,6 @@
 #include <memory>
 #include <sstream>
 #include "CacheMemory.h"
-#include "Exceptions.h"
 #include "Frame.h"
 #include "Point.h"
 #include "KeyFrame.h"

diff --git a/src/Color.cpp b/src/Color.cpp
@@ -29,6 +29,7 @@
  */
 
 #include "Color.h"
+#include "Exceptions.h"
 
 using namespace openshot;
 

diff --git a/src/Coordinate.cpp b/src/Coordinate.cpp
@@ -29,6 +29,7 @@
  */
 
 #include "Coordinate.h"
+#include "Exceptions.h"
 
 using namespace std;
 using namespace openshot;

diff --git a/src/Coordinate.h b/src/Coordinate.h
@@ -32,7 +32,6 @@
 #define OPENSHOT_COORDINATE_H
 
 #include <iostream>
-#include "Exceptions.h"
 #include "Fraction.h"
 #include "Json.h"
 

diff --git a/src/DecklinkReader.cpp b/src/DecklinkReader.cpp
@@ -29,6 +29,7 @@
  */
 
 #include "DecklinkReader.h"
+#include "Exceptions.h"
 
 using namespace openshot;
 

diff --git a/src/DecklinkReader.h b/src/DecklinkReader.h
@@ -46,7 +46,6 @@
 #include <unistd.h>
 
 #include "CacheMemory.h"
-#include "Exceptions.h"
 #include "Frame.h"
 #include "DecklinkInput.h"
 

diff --git a/src/DecklinkWriter.h b/src/DecklinkWriter.h
@@ -46,7 +46,6 @@
 #include <unistd.h>
 
 #include "CacheMemory.h"
-#include "Exceptions.h"
 #include "Frame.h"
 #include "DecklinkOutput.h"
 

diff --git a/src/DummyReader.cpp b/src/DummyReader.cpp
@@ -29,6 +29,7 @@
  */
 
 #include "DummyReader.h"
+#include "Exceptions.h"
 
 using namespace openshot;
 

diff --git a/src/DummyReader.h b/src/DummyReader.h
@@ -40,7 +40,6 @@
 #include <stdio.h>
 #include <memory>
 #include "CacheMemory.h"
-#include "Exceptions.h"
 #include "Fraction.h"
 
 namespace openshot

diff --git a/src/EffectBase.cpp b/src/EffectBase.cpp
@@ -29,6 +29,7 @@
  */
 
 #include "EffectBase.h"
+#include "Exceptions.h"
 
 using namespace openshot;
 
@@ -148,4 +149,4 @@ openshot::ClipBase* EffectBase::ParentClip() {
 /// Set parent clip object of this reader
 void EffectBase::ParentClip(openshot::ClipBase* new_clip) {
 	clip = new_clip;
-}
+}
diff --git a/src/Exceptions.h b/src/Exceptions.h
@@ -382,7 +382,9 @@ namespace openshot {
 		 * @param file_path (optional) The input file being processed
 		 */
 		TooManySeeks(std::string message, std::string file_path="")
+#ifndef SWIG
 		__attribute__ ((deprecated (TMS_DEP_MSG) ))
+#endif
 			: ExceptionBase(message), file_path(file_path) { }
 		virtual ~TooManySeeks() noexcept {}
 	};

diff --git a/src/FFmpegReader.cpp b/src/FFmpegReader.cpp
@@ -32,6 +32,7 @@
  */
 
 #include "FFmpegReader.h"
+#include "Exceptions.h"
 
 #include <thread>    // for std::this_thread::sleep_for
 #include <chrono>    // for std::chrono::milliseconds

diff --git a/src/FFmpegReader.h b/src/FFmpegReader.h
@@ -46,7 +46,6 @@
 #include <memory>
 #include "CacheMemory.h"
 #include "Clip.h"
-#include "Exceptions.h"
 #include "OpenMPUtilities.h"
 #include "Settings.h"
 

diff --git a/src/FFmpegWriter.cpp b/src/FFmpegWriter.cpp
@@ -32,6 +32,7 @@
  */
 
 #include "FFmpegWriter.h"
+#include "Exceptions.h"
 
 #include <iostream>
 

diff --git a/src/FFmpegWriter.h b/src/FFmpegWriter.h
@@ -49,7 +49,6 @@
 #include <ctime>
 #include <unistd.h>
 #include "CacheMemory.h"
-#include "Exceptions.h"
 #include "OpenMPUtilities.h"
 #include "ZmqLogger.h"
 #include "Settings.h"

diff --git a/src/FrameMapper.cpp b/src/FrameMapper.cpp
@@ -29,6 +29,7 @@
  */
 
 #include "FrameMapper.h"
+#include "Exceptions.h"
 #include "Clip.h"
 
 using namespace std;

diff --git a/src/FrameMapper.h b/src/FrameMapper.h
@@ -40,7 +40,6 @@
 #include "ReaderBase.h"
 #include "Frame.h"
 #include "Fraction.h"
-#include "Exceptions.h"
 #include "KeyFrame.h"
 
 

diff --git a/src/ImageReader.cpp b/src/ImageReader.cpp
@@ -32,6 +32,7 @@
 #ifdef USE_IMAGEMAGICK
 
 #include "ImageReader.h"
+#include "Exceptions.h"
 
 using namespace openshot;
 

diff --git a/src/ImageReader.h b/src/ImageReader.h
@@ -43,7 +43,7 @@
 #include <stdio.h>
 #include <memory>
 #include "CacheMemory.h"
-#include "Exceptions.h"
+
 #include "MagickUtilities.h"
 
 namespace openshot

diff --git a/src/ImageWriter.cpp b/src/ImageWriter.cpp
@@ -35,6 +35,7 @@
 #ifdef USE_IMAGEMAGICK
 
 #include "ImageWriter.h"
+#include "Exceptions.h"
 
 using namespace openshot;
 

diff --git a/src/ImageWriter.h b/src/ImageWriter.h
@@ -49,7 +49,7 @@
 #include <stdio.h>
 #include <unistd.h>
 #include "CacheMemory.h"
-#include "Exceptions.h"
+
 #include "OpenMPUtilities.h"
 #include "MagickUtilities.h"
 

diff --git a/src/Json.cpp b/src/Json.cpp
@@ -29,6 +29,7 @@
  */
 
 #include "Json.h"
+#include "Exceptions.h"
 
 const Json::Value openshot::stringToJson(const std::string value) {
 

diff --git a/src/Json.h b/src/Json.h
@@ -33,7 +33,7 @@
 
 #include <string>
 #include "json/json.h"
-#include "Exceptions.h"
+
 
 namespace openshot {
     const Json::Value stringToJson(const std::string value);

diff --git a/src/KeyFrame.cpp b/src/KeyFrame.cpp
@@ -29,6 +29,7 @@
  */
 
 #include "KeyFrame.h"
+#include "Exceptions.h"
 #include <algorithm>
 #include <functional>
 #include <utility>

diff --git a/src/KeyFrame.h b/src/KeyFrame.h
@@ -36,7 +36,7 @@
 #include <cmath>
 #include <assert.h>
 #include <vector>
-#include "Exceptions.h"
+
 #include "Fraction.h"
 #include "Coordinate.h"
 #include "Point.h"

diff --git a/src/OpenShot.h b/src/OpenShot.h
@@ -118,7 +118,7 @@
 #include "Effects.h"
 #include "EffectInfo.h"
 #include "Enums.h"
-#include "Exceptions.h"
+
 #include "ReaderBase.h"
 #include "WriterBase.h"
 #include "FFmpegReader.h"

diff --git a/src/Point.cpp b/src/Point.cpp
@@ -29,6 +29,7 @@
  */
 
 #include "Point.h"
+#include "Exceptions.h"
 
 using namespace std;
 using namespace openshot;

diff --git a/src/Point.h b/src/Point.h
@@ -32,7 +32,7 @@
 #define OPENSHOT_POINT_H
 
 #include "Coordinate.h"
-#include "Exceptions.h"
+
 #include "Json.h"
 
 namespace openshot

diff --git a/src/Profiles.cpp b/src/Profiles.cpp
@@ -29,6 +29,7 @@
  */
 
 #include "Profiles.h"
+#include "Exceptions.h"
 
 using namespace openshot;
 

diff --git a/src/Profiles.h b/src/Profiles.h
@@ -41,7 +41,6 @@
 #include <QTextStream>
 #include <cstdio>
 #include <cstdlib>
-#include "Exceptions.h"
 #include "Fraction.h"
 #include "Json.h"
 

diff --git a/src/Qt/PlayerPrivate.cpp b/src/Qt/PlayerPrivate.cpp
@@ -30,6 +30,7 @@
  */
 
 #include "PlayerPrivate.h"
+#include "Exceptions.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
@@ -29,6 +29,7 @@
  */
 
 #include "VideoCacheThread.h"
+#include "Exceptions.h"
 #include <algorithm>
 
 #include <thread>    // for std::this_thread::sleep_for

diff --git a/src/QtHtmlReader.cpp b/src/QtHtmlReader.cpp
@@ -31,6 +31,7 @@
  */
 
 #include "QtHtmlReader.h"
+#include "Exceptions.h"
 #include <QImage>
 #include <QPainter>
 #include <QTextDocument>

diff --git a/src/QtHtmlReader.h b/src/QtHtmlReader.h
@@ -43,7 +43,7 @@
 #include <memory>
 #include "CacheMemory.h"
 #include "Enums.h"
-#include "Exceptions.h"
+
 
 class QImage;
 

diff --git a/src/QtImageReader.cpp b/src/QtImageReader.cpp
@@ -29,6 +29,7 @@
  */
 
 #include "QtImageReader.h"
+#include "Exceptions.h"
 #include "Settings.h"
 #include "Clip.h"
 #include "CacheMemory.h"

diff --git a/src/QtImageReader.h b/src/QtImageReader.h
@@ -37,7 +37,7 @@
 #include <omp.h>
 #include <stdio.h>
 #include <memory>
-#include "Exceptions.h"
+
 #include "ReaderBase.h"
 
 namespace openshot