* src/gdcmDicomDir*.[h|cxx] : rename methods to be logik in their name.

[gdcm.git] / src / gdcmUtil.h

diff --git a/src/gdcmUtil.h b/src/gdcmUtil.h
index 99cb255520818004e01cbbd0680fae3e59aaba40..b2eba37b64048a9f674353ce7b4b5c67f9b7fe8f 100644 (file)
--- a/src/gdcmUtil.h
+++ b/src/gdcmUtil.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmUtil.h,v $
   Language:  C++
-  Date:      $Date: 2004/11/16 02:04:00 $
-  Version:   $Revision: 1.43 $
+  Date:      $Date: 2005/01/11 15:15:38 $
+  Version:   $Revision: 1.49 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -26,7 +26,7 @@
 namespace gdcm 
 {
 /**
- * \defgroup Globals Utility functions
+ * \ingroup Globals Utility functions
  * \brief    Here are some utility functions, belonging to the Util class,
  *           dealing with strings, file names... that can be called
  *           from anywhere by whomsoever they can help.
@@ -37,31 +37,38 @@ namespace gdcm
 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);       
+   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 const & s);
-   static std::string NormalizePath(std::string const & name);
+   static std::string CreateCleanString(std::string const &s);
+   static std::string NormalizePath(std::string const &name);
    static std::string GetPath(std::string const &fullName);
    static std::string GetName(std::string const &fullName);
    static std::string GetCurrentDate();
    static std::string GetCurrentTime();
 
-   static std::string DicomString(const char* s, size_t l);
-   static std::string DicomString(const char* s);
-   static bool        DicomStringEqual(const std::string& s1, const char *s2);
+   static std::string DicomString(const char *s, size_t l);
+   static std::string DicomString(const char *s);
+   static bool        DicomStringEqual(const std::string &s1, const char *s2);
+   static std::string CreateUniqueUID(const std::string &root = "");
+   static bool        IsCurrentProcessorBigEndian();
+
+   static std::string GetMACAddress();
+
+private:
+   static std::string GetIPAddress(); //Do not expose this method
 };
 
    template <class T> 
-   GDCM_EXPORT std::ostream& binary_write(std::ostream& os, const T& val);
-   GDCM_EXPORT std::ostream& binary_write(std::ostream& os, const uint16_t& val);
-   GDCM_EXPORT std::ostream& binary_write(std::ostream& os, const uint32_t& val);
-   GDCM_EXPORT std::ostream& binary_write(std::ostream& os, const char* val);
-   GDCM_EXPORT std::ostream& binary_write(std::ostream& os, std::string const & val);
+   GDCM_EXPORT std::ostream &binary_write(std::ostream &os, const T &val);
+   GDCM_EXPORT std::ostream &binary_write(std::ostream &os, const uint16_t &val);
+   GDCM_EXPORT std::ostream &binary_write(std::ostream &os, const uint32_t &val);
+   GDCM_EXPORT std::ostream &binary_write(std::ostream &os, const char *val);
+   GDCM_EXPORT std::ostream &binary_write(std::ostream &os, std::string const & val);
 } // end namespace gdcm
 //-----------------------------------------------------------------------------
 #endif