foundational changes; tying up some loose ends

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

diff --git a/src/Moof/Exception.hh b/src/Moof/Exception.hh
index a63f761ad8b857e8c63e81ca11e68df799f73828..f8921bd5943cf161ee60036bd3d1f2ec3b564576 100644 (file)
--- a/src/Moof/Exception.hh
+++ b/src/Moof/Exception.hh
@@ -31,6 +31,7 @@
 
 #include <cstring>
 #include <exception>
+#include <string>
 
 #include <Moof/Math.hh>
 
@@ -42,10 +43,10 @@ class Exception : public std::exception
 {
 public:
 
-       explicit Exception(unsigned code, const char* what = "")
+       explicit Exception(unsigned code, const std::string& what = "")
        {
                mWhat[sizeof(mWhat)-1] = '\0';
-               strncpy(mWhat, what, sizeof(mWhat)-1);
+               strncpy(mWhat, what.c_str(), sizeof(mWhat)-1);
                mCode = code;
        }
        virtual ~Exception() throw() {}
@@ -81,8 +82,8 @@ enum Code
        SCRIPT_ERROR,                           // description
        SDL_INIT,                                       // description
        SDL_VIDEOMODE,                          // -
-       UNKNOWN_AUDIO_FORMAT,           // -
-       UNKNOWN_IMAGE_FORMAT,           // -
+       UNKNOWN_AUDIO_FORMAT,           // name of resource
+       UNKNOWN_IMAGE_FORMAT,           // name of resource
 };
 } // namespace ErrorCode