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 ae4f23f4e2f22fca66307c155d675be82befe032..3ec7b666d11ff4dbba58c53fd82fca55e97f1305 100644 (file)
--- a/src/gdcmUtil.h
+++ b/src/gdcmUtil.h
@@ -3,12 +3,12 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmUtil.h,v $
   Language:  C++
-  Date:      $Date: 2004/06/20 18:08:48 $
-  Version:   $Revision: 1.29 $
+  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.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
@@ -19,11 +19,12 @@
 #ifndef GDCMUTIL_H
 #define GDCMUTIL_H
 
+#include "gdcmCommon.h"
 #include <vector>
 #include <string>
 
-#include "gdcmCommon.h"
-
+namespace gdcm 
+{
 /**
  * \defgroup Globals Utility functions
  * \brief    Here are some utility functions, belonging to NO class,
@@ -32,15 +33,22 @@
  */
 
 //-----------------------------------------------------------------------------
-GDCM_EXPORT std::istream & eatwhite(std::istream & is);
 
-GDCM_EXPORT void Tokenize (const std::string& str,
-               std::vector<std::string>& tokens,
-               const std::string& delimiters = " ");
+class GDCM_EXPORT Util
+{
+public:
+   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);       
 
-GDCM_EXPORT std::string CreateCleanString(std::string s);
-GDCM_EXPORT void        NormalizePath(std::string &name);
-GDCM_EXPORT std::string GetPath(std::string &fullName);
-GDCM_EXPORT std::string GetName(std::string &fullName);
+   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);
+};
+} // end namespace gdcm
 //-----------------------------------------------------------------------------
 #endif