Merge pull request #265 from ferdnyc/catch-by-reference

Exceptions: catch-by-reference and other cleanup

include/Exceptions.h

@@ -32,7 +32,6 @@
 #define OPENSHOT_EXCEPTIONS_H
 
 #include <string>
-using namespace std;
 
 namespace openshot {
 
@@ -45,11 +44,11 @@ namespace openshot {
 	class BaseException : public std::exception //: public exception
 	{
 	protected:
-		string m_message;
+		std::string m_message;
 	public:
-		BaseException(string message) : m_message(message) { }
-		virtual ~BaseException() throw () {}
-		virtual const char* what() const throw () {
+		BaseException(std::string message) : m_message(message) { }
+		virtual ~BaseException() noexcept {}
+		virtual const char* what() const noexcept {
 			// return custom message
 			return m_message.c_str();
 		}
@@ -59,13 +58,12 @@ namespace openshot {
 	class ChunkNotFound : public BaseException
 	{
 	public:
-		string file_path;
 		int64_t frame_number;
 		int64_t chunk_number;
 		int64_t chunk_frame;
-		ChunkNotFound(string message, int64_t frame_number, int64_t chunk_number, int64_t chunk_frame)
+		ChunkNotFound(std::string message, int64_t frame_number, int64_t chunk_number, int64_t chunk_frame)
 			: BaseException(message), frame_number(frame_number), chunk_number(chunk_number), chunk_frame(chunk_frame) { }
-		virtual ~ChunkNotFound() throw () {}
+		virtual ~ChunkNotFound() noexcept {}
 	};
 
 
@@ -73,132 +71,129 @@ namespace openshot {
 	class DecklinkError : public BaseException
 	{
 	public:
-		DecklinkError(string message)
+		DecklinkError(std::string message)
 			: BaseException(message) { }
-		virtual ~DecklinkError() throw () {}
+		virtual ~DecklinkError() noexcept {}
 	};
 
 	/// Exception when decoding audio packet
 	class ErrorDecodingAudio : public BaseException
 	{
 	public:
-		string file_path;
 		int64_t frame_number;
-		ErrorDecodingAudio(string message, int64_t frame_number)
+		ErrorDecodingAudio(std::string message, int64_t frame_number)
 			: BaseException(message), frame_number(frame_number) { }
-		virtual ~ErrorDecodingAudio() throw () {}
+		virtual ~ErrorDecodingAudio() noexcept {}
 	};
 
 	/// Exception when encoding audio packet
 	class ErrorEncodingAudio : public BaseException
 	{
 	public:
-		string file_path;
 		int64_t frame_number;
-		ErrorEncodingAudio(string message, int64_t frame_number)
+		ErrorEncodingAudio(std::string message, int64_t frame_number)
 			: BaseException(message), frame_number(frame_number) { }
-		virtual ~ErrorEncodingAudio() throw () {}
+		virtual ~ErrorEncodingAudio() noexcept {}
 	};
 
 	/// Exception when encoding audio packet
 	class ErrorEncodingVideo : public BaseException
 	{
 	public:
-		string file_path;
 		int64_t frame_number;
-		ErrorEncodingVideo(string message, int64_t frame_number)
+		ErrorEncodingVideo(std::string message, int64_t frame_number)
 			: BaseException(message), frame_number(frame_number) { }
-		virtual ~ErrorEncodingVideo() throw () {}
+		virtual ~ErrorEncodingVideo() noexcept {}
 	};
 
 	/// Exception when an invalid # of audio channels are detected
 	class InvalidChannels : public BaseException
 	{
 	public:
-		string file_path;
-		InvalidChannels(string message, string file_path)
+		std::string file_path;
+		InvalidChannels(std::string message, std::string file_path)
 			: BaseException(message), file_path(file_path) { }
-		virtual ~InvalidChannels() throw () {}
+		virtual ~InvalidChannels() noexcept {}
 	};
 
 	/// Exception when no valid codec is found for a file
 	class InvalidCodec : public BaseException
 	{
 	public:
-		string file_path;
-		InvalidCodec(string message, string file_path)
+		std::string file_path;
+		InvalidCodec(std::string message, std::string file_path)
 			: BaseException(message), file_path(file_path) { }
-		virtual ~InvalidCodec() throw () {}
+		virtual ~InvalidCodec() noexcept {}
 	};
 
 	/// Exception for files that can not be found or opened
 	class InvalidFile : public BaseException
 	{
 	public:
-		string file_path;
-		InvalidFile(string message, string file_path)
+		std::string file_path;
+		InvalidFile(std::string message, std::string file_path)
 			: BaseException(message), file_path(file_path) { }
-		virtual ~InvalidFile() throw () {}
+		virtual ~InvalidFile() noexcept {}
 	};
 
 	/// Exception when no valid format is found for a file
 	class InvalidFormat : public BaseException
 	{
 	public:
-		string file_path;
-		InvalidFormat(string message, string file_path)
+		std::string file_path;
+		InvalidFormat(std::string message, std::string file_path)
 			: BaseException(message), file_path(file_path) { }
-		virtual ~InvalidFormat() throw () {}
+		virtual ~InvalidFormat() noexcept {}
 	};
 
 	/// Exception for invalid JSON
 	class InvalidJSON : public BaseException
 	{
 	public:
-		string file_path;
-		InvalidJSON(string message, string file_path)
+		std::string file_path;
+		InvalidJSON(std::string message, std::string file_path)
 			: BaseException(message), file_path(file_path) { }
-		virtual ~InvalidJSON() throw () {}
+		virtual ~InvalidJSON() noexcept {}
 	};
 
 	/// Exception when invalid encoding options are used
 	class InvalidOptions : public BaseException
 	{
 	public:
-		string file_path;
-		InvalidOptions(string message, string file_path)
+		std::string file_path;
+		InvalidOptions(std::string message, std::string file_path)
 			: BaseException(message), file_path(file_path) { }
-		virtual ~InvalidOptions() throw () {}
+		virtual ~InvalidOptions() noexcept {}
 	};
 
 	/// Exception when invalid sample rate is detected during encoding
 	class InvalidSampleRate : public BaseException
 	{
 	public:
-		string file_path;
-		InvalidSampleRate(string message, string file_path)
+		std::string file_path;
+		InvalidSampleRate(std::string message, std::string file_path)
 			: BaseException(message), file_path(file_path) { }
-		virtual ~InvalidSampleRate() throw () {}
+		virtual ~InvalidSampleRate() noexcept {}
 	};
 
 	/// Exception for missing JSON Change key
 	class InvalidJSONKey : public BaseException
 	{
 	public:
-		string json;
-		InvalidJSONKey(string message, string json)
+		std::string json;
+		InvalidJSONKey(std::string message, std::string json)
 			: BaseException(message), json(json) { }
-		virtual ~InvalidJSONKey() throw () {}
+		virtual ~InvalidJSONKey() noexcept {}
 	};
 
 	/// Exception when no streams are found in the file
 	class NoStreamsFound : public BaseException
 	{
 	public:
-		string file_path;
-		NoStreamsFound(string message, string file_path)
+		std::string file_path;
+		NoStreamsFound(std::string message, std::string file_path)
 			: BaseException(message), file_path(file_path) { }
-		virtual ~NoStreamsFound() throw () {}
+		virtual ~NoStreamsFound() noexcept {}
 	};
 
 	/// Exception for frames that are out of bounds.
@@ -207,9 +202,9 @@ namespace openshot {
 	public:
 		int64_t FrameRequested;
 		int64_t MaxFrames;
-		OutOfBoundsFrame(string message, int64_t frame_requested, int64_t max_frames)
+		OutOfBoundsFrame(std::string message, int64_t frame_requested, int64_t max_frames)
 			: BaseException(message), FrameRequested(frame_requested), MaxFrames(max_frames) { }
-		virtual ~OutOfBoundsFrame() throw () {}
+		virtual ~OutOfBoundsFrame() noexcept {}
 	};
 
 	/// Exception for an out of bounds key-frame point.
@@ -218,59 +213,59 @@ namespace openshot {
 	public:
 		int PointRequested;
 		int MaxPoints;
-		OutOfBoundsPoint(string message, int point_requested, int max_points)
+		OutOfBoundsPoint(std::string message, int point_requested, int max_points)
 			: BaseException(message), PointRequested(point_requested), MaxPoints(max_points) { }
-		virtual ~OutOfBoundsPoint() throw () {}
+		virtual ~OutOfBoundsPoint() noexcept {}
 	};
 
 	/// Exception when memory could not be allocated
 	class OutOfMemory : public BaseException
 	{
 	public:
-		string file_path;
-		OutOfMemory(string message, string file_path)
+		std::string file_path;
+		OutOfMemory(std::string message, std::string file_path)
 			: BaseException(message), file_path(file_path) { }
-		virtual ~OutOfMemory() throw () {}
+		virtual ~OutOfMemory() noexcept {}
 	};
 
 	/// Exception when a reader is closed, and a frame is requested
 	class ReaderClosed : public BaseException
 	{
 	public:
-		string file_path;
-		ReaderClosed(string message, string file_path)
+		std::string file_path;
+		ReaderClosed(std::string message, std::string file_path)
 			: BaseException(message), file_path(file_path) { }
-		virtual ~ReaderClosed() throw () {}
+		virtual ~ReaderClosed() noexcept {}
 	};
 
 	/// Exception when resample fails
 	class ResampleError : public BaseException
 	{
 	public:
-		string file_path;
-		ResampleError(string message, string file_path)
+		std::string file_path;
+		ResampleError(std::string message, std::string file_path)
 			: BaseException(message), file_path(file_path) { }
-		virtual ~ResampleError() throw () {}
+		virtual ~ResampleError() noexcept {}
 	};
 
 	/// Exception when too many seek attempts happen
 	class TooManySeeks : public BaseException
 	{
 	public:
-		string file_path;
-		TooManySeeks(string message, string file_path)
+		std::string file_path;
+		TooManySeeks(std::string message, std::string file_path)
 			: BaseException(message), file_path(file_path) { }
-		virtual ~TooManySeeks() throw () {}
+		virtual ~TooManySeeks() noexcept {}
 	};
 
 	/// Exception when a writer is closed, and a frame is requested
 	class WriterClosed : public BaseException
 	{
 	public:
-		string file_path;
-		WriterClosed(string message, string file_path)
+		std::string file_path;
+		WriterClosed(std::string message, std::string file_path)
 			: BaseException(message), file_path(file_path) { }
-		virtual ~WriterClosed() throw () {}
+		virtual ~WriterClosed() noexcept {}
 	};
 }
 

src/CacheDisk.cpp

@@ -526,7 +526,7 @@ void CacheDisk::SetJson(string value) {
 		// Set all values that match
 		SetJsonValue(root);
 	}
-	catch (exception e)
+	catch (const std::exception& e)
 	{
 		// Error parsing JSON (or missing keys)
 		throw InvalidJSON("JSON is invalid (missing keys or invalid data types)", "");

src/CacheMemory.cpp

@@ -379,7 +379,7 @@ void CacheMemory::SetJson(string value) {
 		// Set all values that match
 		SetJsonValue(root);
 	}
-	catch (exception e)
+	catch (const std::exception& e)
 	{
 		// Error parsing JSON (or missing keys)
 		throw InvalidJSON("JSON is invalid (missing keys or invalid data types)", "");

src/ChunkReader.cpp

@@ -121,7 +121,7 @@ void ChunkReader::load_json()
 		info.audio_timebase.den = root["audio_timebase"]["den"].asInt();
 
 	}
-	catch (exception e)
+	catch (const std::exception& e)
 	{
 		// Error parsing JSON (or missing keys)
 		throw InvalidJSON("JSON could not be parsed (or is invalid).", path);
@@ -235,7 +235,7 @@ std::shared_ptr<Frame> ChunkReader::GetFrame(int64_t requested_frame)
 			local_reader = new FFmpegReader(chunk_video_path);
 			local_reader->Open(); // open reader
 
-		} catch (InvalidFile)
+		} catch (const InvalidFile& e)
 		{
 			// Invalid Chunk (possibly it is not found)
 			throw ChunkNotFound(path, requested_frame, location.number, location.frame);
@@ -299,7 +299,7 @@ void ChunkReader::SetJson(string value) {
 		// Set all values that match
 		SetJsonValue(root);
 	}
-	catch (exception e)
+	catch (const std::exception& e)
 	{
 		// Error parsing JSON (or missing keys)
 		throw InvalidJSON("JSON is invalid (missing keys or invalid data types)", "");

src/Clip.cpp

@@ -123,7 +123,7 @@ void Clip::init_reader_rotation() {
 		try {
 			float rotate_metadata = strtof(reader->info.metadata["rotate"].c_str(), 0);
 			rotation = Keyframe(rotate_metadata);
-		} catch (exception e) {}
+		} catch (const std::exception& e) {}
 	}
 	else
 		// Default no rotation
@@ -811,7 +811,7 @@ void Clip::SetJson(string value) {
 		// Set all values that match
 		SetJsonValue(root);
 	}
-	catch (exception e)
+	catch (const std::exception& e)
 	{
 		// Error parsing JSON (or missing keys)
 		throw InvalidJSON("JSON is invalid (missing keys or invalid data types)", "");

src/Color.cpp

@@ -127,7 +127,7 @@ void Color::SetJson(string value) {
 		// Set all values that match
 		SetJsonValue(root);
 	}
-	catch (exception e)
+	catch (const std::exception& e)
 	{
 		// Error parsing JSON (or missing keys)
 		throw InvalidJSON("JSON is invalid (missing keys or invalid data types)", "");

src/Coordinate.cpp

@@ -90,7 +90,7 @@ void Coordinate::SetJson(string value) {
 		// Set all values that match
 		SetJsonValue(root);
 	}
-	catch (exception e)
+	catch (const std::exception& e)
 	{
 		// Error parsing JSON (or missing keys)
 		throw InvalidJSON("JSON is invalid (missing keys or invalid data types)", "");

src/DecklinkReader.cpp

@@ -285,7 +285,7 @@ void DecklinkReader::SetJson(string value) {
 		// Set all values that match
 		SetJsonValue(root);
 	}
-	catch (exception e)
+	catch (const std::exception& e)
 	{
 		// Error parsing JSON (or missing keys)
 		throw InvalidJSON("JSON is invalid (missing keys or invalid data types)", "");

src/DummyReader.cpp

@@ -163,7 +163,7 @@ void DummyReader::SetJson(string value) {
 		// Set all values that match
 		SetJsonValue(root);
 	}
-	catch (exception e)
+	catch (const std::exception& e)
 	{
 		// Error parsing JSON (or missing keys)
 		throw InvalidJSON("JSON is invalid (missing keys or invalid data types)", "");

src/EffectBase.cpp

@@ -119,7 +119,7 @@ void EffectBase::SetJson(string value) {
 		// Set all values that match
 		SetJsonValue(root);
 	}
-	catch (exception e)
+	catch (const std::exception& e)
 	{
 		// Error parsing JSON (or missing keys)
 		throw InvalidJSON("JSON is invalid (missing keys or invalid data types)", "");

src/FFmpegReader.cpp

@@ -2441,7 +2441,7 @@ void FFmpegReader::SetJson(string value) {
 		// Set all values that match
 		SetJsonValue(root);
 	}
-	catch (exception e) {
+	catch (const std::exception& e) {
 		// Error parsing JSON (or missing keys)
 		throw InvalidJSON("JSON is invalid (missing keys or invalid data types)", "");
 	}

src/FrameMapper.cpp

@@ -714,7 +714,7 @@ void FrameMapper::SetJson(string value) {
 		// Set all values that match
 		SetJsonValue(root);
 	}
-	catch (exception e)
+	catch (const std::exception& e)
 	{
 		// Error parsing JSON (or missing keys)
 		throw InvalidJSON("JSON is invalid (missing keys or invalid data types)", "");

src/ImageReader.cpp

@@ -67,7 +67,7 @@ void ImageReader::Open()
 			image->backgroundColor(Magick::Color("none"));
 			MAGICK_IMAGE_ALPHA(image, true);
 		}
-		catch (Magick::Exception e) {
+		catch (const Magick::Exception& e) {
 			// raise exception
 			throw InvalidFile("File could not be opened.", path);
 		}
@@ -176,7 +176,7 @@ void ImageReader::SetJson(string value) {
 		// Set all values that match
 		SetJsonValue(root);
 	}
-	catch (exception e)
+	catch (const std::exception& e)
 	{
 		// Error parsing JSON (or missing keys)
 		throw InvalidJSON("JSON is invalid (missing keys or invalid data types)", "");

src/KeyFrame.cpp

@@ -200,7 +200,7 @@ Point Keyframe::GetPreviousPoint(Point p) {
 		else
 			return Points[0];
 
-	} catch (OutOfBoundsPoint) {
+	} catch (const OutOfBoundsPoint& e) {
 		// No previous point
 		return Point(-1, -1);
 	}
@@ -386,7 +386,7 @@ void Keyframe::SetJson(string value) {
 		// Set all values that match
 		SetJsonValue(root);
 	}
-	catch (exception e)
+	catch (const std::exception& e)
 	{
 		// Error parsing JSON (or missing keys)
 		throw InvalidJSON("JSON is invalid (missing keys or invalid data types)", "");

src/Point.cpp

@@ -153,7 +153,7 @@ void Point::SetJson(string value) {
 		// Set all values that match
 		SetJsonValue(root);
 	}
-	catch (exception e)
+	catch (const std::exception& e)
 	{
 		// Error parsing JSON (or missing keys)
 		throw InvalidJSON("JSON is invalid (missing keys or invalid data types)", "");

src/Profiles.cpp

@@ -120,7 +120,7 @@ Profile::Profile(string path) {
 		}
 
 	}
-	catch (exception e)
+	catch (const std::exception& e)
 	{
 		// Error parsing profile file
 		throw InvalidFile("Profile could not be found or loaded (or is invalid).", path);
@@ -184,7 +184,7 @@ void Profile::SetJson(string value) {
 		// Set all values that match
 		SetJsonValue(root);
 	}
-	catch (exception e)
+	catch (const std::exception& e)
 	{
 		// Error parsing JSON (or missing keys)
 		throw InvalidJSON("JSON is invalid (missing keys or invalid data types)", "");

src/QtImageReader.cpp

@@ -317,7 +317,7 @@ void QtImageReader::SetJson(string value) {
 		// Set all values that match
 		SetJsonValue(root);
 	}
-	catch (exception e)
+	catch (const std::exception& e)
 	{
 		// Error parsing JSON (or missing keys)
 		throw InvalidJSON("JSON is invalid (missing keys or invalid data types)", "");

src/TextReader.cpp

@@ -237,7 +237,7 @@ void TextReader::SetJson(string value) {
 		// Set all values that match
 		SetJsonValue(root);
 	}
-	catch (exception e)
+	catch (const std::exception& e)
 	{
 		// Error parsing JSON (or missing keys)
 		throw InvalidJSON("JSON is invalid (missing keys or invalid data types)", "");

src/Timeline.cpp

@@ -1047,7 +1047,7 @@ void Timeline::SetJson(string value) {
 		// Set all values that match
 		SetJsonValue(root);
 	}
-	catch (exception e)
+	catch (const std::exception& e)
 	{
 		// Error parsing JSON (or missing keys)
 		throw InvalidJSON("JSON is invalid (missing keys or invalid data types)", "");
@@ -1164,7 +1164,7 @@ void Timeline::ApplyJsonDiff(string value) {
 
 		}
 	}
-	catch (exception e)
+	catch (const std::exception& e)
 	{
 		// Error parsing JSON (or missing keys)
 		throw InvalidJSON("JSON is invalid (missing keys or invalid data types)", "");

src/WriterBase.cpp

@@ -216,7 +216,7 @@ void WriterBase::SetJson(string value) {
 		// Set all values that match
 		SetJsonValue(root);
 	}
-	catch (exception e)
+	catch (const std::exception& e)
 	{
 		// Error parsing JSON (or missing keys)
 		throw InvalidJSON("JSON is invalid (missing keys or invalid data types)", "");