projects
/
oweals
/
minetest.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow taking screenshots of formspecs and move message to chat
[oweals/minetest.git]
/
src
/
exceptions.h
diff --git
a/src/exceptions.h
b/src/exceptions.h
index 085b424177af20c1bc861afe5ea1d5f619caacc6..6d6ad333a442bcb5690fbce59e1edf2a9bb25ec2 100644
(file)
--- a/
src/exceptions.h
+++ b/
src/exceptions.h
@@
-21,132
+21,104
@@
with this program; if not, write to the Free Software Foundation, Inc.,
#define EXCEPTIONS_HEADER
#include <exception>
#define EXCEPTIONS_HEADER
#include <exception>
+#include <string>
+
class BaseException : public std::exception
{
public:
class BaseException : public std::exception
{
public:
- BaseException(const
char *s
)
+ BaseException(const
std::string &s) throw(
)
{
m_s = s;
}
{
m_s = s;
}
+ ~BaseException() throw() {}
virtual const char * what() const throw()
{
virtual const char * what() const throw()
{
- return m_s;
+ return m_s
.c_str()
;
}
}
- const char *m_s;
+protected:
+ std::string m_s;
};
};
-class AsyncQueuedException : public BaseException
-{
+class AsyncQueuedException : public BaseException {
public:
public:
- AsyncQueuedException(const char *s):
- BaseException(s)
- {}
+ AsyncQueuedException(const std::string &s): BaseException(s) {}
};
};
-class NotImplementedException : public BaseException
-{
+class NotImplementedException : public BaseException {
public:
public:
- NotImplementedException(const char *s):
- BaseException(s)
- {}
+ NotImplementedException(const std::string &s): BaseException(s) {}
};
};
-class AlreadyExistsException : public BaseException
-{
+class AlreadyExistsException : public BaseException {
public:
public:
- AlreadyExistsException(const char *s):
- BaseException(s)
- {}
+ AlreadyExistsException(const std::string &s): BaseException(s) {}
};
};
-class VersionMismatchException : public BaseException
-{
+class VersionMismatchException : public BaseException {
public:
public:
- VersionMismatchException(const char *s):
- BaseException(s)
- {}
+ VersionMismatchException(const std::string &s): BaseException(s) {}
};
};
-class FileNotGoodException : public BaseException
-{
+class FileNotGoodException : public BaseException {
public:
public:
- FileNotGoodException(const char *s):
- BaseException(s)
- {}
+ FileNotGoodException(const std::string &s): BaseException(s) {}
};
};
-class SerializationError : public BaseException
-{
+class SerializationError : public BaseException {
public:
public:
- SerializationError(const char *s):
- BaseException(s)
- {}
+ SerializationError(const std::string &s): BaseException(s) {}
};
};
-class LoadError : public BaseException
-{
+class LoadError : public BaseException {
public:
public:
- LoadError(const char *s):
- BaseException(s)
- {}
+ LoadError(const std::string &s): BaseException(s) {}
};
};
-class ContainerFullException : public BaseException
-{
+class ContainerFullException : public BaseException {
public:
public:
- ContainerFullException(const char *s):
- BaseException(s)
- {}
+ ContainerFullException(const std::string &s): BaseException(s) {}
};
};
-class SettingNotFoundException : public BaseException
-{
+class SettingNotFoundException : public BaseException {
public:
public:
- SettingNotFoundException(const char *s):
- BaseException(s)
- {}
+ SettingNotFoundException(const std::string &s): BaseException(s) {}
};
};
-class InvalidFilenameException : public BaseException
-{
+class InvalidFilenameException : public BaseException {
public:
public:
- InvalidFilenameException(const char *s):
- BaseException(s)
- {}
+ InvalidFilenameException(const std::string &s): BaseException(s) {}
};
};
-class ProcessingLimitException : public BaseException
-{
+class ProcessingLimitException : public BaseException {
public:
public:
- ProcessingLimitException(const char *s):
- BaseException(s)
- {}
+ ProcessingLimitException(const std::string &s): BaseException(s) {}
};
};
-class CommandLineError : public BaseException
-{
+class CommandLineError : public BaseException {
public:
public:
- CommandLineError(const char *s):
- BaseException(s)
- {}
+ CommandLineError(const std::string &s): BaseException(s) {}
};
};
-class ItemNotFoundException : public BaseException
-{
+class ItemNotFoundException : public BaseException {
public:
public:
- ItemNotFoundException(const char *s):
- BaseException(s)
- {}
+ ItemNotFoundException(const std::string &s): BaseException(s) {}
+};
+
+class ServerError : public BaseException {
+public:
+ ServerError(const std::string &s): BaseException(s) {}
};
// Only used on Windows (SEH)
};
// Only used on Windows (SEH)
-class FatalSystemException : public BaseException
-{
+class FatalSystemException : public BaseException {
public:
public:
- FatalSystemException(const char *s):
- BaseException(s)
- {}
+ FatalSystemException(const std::string &s): BaseException(s) {}
+};
+
+class ClientStateError : public BaseException {
+public:
+ ClientStateError(std::string s): BaseException(s) {}
};
/*
};
/*
@@
-159,7
+131,7
@@
public:
InvalidPositionException():
BaseException("Somebody tried to get/set something in a nonexistent position.")
{}
InvalidPositionException():
BaseException("Somebody tried to get/set something in a nonexistent position.")
{}
- InvalidPositionException(const
char *
s):
+ InvalidPositionException(const
std::string &
s):
BaseException(s)
{}
};
BaseException(s)
{}
};