summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-12-16 20:41:18 +0000
committerCarl Hetherington <cth@carlh.net>2015-12-16 20:41:18 +0000
commit44ff188fa75cb7954fb1b9bec6b1cb03d8536ef7 (patch)
tree5d2be5ee9aa0aa1f7feca7ec54c62f19b0b210c1 /src
parent5a843c4c224051237105a6e8de472ae9a216c001 (diff)
Replace MessageError with std::runtime_error.
Diffstat (limited to 'src')
-rw-r--r--src/exceptions.cc2
-rw-r--r--src/exceptions.h43
2 files changed, 14 insertions, 31 deletions
diff --git a/src/exceptions.cc b/src/exceptions.cc
index f33a1e2..4d9d29f 100644
--- a/src/exceptions.cc
+++ b/src/exceptions.cc
@@ -24,7 +24,7 @@ using std::string;
using namespace sub;
ProgrammingError::ProgrammingError (string file, int line)
- : MessageError (String::compose ("Programming error at %1:%2", file, line))
+ : runtime_error (String::compose ("Programming error at %1:%2", file, line))
{
}
diff --git a/src/exceptions.h b/src/exceptions.h
index 5995942..c6f7f1a 100644
--- a/src/exceptions.h
+++ b/src/exceptions.h
@@ -25,81 +25,64 @@
namespace sub {
-class MessageError : public std::exception
-{
-public:
- MessageError (std::string const & message)
- : _message (message) {}
- ~MessageError () throw () {}
-
- /** @return error message */
- char const * what () const throw () {
- return _message.c_str ();
- }
-
-private:
- /** error message */
- std::string _message;
-};
-
/** @class XMLError
* @brief An error raised when reading an XML file.
*/
-class XMLError : public MessageError
+class XMLError : public std::runtime_error
{
public:
XMLError (std::string const & message)
- : MessageError (message)
+ : std::runtime_error (message)
{}
};
/** @class STLError
* @brief An error raised when reading a binary STL file.
*/
-class STLError : public MessageError
+class STLError : public std::runtime_error
{
public:
STLError (std::string const & message)
- : MessageError (message)
+ : std::runtime_error (message)
{}
};
/** @class SubripError
* @brief An error raised when reading a Subrip file.
*/
-class SubripError : public MessageError
+class SubripError : public std::runtime_error
{
public:
SubripError (std::string saw, std::string expecting)
- : MessageError ("Error in SubRip file: saw " + saw + " while expecting " + expecting)
+ : std::runtime_error ("Error in SubRip file: saw " + saw + " while expecting " + expecting)
{}
};
-class MXFError : public MessageError
+class MXFError : public std::runtime_error
{
public:
MXFError (std::string const & message)
- : MessageError (message)
+ : std::runtime_error (message)
{}
};
-class UnknownFrameRateError : public MessageError
+class UnknownFrameRateError : public std::runtime_error
{
public:
UnknownFrameRateError ()
- : MessageError ("unknown frame rate")
+ : std::runtime_error ("unknown frame rate")
{}
};
-class DCPError : public MessageError
+class DCPError : public std::runtime_error
{
public:
DCPError (std::string const & message)
- : MessageError (message)
+ : std::runtime_error (message)
{}
};
-class ProgrammingError : public MessageError
+class ProgrammingError : public std::runtime_error
{
public:
ProgrammingError (std::string file, int line);