Cpp11 initializers: last src root changeset (#6022)

[oweals/minetest.git] / src / exceptions.h

diff --git a/src/exceptions.h b/src/exceptions.h
index 970c68e4027450149d476b829e754dea8dedd01f..07fecdaf7da9f2fa9accc22310c8514501a962ce 100644 (file)
--- a/src/exceptions.h
+++ b/src/exceptions.h
@@ -27,10 +27,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 class BaseException : public std::exception
 {
 public:
-       BaseException(const std::string &s) throw()
-       {
-               m_s = s;
-       }
+       BaseException(const std::string &s) throw(): m_s(s) {}
        ~BaseException() throw() {}
        virtual const char * what() const throw()
        {
@@ -40,16 +37,6 @@ protected:
        std::string m_s;
 };
 
-class AsyncQueuedException : public BaseException {
-public:
-       AsyncQueuedException(const std::string &s): BaseException(s) {}
-};
-
-class NotImplementedException : public BaseException {
-public:
-       NotImplementedException(const std::string &s): BaseException(s) {}
-};
-
 class AlreadyExistsException : public BaseException {
 public:
        AlreadyExistsException(const std::string &s): BaseException(s) {}
@@ -65,19 +52,19 @@ public:
        FileNotGoodException(const std::string &s): BaseException(s) {}
 };
 
-class SerializationError : public BaseException {
+class DatabaseException : public BaseException {
 public:
-       SerializationError(const std::string &s): BaseException(s) {}
+       DatabaseException(const std::string &s): BaseException(s) {}
 };
 
-class LoadError : public BaseException {
+class SerializationError : public BaseException {
 public:
-       LoadError(const std::string &s): BaseException(s) {}
+       SerializationError(const std::string &s): BaseException(s) {}
 };
 
-class ContainerFullException : public BaseException {
+class PacketError : public BaseException {
 public:
-       ContainerFullException(const std::string &s): BaseException(s) {}
+       PacketError(const std::string &s): BaseException(s) {}
 };
 
 class SettingNotFoundException : public BaseException {
@@ -90,36 +77,48 @@ public:
        InvalidFilenameException(const std::string &s): BaseException(s) {}
 };
 
-class ProcessingLimitException : public BaseException {
+class ItemNotFoundException : public BaseException {
 public:
-       ProcessingLimitException(const std::string &s): BaseException(s) {}
+       ItemNotFoundException(const std::string &s): BaseException(s) {}
 };
 
-class CommandLineError : public BaseException {
+class ServerError : public BaseException {
 public:
-       CommandLineError(const std::string &s): BaseException(s) {}
+       ServerError(const std::string &s): BaseException(s) {}
 };
 
-class ItemNotFoundException : public BaseException {
+class ClientStateError : public BaseException {
 public:
-       ItemNotFoundException(const std::string &s): BaseException(s) {}
+       ClientStateError(const std::string &s): BaseException(s) {}
 };
 
-class ServerError : public BaseException {
+class PrngException : public BaseException {
 public:
-       ServerError(const std::string &s): BaseException(s) {}
+       PrngException(const std::string &s): BaseException(s) {}
 };
 
-// Only used on Windows (SEH)
-class FatalSystemException : public BaseException {
+class ModError : public BaseException {
 public:
-       FatalSystemException(const std::string &s): BaseException(s) {}
+       ModError(const std::string &s): BaseException(s) {}
 };
 
+
 /*
        Some "old-style" interrupts:
 */
 
+class InvalidNoiseParamsException : public BaseException {
+public:
+       InvalidNoiseParamsException():
+               BaseException("One or more noise parameters were invalid or require "
+                       "too much memory")
+       {}
+
+       InvalidNoiseParamsException(const std::string &s):
+               BaseException(s)
+       {}
+};
+
 class InvalidPositionException : public BaseException
 {
 public:
@@ -131,21 +130,5 @@ public:
        {}
 };
 
-class TargetInexistentException : public std::exception
-{
-       virtual const char * what() const throw()
-       {
-               return "Somebody tried to refer to something that doesn't exist.";
-       }
-};
-
-class NullPointerException : public std::exception
-{
-       virtual const char * what() const throw()
-       {
-               return "NullPointerException";
-       }
-};
-
 #endif