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

[gdcm.git] / src / gdcmUtil.h

diff --git a/src/gdcmUtil.h b/src/gdcmUtil.h
index 325bde910b5bdf53f33cb03e3b8ce960b633d05c..3ec7b666d11ff4dbba58c53fd82fca55e97f1305 100644 (file)
--- a/src/gdcmUtil.h
+++ b/src/gdcmUtil.h
@@ -1,41 +1,54 @@
-// gdcmUtil.h
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmUtil.h,v $
+  Language:  C++
+  Date:      $Date: 2004/10/12 04:35:48 $
+  Version:   $Revision: 1.36 $
+                                                                                
+  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.html 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.
+                                                                                
+=========================================================================*/
 
 #ifndef GDCMUTIL_H
 #define GDCMUTIL_H
 
-#include <iostream>
+#include "gdcmCommon.h"
 #include <vector>
 #include <string>
-#include "gdcmVR.h"
-using namespace std;
 
-class gdcmDebug {
-private:
-       int DebugLevel;
-public:
-       gdcmDebug(int  = 0);
-       void Verbose(int, const char*, const char* ="");
-       void Error(bool, const char*,  const char* ="");
-       void Error(const char*, const char* ="", const char* ="");
-       void Assert(int, bool, const char*, const char*);
-       void Exit(int);
-};
+namespace gdcm 
+{
+/**
+ * \defgroup Globals Utility functions
+ * \brief    Here are some utility functions, belonging to NO class,
+ *           dealing with strings, file names... that can be called
+ *           from anywhere by whomsoever they can help.
+ */
 
-class gdcmGlobal {
-private:
-   static gdcmVR *VR; 
+//-----------------------------------------------------------------------------
+
+class GDCM_EXPORT Util
+{
 public:
-   gdcmGlobal(void);
-   ~gdcmGlobal(void);
-   static gdcmVR * GetVR(void);
+   static std::string Format(const char* format, ...);
+   static void        Tokenize (const std::string& str,
+                         std::vector<std::string>& tokens,
+                         const std::string& delimiters = " ");
+   static int         CountSubstring (const std::string& str,
+                               const std::string& subStr);       
+
+   static std::string CreateCleanString(std::string s);
+   static void        NormalizePath(std::string &name);
+   static std::string GetPath(std::string &fullName);
+   static std::string GetName(std::string &fullName);
 };
-
-istream & eatwhite(istream & is);
-
-void Tokenize (const string& str,
-               vector<string>& tokens,
-               const string& delimiters = " ");
-
-extern gdcmDebug dbg;
-
+} // end namespace gdcm
+//-----------------------------------------------------------------------------
 #endif