ENH: Minor patch, mostly cosmetic clean up

[gdcm.git] / src / gdcmException.cxx

diff --git a/src/gdcmException.cxx b/src/gdcmException.cxx
index fcf2f3149eae9b92e8bbf4c8f018063e72577a0f..037156051d30ba1abb35afe9a428e66aeca620f5 100644 (file)
--- a/src/gdcmException.cxx
+++ b/src/gdcmException.cxx
@@ -1,10 +1,36 @@
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmException.cxx,v $
+  Language:  C++
+  Date:      $Date: 2004/06/20 18:08:47 $
+  Version:   $Revision: 1.16 $
+                                                                                
+  Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
+  l'Image). All rights reserved. See Doc/License.txt or
+  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details.
+                                                                                
+     This software is distributed WITHOUT ANY WARRANTY; without even
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+     PURPOSE.  See the above copyright notices for more information.
+                                                                                
+=========================================================================*/
+
 #include "gdcmException.h"
 
 #include <typeinfo>
 #include <stdio.h>
 
+//-----------------------------------------------------------------------------
+// gdcmException
 
-gdcmException::gdcmException(const string &f, const string& msg) throw()
+/**
+ * \ingroup gdcmException
+ * \brief constructor
+ * @param f
+ * @param msg  
+ */
+gdcmException::gdcmException(const std::string &f, const std::string& msg) throw()
 #ifdef __GNUC__
   try
 #endif
@@ -17,17 +43,21 @@ catch(...) {
 #endif
 
 
-
-void gdcmException::fatal(const char *from) throw() {
+/**
+ * \ingroup gdcmException
+ * \brief fatal
+ * @param from 
+ */
+ void gdcmException::fatal(const char *from) throw() {
   try {
-    cerr << "Fatal: exception received in " << from 
-        << " while handling exception." << endl;
+    std::cerr << "Fatal: exception received in " << from 
+        << " while handling exception." << std::endl;
     exit(-1);
   }
   catch(...) {
     try {
-      cerr << "Fatal: exception received in Exception::fatal while handling exception."
-          << endl;
+      std::cerr << "Fatal: exception received in Exception::fatal while handling exception."
+          << std::endl;
       exit(-1);
     }
     catch(...) {
@@ -36,52 +66,63 @@ void gdcmException::fatal(const char *from) throw() {
   }  
 }
 
-
-string gdcmException::getName() const throw() {
+/**
+ * \ingroup gdcmException
+ * \brief getName
+ * @return string
+ */
+ std::string gdcmException::getName() const throw() {
   try {
 #ifdef __GNUC__   // GNU C++ compiler class name demangling
       unsigned int nested = 1, i, nb, offset;
-      string one;
+      std::string one;
 
-      string name;
-      string iname = typeid(*this).name();
+      std::string name;
+      std::string iname = typeid(*this).name();
       if(iname[0] == 'Q') {
        nested = iname[1] - '0';
-       iname = string(iname, 2, std::string::npos);
+       iname = std::string(iname, 2, std::string::npos);
       }
       for(i = 0; i < nested; i++) {
        ::sscanf(iname.c_str(), "%u%n", &nb, &offset);
-       iname = string(iname, offset, std::string::npos);
-       name += string(iname, 0, nb);
+       iname = std::string(iname, offset, std::string::npos);
+       name += std::string(iname, 0, nb);
        if(i + 1 < nested) name += "::";
-       iname = string(iname, nb, std::string::npos);
+       iname = std::string(iname, nb, std::string::npos);
       }
       return name;
-#else             // no class name demangling
+#else           // no class name demangling
       //name = typeid(*this).name();
       return "Exception";
 #endif
   }
   catch(...) {
-    fatal("Exception::getName(string &)");
+    fatal("Exception::getName(std::string &)");
     return "";
   }
 }
 
-
-gdcmException::operator const char *() const throw() {
+/**
+ * \ingroup gdcmException
+ * \brief gdcmException
+ */
+ gdcmException::operator const char *() const throw() {
   return getName().c_str();
 }
 
-
-ostream& operator<<(ostream &os, const gdcmException &e) {
+//-----------------------------------------------------------------------------
+/**
+ * \ingroup gdcmException
+ * \brief gdcmException::operator <<
+ */
+ std::ostream& operator<<(std::ostream &os, const gdcmException &e) {
   try {  
-    os << "Exception " << e.getName() << " thrown: " << e.getError() << endl;
+    os << "Exception " << e.getName() << " thrown: " << e.getError() << std::endl;
   }
   catch(...) {
-    gdcmException::fatal("operator<<(ostream &, const gdcmException&)");
+    gdcmException::fatal("operator<<(std::ostream &, const gdcmException&)");
   }
   return os;
 }
 
-  
+//-----------------------------------------------------------------------------