Adding std::

[gdcm.git] / src / gdcmUtil.h

diff --git a/src/gdcmUtil.h b/src/gdcmUtil.h
index ac624c87de93b162e8035b12da30046a287ee1ba..b77fcb249740095ec16aa0355d568875fb43ef87 100644 (file)
--- a/src/gdcmUtil.h
+++ b/src/gdcmUtil.h
@@ -3,36 +3,15 @@
 #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>
 
-//-----------------------------------------------------------------------------
 /**
- * \ingroup gdcmGlobal
- * \brief   This class contains all globals elements that might be
- *          instanciated only once (singletons).
+ * \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 GDCM_EXPORT gdcmGlobal {
-public:
-   gdcmGlobal(void);
-   ~gdcmGlobal();
-
-   static gdcmDictSet *GetDicts(void);
-   static gdcmVR *GetVR(void);
-   static gdcmTS *GetTS(void);
-   static gdcmDicomDirElement *GetDicomDirElements(void);
-
-private:
-   static gdcmDictSet *Dicts; 
-   static gdcmVR *VR;
-   static gdcmTS *TS; 
-   static gdcmDicomDirElement *ddElem;
-};
 
 //-----------------------------------------------------------------------------
 std::istream & eatwhite(std::istream & is);
@@ -45,4 +24,5 @@ std::string CreateCleanString(std::string s);
 void        NormalizePath(std::string &name);
 std::string GetPath(std::string &fullName);
 std::string GetName(std::string &fullName);
+//-----------------------------------------------------------------------------
 #endif