* More memmory link related corrections and documentation fixes.

[gdcm.git] / src / gdcmDictSet.h

diff --git a/src/gdcmDictSet.h b/src/gdcmDictSet.h
index 3ccc09d97f26fbcc36953643644b4d9f0e428100..751be5f83e208322cd4b9b57541dc182901ac51c 100644 (file)
--- a/src/gdcmDictSet.h
+++ b/src/gdcmDictSet.h
@@ -20,18 +20,16 @@ typedef map<DictKey, gdcmDict*> DictSetHT;
  */
 class GDCM_EXPORT gdcmDictSet {
 private:
-       DictSetHT dicts;
+   /// Hash table of all dictionaries contained in this gdcmDictSet
+       DictSetHT Dicts;
+   /// Directory path to dictionaries
+       string DictPath;
        int AppendDict(gdcmDict* NewDict);
        void LoadDictFromFile(string filename, DictKey);
-private:
-   /// Directory path to dictionaries
-       static string DictPath;
-       static string BuildDictPath(void);
-       static gdcmDict* DefaultPubDict;
+       string BuildDictPath(void);
 public:
-       static list<string> * GetPubDictTagNames(void);
-       static map<string, list<string> >* GetPubDictTagNamesByCategory(void);
-       static gdcmDict* LoadDefaultPubDict(void);
+       list<string> * GetPubDictTagNames(void);
+       map<string, list<string> >* GetPubDictTagNamesByCategory(void);
 
        // TODO Swig int LoadDictFromFile(string filename);
    // QUESTION: the following function might not be thread safe !? Maybe
@@ -41,6 +39,7 @@ public:
        // TODO Swig int LoadAllDictFromDirectory(string DirectoryName);
        // TODO Swig string* GetAllDictNames();
        gdcmDictSet(void);
+       ~gdcmDictSet(void);
        void Print(ostream&);
        gdcmDict* GetDict(DictKey DictName);
        gdcmDict* GetDefaultPubDict(void);