The reorg is being put in trunk, I think it's ready. Now we just get to find

out how many applications won't work anymore :)

1 files changed, 68 insertions, 59 deletions

diff --git a/src/exceptionbase.h b/src/exceptionbase.h
index 6f1eca7..24e4bbf 100644
--- a/src/exceptionbase.h
+++ b/src/exceptionbase.h
@@ -1,75 +1,84 @@
-#ifndef EXCEPTION_BASE_H
-#define EXCEPTION_BASE_H
+#ifndef BU_EXCEPTION_BASE_H
+#define BU_EXCEPTION_BASE_H
 
 #include <string>
 #include <exception>
 #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.
- */
-class ExceptionBase : public std::exception
+namespace Bu
 {
-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.
-         */
-        ExceptionBase( const char *sFormat, ... ) throw();
-        
         /**
+         * A generalized Exception base class.  This is nice for making general and
+         * flexible child classes that can create new error code classes.
+         *
+         * In order to create your own exception class use these two lines.
          * 
-         * @param nCode 
-         * @param sFormat
-         */
-        ExceptionBase( int nCode, const char *sFormat, ... ) throw();
-        
-        /**
+         * in your header:  subExceptionDecl( NewClassName );
          * 
-         * @param nCode 
-         * @return 
+         * in your source:  subExcpetienDef( NewClassName );
          */
-        ExceptionBase( int nCode=0 ) throw();
-        
-        /**
-         * 
-         * @return 
-         */
-        virtual ~ExceptionBase() throw();
+        class ExceptionBase : public std::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.
+                 */
+                ExceptionBase( const char *sFormat, ... ) throw();
+                
+                /**
+                 * 
+                 * @param nCode 
+                 * @param sFormat
+                 */
+                ExceptionBase( int nCode, const char *sFormat, ... ) throw();
+                
+                /**
+                 * 
+                 * @param nCode 
+                 * @return 
+                 */
+                ExceptionBase( int nCode=0 ) throw();
+                
+                /**
+                 * 
+                 * @return 
+                 */
+                virtual ~ExceptionBase() throw();
 
-        /**
-         * 
-         * @return 
-         */
-        virtual const char *what() const throw();
-        
-        /**
-         * 
-         * @return 
-         */
-        int getErrorCode();
-        
-        /**
-         * 
-         * @param lpFormat 
-         * @param vargs 
-         */
-        void setWhat( const char *lpFormat, va_list &vargs );
+                /**
+                 * 
+                 * @return 
+                 */
+                virtual const char *what() const throw();
+                
+                /**
+                 * 
+                 * @return 
+                 */
+                int getErrorCode();
+                
+                /**
+                 * 
+                 * @param lpFormat 
+                 * @param vargs 
+                 */
+                void setWhat( const char *lpFormat, va_list &vargs );
 
-        /**
-         *
-         * @param lpText
-         */
-        void setWhat( const char *lpText );
+                /**
+                 *
+                 * @param lpText
+                 */
+                void setWhat( const char *lpText );
 
-private:
-        int nErrorCode; /**< The code for the error that occured. */
-        char *sWhat;    /**< The text string telling people what went wrong. */
-};
+        private:
+                int nErrorCode; /**< The code for the error that occured. */
+                char *sWhat;    /**< The text string telling people what went wrong. */
+        };
+}
 
 #define subExceptionDecl( name )                                                                                        \
 class name : public ExceptionBase                                                                                       \