Rename error.h to except.h

Get rid of the largely unused IO::Exception

diff --git a/source/buffered.cpp b/source/buffered.cpp
index 4cd5cb4d0eed742c81357cedd634895793dae7f2..4327413d2c3e136f34f952f70bf52ecd32cf6fe3 100644 (file)
--- a/source/buffered.cpp
+++ b/source/buffered.cpp
@@ -5,7 +5,7 @@ Copyright © 2007 Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 #include "buffered.h"
-#include "error.h"
+#include "except.h"
 
 using namespace std;
 

diff --git a/source/error.h b/source/error.h
deleted file mode 100644 (file)
index 8ebcf38..0000000
--- a/source/error.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* $Id$
-
-This file is part of libmspio
-Copyright © 2007 Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-#ifndef MSP_IO_ERROR_H_
-#define MSP_IO_ERROR_H_
-
-#include <msp/core/error.h>
-
-namespace Msp {
-namespace IO {
-
-class Exception: public Msp::Exception
-{
-public:
-       Exception(const std::string &w_): Msp::Exception(w_) { }
-};
-
-class FileNotFound: public Exception
-{
-public:
-       FileNotFound(const std::string &w_, const std::string &f): Exception(w_), filename(f) { }
-       const std::string &get_filename() { return filename; }
-       ~FileNotFound() throw() { }
-private:
-       std::string filename;
-};
-
-} // namespace IO
-} // namespace Msp
-
-#endif

diff --git a/source/except.h b/source/except.h
new file mode 100644 (file)
index 0000000..b277b8d
--- /dev/null
+++ b/source/except.h
@@ -0,0 +1,28 @@
+/* $Id$
+
+This file is part of libmspio
+Copyright © 2007 Mikko Rasa, Mikkosoft Productions
+Distributed under the LGPL
+*/
+#ifndef MSP_IO_EXCEPT_H_
+#define MSP_IO_EXCEPT_H_
+
+#include <msp/core/except.h>
+
+namespace Msp {
+namespace IO {
+
+class FileNotFound: public Exception
+{
+public:
+       FileNotFound(const std::string &w_, const std::string &f): Exception(w_), filename(f) { }
+       const std::string &get_filename() { return filename; }
+       ~FileNotFound() throw() { }
+private:
+       std::string filename;
+};
+
+} // namespace IO
+} // namespace Msp
+
+#endif

diff --git a/source/file.cpp b/source/file.cpp
index 9b1e433662c63e9fddfa8295fd7719789d471522..a22b832be46a4f56179544fa96cc2cc0d8de331b 100644 (file)
--- a/source/file.cpp
+++ b/source/file.cpp
@@ -10,7 +10,7 @@ Distributed under the LGPL
 #include <unistd.h>
 #endif
 #include <msp/strings/formatter.h>
-#include "error.h"
+#include "except.h"
 #include "file.h"
 
 using namespace std;

diff --git a/source/poll.cpp b/source/poll.cpp
index f8f6c5112ff84bcba1ca42195b72d3bdfcd9f5e5..3b349b4b187f824ab2152cb3fa0d896cad0e59f1 100644 (file)
--- a/source/poll.cpp
+++ b/source/poll.cpp
@@ -7,7 +7,7 @@ Distributed under the LGPL
 #include <errno.h>
 #include <msp/strings/formatter.h>
 #include <msp/time/units.h>
-#include "error.h"
+#include "except.h"
 #include "base.h"
 #include "poll.h"
 

diff --git a/source/seek.cpp b/source/seek.cpp
index f2d381e293ce967cf8364afcafa5f82e2792710a..88ba0337e578b437242edcfde38b28307f031e21 100644 (file)
--- a/source/seek.cpp
+++ b/source/seek.cpp
@@ -7,7 +7,7 @@ Distributed under the LGPL
 #ifdef WIN32
 #include <windows.h>
 #endif
-#include <msp/core/error.h>
+#include "except.h"
 #include "seek.h"
 
 namespace Msp {