X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDictSet.h;h=4256ad8e3fc29defb1f33f0b6338ef1c05a3a42e;hb=480c944ba4a88fd4011a489feea7bcfc6051a7ac;hp=3ccc09d97f26fbcc36953643644b4d9f0e428100;hpb=d74d6412b83d9f596597b54c3413d1a6ee9fb617;p=gdcm.git

diff --git a/src/gdcmDictSet.h b/src/gdcmDictSet.h
index 3ccc09d9..4256ad8e 100644
--- a/src/gdcmDictSet.h
+++ b/src/gdcmDictSet.h
@@ -3,45 +3,45 @@
 #ifndef GDCMDICTSET_H
 #define GDCMDICTSET_H
 
+#include "gdcmDict.h"
 #include <map>
 #include <list>
-#include "gdcmDict.h"
 
-typedef string DictKey;
-typedef map<DictKey, gdcmDict*> DictSetHT;
+typedef std::string DictKey;
+typedef std::map<DictKey, gdcmDict*> DictSetHT;
 
 /*
  * \defgroup gdcmDictSet
  * \brief  Container for managing a set of loaded dictionaries.
  * \note   Hopefully, sharing dictionaries should avoid
- * \par    reloading an allready loaded dictionary (saving time)
+ * \par    reloading an already loaded dictionary (saving time)
  * \par    having many in memory representations of the same dictionary
  *        (saving memory).
  */
 class GDCM_EXPORT gdcmDictSet {
 private:
-	DictSetHT dicts;
-	int AppendDict(gdcmDict* NewDict);
-	void LoadDictFromFile(string filename, DictKey);
-private:
+   /// Hash table of all dictionaries contained in this gdcmDictSet
+	DictSetHT Dicts;
    /// Directory path to dictionaries
-	static string DictPath;
-	static string BuildDictPath(void);
-	static gdcmDict* DefaultPubDict;
+   std::string DictPath;
+	int AppendDict(gdcmDict* NewDict);
+	void LoadDictFromFile(std::string FileName, DictKey Name);
+   std::string BuildDictPath(void);
 public:
-	static list<string> * GetPubDictTagNames(void);
-	static map<string, list<string> >* GetPubDictTagNamesByCategory(void);
-	static gdcmDict* LoadDefaultPubDict(void);
+   std::list<std::string> * GetPubDictTagNames(void);
+   std::map<std::string, std::list<std::string> >*
+       GetPubDictTagNamesByCategory(void);
 
-	// TODO Swig int LoadDictFromFile(string filename);
+	// TODO Swig int LoadDictFromFile(std::string filename);
    // QUESTION: the following function might not be thread safe !? Maybe
    //           we need some mutex here, to avoid concurent creation of
    //           the same dictionary !?!?!
-	// TODO Swig int LoadDictFromName(string filename);
-	// TODO Swig int LoadAllDictFromDirectory(string DirectoryName);
-	// TODO Swig string* GetAllDictNames();
+	// TODO Swig int LoadDictFromName(std::string filename);
+	// TODO Swig int LoadAllDictFromDirectory(std::string DirectoryName);
+	// TODO Swig std::string* GetAllDictNames();
 	gdcmDictSet(void);
-	void Print(ostream&);
+	~gdcmDictSet(void);
+	void Print(std::ostream& os);
 	gdcmDict* GetDict(DictKey DictName);
 	gdcmDict* GetDefaultPubDict(void);
 };