ENH: Adding 'gdcm' namespace. Be nice with me this was a ~13000 lines patch. Also...

[gdcm.git] / src / gdcmDebug.h

diff --git a/src/gdcmDebug.h b/src/gdcmDebug.h
index a689936f29dbd1432b491ac4cf8a03efd22d7921..83939678566cd0fec2582c939718a46140188b2c 100644 (file)
--- a/src/gdcmDebug.h
+++ b/src/gdcmDebug.h
@@ -3,12 +3,12 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDebug.h,v $
   Language:  C++
-  Date:      $Date: 2004/07/19 11:51:26 $
-  Version:   $Revision: 1.4 $
+  Date:      $Date: 2004/10/12 04:35:44 $
+  Version:   $Revision: 1.8 $
                                                                                 
   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.
+  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details.
                                                                                 
      This software is distributed WITHOUT ANY WARRANTY; without even
      the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
@@ -20,15 +20,14 @@
 #define GDCMDEBUG_H
 
 #include "gdcmCommon.h"
-
-//-----------------------------------------------------------------------------
-#define dbg gdcmDebug::GetReference()
+namespace gdcm 
+{
 
 //-----------------------------------------------------------------------------
 
 /**
- * \ingroup gdcmDebug
- * \brief gdcmDebug is an object for debugging in program.
+ * \ingroup Debug
+ * \brief Debug is an object for debugging in program.
  * It has 2 debugging modes :
  *  - error : for bad library use
  *  - debug : for debugging messages
@@ -37,26 +36,29 @@
  * Shown only when the debug level is higher than the 
  * message level.
  */
-class GDCM_EXPORT gdcmDebug {
+class GDCM_EXPORT Debug
+{
 public:
-   gdcmDebug(int level = -1);
+   Debug(int level = -1);
 
    void SetDebug (int level);
-   void Verbose(int, const char*, const char* ="");
-   void Error(bool, const char*,  const char* ="");
-   void Error(const char*, const char* ="", const char* ="");
+   void Verbose(int level, const char* msg1, const char* msg2 = "") ;
+   void Error  (bool test, const char* msg1, const char* msg2 = "");
+   void Error  (const char* msg1, const char* msg2 = "", const char* msg3 = "");
 
-   void Assert(int, bool, const char*, const char*);
-   void Exit(int);
+   void Assert(int level, bool test, const char * msg1, const char * msg2);
+   void Exit(int a);
 
-   static gdcmDebug &GetReference();
+   static Debug &GetReference();
 
 private:
 /// warning message level to be displayed
    int DebugLevel;
 
-/// Instance of debugging utility.
-   static gdcmDebug debug;
 };
 
+} // end namespace gdcm
+/// Instance of debugging utility.
+static gdcm::Debug dbg;
+
 #endif