Sub-minor std-related fixes... Jpr+Frog

[gdcm.git] / src / gdcmUtil.h

diff --git a/src/gdcmUtil.h b/src/gdcmUtil.h
index af4a67688146c8b3b28b1637cbb184a6d0080f39..403397b7f419bd5ce24eb668b2eb15493508057b 100644 (file)
--- a/src/gdcmUtil.h
+++ b/src/gdcmUtil.h
@@ -3,80 +3,28 @@
 #ifndef GDCMUTIL_H
 #define GDCMUTIL_H
 
-#include "gdcmCommon.h"
-#include "gdcmVR.h"
-#include "gdcmTS.h"
-#include "gdcmDictSet.h"
-#include "gdcmDicomDirElement.h"
-#include <iostream>
 #include <vector>
 #include <string>
 
-//-----------------------------------------------------------------------------
-/*
- * gdcmDebug is an object for debugging in program.
- * It has 2 debugging modes :
- *  - error : for bad library use
- *  - debug : for debugging messages
- * 
- * A debugging message has a level of priority and is 
- * Shown only when the debug level is higher than the 
- * message level.
- */
-class gdcmDebug {
-public:
-       gdcmDebug(int level = GDCM_DEBUG);
-
-       void SetDebug (int i) {DebugLevel = i;}
-
-   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);
-
-private:
-       int DebugLevel;
-};
+#include "gdcmCommon.h"
 
-//-----------------------------------------------------------------------------
-/*
- * This class contains all globals elements that might be
- * instanciated only one time
+/**
+ * \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);
+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 = " ");
 
-extern gdcmDebug dbg;
-
-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
-