reformatting

[chaz/yoink] / src / Moof / Error.hh

diff --git a/src/Moof/Error.hh b/src/Moof/Error.hh
index 6dab32ffd07e14e93d8cbad3a6bc0620be5e4f7e..78c894f3178f4583fde3ccb47583be9c08070573 100644 (file)
--- a/src/Moof/Error.hh
+++ b/src/Moof/Error.hh
@@ -1,30 +1,13 @@
 
-/*******************************************************************************
-
- Copyright (c) 2009, Charles McGarvey
- All rights reserved.
- 
- Redistribution   and   use  in  source  and  binary  forms,  with  or  without
- modification, are permitted provided that the following conditions are met:
- 
-   * Redistributions  of  source  code  must retain the above copyright notice,
-     this list of conditions and the following disclaimer.
-   * Redistributions  in binary form must reproduce the above copyright notice,
-     this  list of conditions and the following disclaimer in the documentation
-     and/or other materials provided with the distribution.
- 
- THIS  SOFTWARE  IS  PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND  ANY  EXPRESS  OR  IMPLIED  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED.  IN  NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- FOR  ANY  DIRECT,  INDIRECT,  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES  (INCLUDING,  BUT  NOT  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES;  LOSS  OF  USE,  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED  AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR  TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
+/*]  Copyright (c) 2009-2010, Charles McGarvey  [**************************
+**]  All rights reserved.
+*
+* vi:ts=4 sw=4 tw=75
+*
+* Distributable under the terms and conditions of the 2-clause BSD license;
+* see the file COPYING for a complete text of the license.
+*
+**************************************************************************/
 
 #ifndef _MOOF_ERROR_HH_
 #define _MOOF_ERROR_HH_
@@ -43,9 +26,11 @@ public:
 
        enum Code
        {
-               NONE = 0,
+               UNINITIALIZED = -1,                     // -
+               NONE = 0,                                       // -
                ALC_INIT,                                       // description
                FASTEVENTS_INIT,                        // description
+               OPENAL_INIT,                            // description
                FILE_NOT_FOUND,                         // path of missing file
                RESOURCE_NOT_FOUND,                     // name of missing resource
                SCRIPT_ERROR,                           // description
@@ -55,7 +40,7 @@ public:
                UNKNOWN_IMAGE_FORMAT,           // name of resource
        };
 
-       explicit Error(unsigned code, const std::string& what = "")
+       explicit Error(unsigned code = NONE, const std::string& what = "")
        {
                init(code, what);
        }
@@ -68,7 +53,7 @@ public:
                mCode = code;
        }
 
-       virtual void raise()
+       virtual void raise() const
        {
                throw *this;
        }
@@ -83,11 +68,18 @@ public:
                return mWhat;
        }
 
-       bool isError() const throw()
+       operator bool () const
        {
+               // resolves to true if error code is not NONE
                return mCode != NONE;
        }
 
+       void reset() throw()
+       {
+               mCode = NONE;
+               mWhat[0] = '\0';
+       }
+
 private:
 
        unsigned        mCode;
@@ -99,5 +91,3 @@ private:
 
 #endif // _MOOF_ERROR_HH_
 
-/** vim: set ts=4 sw=4 tw=80: *************************************************/
-