X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fexceptions.h;h=c54307653b87b3575a09878ce59893d26ab4a544;hb=8f73ec6c6c18ea5676261064399a650911333da5;hp=6bf832828a58bdc301f96f1197851a8021f91694;hpb=cd1d625ab21e741e91be7d2190bb4fd59fab3200;p=oweals%2Fminetest.git

diff --git a/src/exceptions.h b/src/exceptions.h
index 6bf832828..c54307653 100644
--- a/src/exceptions.h
+++ b/src/exceptions.h
@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef EXCEPTIONS_HEADER
-#define EXCEPTIONS_HEADER
+#pragma once
 
 #include <exception>
 #include <string>
@@ -27,11 +26,9 @@ 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() throw() {}
+	BaseException(const std::string &s) throw(): m_s(s) {}
+	~BaseException() throw() = default;
+
 	virtual const char * what() const throw()
 	{
 		return m_s.c_str();
@@ -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,6 +52,11 @@ public:
 	FileNotGoodException(const std::string &s): BaseException(s) {}
 };
 
+class DatabaseException : public BaseException {
+public:
+	DatabaseException(const std::string &s): BaseException(s) {}
+};
+
 class SerializationError : public BaseException {
 public:
 	SerializationError(const std::string &s): BaseException(s) {}
@@ -75,16 +67,6 @@ public:
 	PacketError(const std::string &s): BaseException(s) {}
 };
 
-class LoadError : public BaseException {
-public:
-	LoadError(const std::string &s): BaseException(s) {}
-};
-
-class ContainerFullException : public BaseException {
-public:
-	ContainerFullException(const std::string &s): BaseException(s) {}
-};
-
 class SettingNotFoundException : public BaseException {
 public:
 	SettingNotFoundException(const std::string &s): BaseException(s) {}
@@ -95,16 +77,6 @@ public:
 	InvalidFilenameException(const std::string &s): BaseException(s) {}
 };
 
-class ProcessingLimitException : public BaseException {
-public:
-	ProcessingLimitException(const std::string &s): BaseException(s) {}
-};
-
-class CommandLineError : public BaseException {
-public:
-	CommandLineError(const std::string &s): BaseException(s) {}
-};
-
 class ItemNotFoundException : public BaseException {
 public:
 	ItemNotFoundException(const std::string &s): BaseException(s) {}
@@ -117,14 +89,20 @@ public:
 
 class ClientStateError : public BaseException {
 public:
-	ClientStateError(std::string s): BaseException(s) {}
+	ClientStateError(const std::string &s): BaseException(s) {}
 };
 
 class PrngException : public BaseException {
 public:
-	PrngException(std::string s): BaseException(s) {}
+	PrngException(const std::string &s): BaseException(s) {}
+};
+
+class ModError : public BaseException {
+public:
+	ModError(const std::string &s): BaseException(s) {}
 };
 
+
 /*
 	Some "old-style" interrupts:
 */
@@ -151,22 +129,3 @@ public:
 		BaseException(s)
 	{}
 };
-
-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
-