Rename error.* to except.*

diff --git a/source/core/application.cpp b/source/core/application.cpp
index 3a663dbb63b77fa85b4cf8ac9546d7543d6d7f98..e1a93141480c9cf3459c483d5b66c5440529703b 100644 (file)
--- a/source/core/application.cpp
+++ b/source/core/application.cpp
@@ -11,7 +11,7 @@ Distributed under the LGPL
 #include "../time/units.h"
 #include "../time/utils.h"
 #include "application.h"
-#include "error.h"
+#include "except.h"
 
 using namespace std;
 

diff --git a/source/core/error.cpp b/source/core/error.cpp
deleted file mode 100644 (file)
index defed2f..0000000
--- a/source/core/error.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-/* $Id$
-
-This file is part of libmspcore
-Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-#include <sstream>
-#include "error.h"
-
-using namespace std;
-
-namespace Msp {
-
-Exception::Exception(const string &w_):
-       w(w_)
-{
-#ifdef WITH_EXCEPTION_BACKTRACE
-       bt=Debug::Backtrace::create();
-#endif
-}
-
-SystemError::SystemError(const string &w_, int e):
-       Exception(build_what(w_, e)),
-       err(e)
-{ }
-
-string SystemError::build_what(const string &w, int e)
-{
-       ostringstream buf;
-       buf<<w<<": ";
-#ifdef WIN32
-       buf<<e;
-#else
-       buf<<strerror(e);
-#endif
-       return buf.str();
-}
-
-} // namespace Msp

diff --git a/source/core/error.h b/source/core/error.h
deleted file mode 100644 (file)
index d030c41..0000000
--- a/source/core/error.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/* $Id$
-
-This file is part of libmspcore
-Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-#ifndef MSP_CORE_ERROR_H_
-#define MSP_CORE_ERROR_H_
-
-#include <exception>
-#include <string>
-#include "../debug/backtrace.h"
-
-namespace Msp {
-
-/**
-Base class for all Msp exceptions.
-*/
-class Exception: public std::exception
-{
-public:
-       Exception(const std::string &);
-       ~Exception() throw() { }
-
-       const char *what() const throw() { return w.c_str(); }
-       const Debug::Backtrace &get_backtrace() const throw() { return bt; }
-private:
-       std::string w;
-       Debug::Backtrace bt;
-
-};
-
-/**
-Thrown when a function parameter has an invalid value.
-*/
-class InvalidParameterValue: public Exception
-{
-public:
-       InvalidParameterValue(const std::string &w_): Exception(w_) { }
-};
-
-/**
-Thrown when a lookup from a map fails.
-*/
-class KeyError: public Exception
-{
-public:
-       KeyError(const std::string &w_): Exception(w_) { }
-};
-
-/**
-Thrown when the current object state doesn't allow the requested action.
-*/
-class InvalidState: public Exception
-{
-public:
-       InvalidState(const std::string &w_): Exception(w_) { }
-};
-
-/**
-Thrown when the application is invoked with wrong parameters.
-*/
-class UsageError: public Exception
-{
-public:
-       UsageError(const std::string &r, bool b=true): Exception(r), brief(b) { }
-       bool get_brief() const { return brief; }
-private:
-       bool brief;
-};
-
-/**
-Thrown when a system call fails.
-*/
-class SystemError: public Exception
-{
-public:
-       SystemError(const std::string &, int);
-       int get_error_code() const { return err; }
-private:
-       int err;
-
-       static std::string build_what(const std::string &, int);
-};
-
-} // namespace Msp
-
-#endif

diff --git a/source/core/except.cpp b/source/core/except.cpp
new file mode 100644 (file)
index 0000000..245bc05
--- /dev/null
+++ b/source/core/except.cpp
@@ -0,0 +1,39 @@
+/* $Id$
+
+This file is part of libmspcore
+Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
+Distributed under the LGPL
+*/
+#include <sstream>
+#include "except.h"
+
+using namespace std;
+
+namespace Msp {
+
+Exception::Exception(const string &w_):
+       w(w_)
+{
+#ifdef WITH_EXCEPTION_BACKTRACE
+       bt=Debug::Backtrace::create();
+#endif
+}
+
+SystemError::SystemError(const string &w_, int e):
+       Exception(build_what(w_, e)),
+       err(e)
+{ }
+
+string SystemError::build_what(const string &w, int e)
+{
+       ostringstream buf;
+       buf<<w<<": ";
+#ifdef WIN32
+       buf<<e;
+#else
+       buf<<strerror(e);
+#endif
+       return buf.str();
+}
+
+} // namespace Msp

diff --git a/source/core/except.h b/source/core/except.h
new file mode 100644 (file)
index 0000000..d030c41
--- /dev/null
+++ b/source/core/except.h
@@ -0,0 +1,88 @@
+/* $Id$
+
+This file is part of libmspcore
+Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
+Distributed under the LGPL
+*/
+#ifndef MSP_CORE_ERROR_H_
+#define MSP_CORE_ERROR_H_
+
+#include <exception>
+#include <string>
+#include "../debug/backtrace.h"
+
+namespace Msp {
+
+/**
+Base class for all Msp exceptions.
+*/
+class Exception: public std::exception
+{
+public:
+       Exception(const std::string &);
+       ~Exception() throw() { }
+
+       const char *what() const throw() { return w.c_str(); }
+       const Debug::Backtrace &get_backtrace() const throw() { return bt; }
+private:
+       std::string w;
+       Debug::Backtrace bt;
+
+};
+
+/**
+Thrown when a function parameter has an invalid value.
+*/
+class InvalidParameterValue: public Exception
+{
+public:
+       InvalidParameterValue(const std::string &w_): Exception(w_) { }
+};
+
+/**
+Thrown when a lookup from a map fails.
+*/
+class KeyError: public Exception
+{
+public:
+       KeyError(const std::string &w_): Exception(w_) { }
+};
+
+/**
+Thrown when the current object state doesn't allow the requested action.
+*/
+class InvalidState: public Exception
+{
+public:
+       InvalidState(const std::string &w_): Exception(w_) { }
+};
+
+/**
+Thrown when the application is invoked with wrong parameters.
+*/
+class UsageError: public Exception
+{
+public:
+       UsageError(const std::string &r, bool b=true): Exception(r), brief(b) { }
+       bool get_brief() const { return brief; }
+private:
+       bool brief;
+};
+
+/**
+Thrown when a system call fails.
+*/
+class SystemError: public Exception
+{
+public:
+       SystemError(const std::string &, int);
+       int get_error_code() const { return err; }
+private:
+       int err;
+
+       static std::string build_what(const std::string &, int);
+};
+
+} // namespace Msp
+
+#endif

diff --git a/source/core/getopt.h b/source/core/getopt.h
index 3315108f05d34939d6d8d609fae973c915252296..77cf4f2981a59ee6fd36a4acb80e104fb13e1491 100644 (file)
--- a/source/core/getopt.h
+++ b/source/core/getopt.h
@@ -10,7 +10,7 @@ Distributed under the LGPL
 #include <sstream>
 #include <string>
 #include <vector>
-#include "error.h"
+#include "except.h"
 
 namespace Msp {
 

diff --git a/source/time/datetime.cpp b/source/time/datetime.cpp
index d74fc6fbd0be4aef046626224e305830b4450a4e..8886139d245a3a662fdf4d7758b26ada00c6af15 100644 (file)
--- a/source/time/datetime.cpp
+++ b/source/time/datetime.cpp
@@ -1,7 +1,7 @@
 /* $Id$ */
 #include <sstream>
 #include <iomanip>
-#include "../core/error.h"
+#include "../core/except.h"
 #include "datetime.h"
 #include "timestamp.h"