X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmUtil.h;h=b77fcb249740095ec16aa0355d568875fb43ef87;hb=e037a39af09b4df452992e1129fa2a370171c44e;hp=2566e82fbd1a15e6f06898e556ee2b7bdd8db81b;hpb=29bdd1e88a28b6267618f633f304e1154537ce7b;p=gdcm.git

diff --git a/src/gdcmUtil.h b/src/gdcmUtil.h
index 2566e82f..b77fcb24 100644
--- a/src/gdcmUtil.h
+++ b/src/gdcmUtil.h
@@ -1,54 +1,28 @@
-// $Header: /cvs/public/gdcm/src/gdcmUtil.h,v 1.16 2003/10/02 11:26:16 malaterre Exp $
-
+// gdcmUtil.h
+//-----------------------------------------------------------------------------
 #ifndef GDCMUTIL_H
 #define GDCMUTIL_H
 
-#include "gdcmVR.h"
-#include "gdcmTS.h"
-#include "gdcmDictSet.h"
-#include <iostream>
 #include <vector>
 #include <string>
 
-class gdcmDebug {
-private:
-	int DebugLevel;
-public:
-	gdcmDebug(int  = 0);
-	void Verbose(int, const char*, const char* ="");
-//	void Verbose(int, char*, 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);
-	void SetDebug (int i) {DebugLevel = i;}
-};
-
-class gdcmGlobal {
-private:
-   static gdcmVR *VR;
-   static gdcmTS *TS; 
-   static gdcmDictSet *Dicts; 
-public:
-   gdcmGlobal(void);
-   ~gdcmGlobal();
-   static gdcmVR * GetVR(void);
-   static gdcmTS * GetTS(void);
-   static gdcmDictSet * GetDicts(void);
-};
+/**
+ * \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);
 
 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);
-
-std::string TranslateToKey(guint16 group, guint16 element);
-
+std::string CreateCleanString(std::string s);
+void        NormalizePath(std::string &name);
+std::string GetPath(std::string &fullName);
+std::string GetName(std::string &fullName);
+//-----------------------------------------------------------------------------
 #endif
-