4 files changed, 39 insertions, 17 deletions

diff --git a/src/exception.h b/src/exception.h
index 2233736..1234bef 100644
--- a/src/exception.h
+++ b/src/exception.h
@@ -65,4 +65,35 @@ private:
         int nErrorCode; /**< The code for the error that occured. */
 };
 
+#define subExceptionDecl( name )                                                                                        \
+class name : public Exception                                                                                           \
+{                                                                                                                                                       \
+        public:                                                                                                                                 \
+                name( const char *sFormat, ... ) throw ();                                                      \
+                name( int nCode, const char *sFormat, ... ) throw();                            \
+                name( int nCode=0 ) throw ();                                                                           \
+};
+
+#define subExceptionDef( name )                                                                                         \
+name::name( const char *lpFormat, ... ) throw() :                                                       \
+        Exception( 0 )                                                                                                                  \
+{                                                                                                                                                       \
+        va_list ap;                                                                                                                             \
+        va_start( ap, lpFormat );                                                                                               \
+        setWhat( lpFormat, ap );                                                                                                \
+        va_end( ap );                                                                                                                   \
+}                                                                                                                                                       \
+name::name( int nCode, const char *lpFormat, ... ) throw() :                            \
+        Exception( nCode )                                                                                                              \
+{                                                                                                                                                       \
+        va_list ap;                                                                                                                             \
+        va_start( ap, lpFormat );                                                                                               \
+        setWhat( lpFormat, ap );                                                                                                \
+        va_end( ap );                                                                                                                   \
+}                                                                                                                                                       \
+name::name( int nCode ) throw() :                                                                                       \
+        Exception( nCode )                                                                                                              \
+{                                                                                                                                                       \
+}
+
 #endif
diff --git a/src/exception.cpp b/src/exceptionbase.cpp
index 3cde134..3cde134 100644
--- a/src/exception.cpp
+++ b/src/exceptionbase.cpp
diff --git a/src/xmlexception.cpp b/src/xmlexception.cpp
index 7012ee6..9f38844 100644
--- a/src/xmlexception.cpp
+++ b/src/xmlexception.cpp
@@ -1,6 +1,9 @@
 #include "xmlexception.h"
 #include <stdarg.h>
 
+subExceptionDef( XmlException )
+
+/*
 XmlException::XmlException( const char *lpFormat, ... ) throw() :
         Exception( 0 )
 {
@@ -25,3 +28,4 @@ XmlException::XmlException( int nCode ) throw() :
         Exception( nCode )
 {
 }
+*/
diff --git a/src/xmlexception.h b/src/xmlexception.h
index 9437ba3..5cbeda7 100644
--- a/src/xmlexception.h
+++ b/src/xmlexception.h
@@ -5,30 +5,17 @@
 #include "exception.h"
 #include <stdarg.h>
 
-/**
- * A generalized Exception base class.  This is nice for making general and
- * flexible child classes that can create new error code classes.
- */
+subExceptionDecl( XmlException )
+
+/*
 class XmlException : public Exception
 {
 public:
-        /**
-         * Construct an exception with an error code of zero, but with a
-         * description.  The use of this is not reccomended most of the time, it's
-         * generally best to include an error code with the exception so your
-         * program can handle the exception in a better way.
-         * @param sFormat The format of the text.  See printf for more info.
-         */
         XmlException( const char *sFormat, ... ) throw();
         
-        /**
-         * 
-         * @param nCode 
-         * @param sFormat
-         */
         XmlException( int nCode, const char *sFormat, ... ) throw();
         
         XmlException( int nCode=0 ) throw();
-};
+};*/
 
 #endif