X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmUtil.h;h=403397b7f419bd5ce24eb668b2eb15493508057b;hb=801fe2221ca70b34c5c644b6f522aa1b7233945b;hp=7683ed4f91b80087a9253dd5d81d4823b3a92dcc;hpb=0e82725d64f17545e782c18039ced7ea898f8cad;p=gdcm.git

diff --git a/src/gdcmUtil.h b/src/gdcmUtil.h
index 7683ed4f..403397b7 100644
--- a/src/gdcmUtil.h
+++ b/src/gdcmUtil.h
@@ -3,47 +3,28 @@
 #ifndef GDCMUTIL_H
 #define GDCMUTIL_H
 
-#include "gdcmCommon.h"
-#include "gdcmVR.h"
-#include "gdcmTS.h"
-#include "gdcmDictSet.h"
-#include "gdcmDicomDirElement.h"
 #include <vector>
 #include <string>
 
-//-----------------------------------------------------------------------------
-/*
- * This class contains all globals elements that might be
- * instanciated only one time
- */
-class GDCM_EXPORT gdcmGlobal {
-public:
-   gdcmGlobal(void);
-   ~gdcmGlobal();
-
-   static gdcmDictSet *GetDicts(void);
-   static gdcmVR *GetVR(void);
-   static gdcmTS *GetTS(void);
-   static gdcmDicomDirElement *GetDicomDirElements(void);
+#include "gdcmCommon.h"
 
-private:
-   static gdcmDictSet *Dicts; 
-   static gdcmVR *VR;
-   static gdcmTS *TS; 
-   static gdcmDicomDirElement *ddElem;
-};
+/**
+ * \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.
+ */
 
 //-----------------------------------------------------------------------------
-std::istream & eatwhite(std::istream & is);
+GDCM_EXPORT std::istream & eatwhite(std::istream & is);
 
-void Tokenize (const std::string& str,
+GDCM_EXPORT void Tokenize (const std::string& str,
                std::vector<std::string>& tokens,
                const std::string& delimiters = " ");
 
-char *_cleanString(char *v);
-std::string _CreateCleanString(std::string s);
-
-void NormalizePath (std::string &name);
-std::string GetPath(std::string &fullName);
-std::string GetName(std::string &fullName);
+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);
+//-----------------------------------------------------------------------------
 #endif