Removal of useless and dangerous methods :

[gdcm.git] / src / gdcmDictSet.h

diff --git a/src/gdcmDictSet.h b/src/gdcmDictSet.h
index 68130b4fbec8937f52d2d757c60b4f52a6de1c1f..abf1a0f6bb5761c83495ea9673a1e1ce94db7f48 100644 (file)
--- a/src/gdcmDictSet.h
+++ b/src/gdcmDictSet.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDictSet.h,v $
   Language:  C++
-  Date:      $Date: 2004/10/12 04:35:45 $
-  Version:   $Revision: 1.27 $
+  Date:      $Date: 2005/01/06 20:03:27 $
+  Version:   $Revision: 1.32 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -19,13 +19,14 @@
 #ifndef GDCMDICTSET_H
 #define GDCMDICTSET_H
 
+#include "gdcmBase.h"
 #include "gdcmDict.h"
+
 #include <map>
 #include <list>
+
 namespace gdcm 
 {
-
-typedef std::string DictKey;
 typedef std::map<DictKey, Dict*> DictSetHT;
 
 //-----------------------------------------------------------------------------
@@ -37,45 +38,46 @@ typedef std::map<DictKey, Dict*> DictSetHT;
  * \par    having many in memory representations of the same dictionary
  *        (saving memory).
  */
-class GDCM_EXPORT DictSet
+class GDCM_EXPORT DictSet : public Base
 {
 public:
    DictSet();
    ~DictSet();
 
-   void Print(std::ostream& os);
+   void Print(std::ostream &os);
 
-   std::list<std::string>* GetPubDictEntryNames();
-   std::map<std::string, std::list<std::string> > *
-       GetPubDictEntryNamesByCategory();
+   EntryNamesList *GetPubDictEntryNames();
+   EntryNamesByCatMap* GetPubDictEntryNamesByCategory();
 
-   Dict* LoadDictFromFile( std::string const & fileName,
-                               DictKey const & name );
+   Dict *LoadDictFromFile( std::string const &fileName,
+                           DictKey const &name );
 
-   Dict* GetDict( DictKey const & DictName );
+   Dict *GetDict( DictKey const &DictName );
 
    /// \brief   Retrieve the default reference DICOM V3 public dictionary.
    Dict* GetDefaultPubDict() { return GetDict(PUB_DICT_NAME); };
 
    // \brief   Retrieve the virtual reference DICOM dictionary.
    // \warning : not end user intended
-   // Dict* GetVirtualDict() { return &VirtualEntry; };
+   // Dict *GetVirtualDict() { return &VirtualEntry; };
 
-   DictEntry* NewVirtualDictEntry(uint16_t group, uint16_t element,
-                                      std::string vr     = "Unknown",
-                                      std::string fourth = "Unknown",
-                                      std::string name   = "Unknown");
+   DictEntry *NewVirtualDictEntry(uint16_t group, uint16_t element,
+                                  TagName vr     = GDCM_UNKNOWN,
+                                  TagName fourth = GDCM_UNKNOWN,
+                                  TagName name   = GDCM_UNKNOWN);
 
    static std::string BuildDictPath();
 
 protected:
-   bool AppendDict(Dict *NewDict, DictKey const & name);
+   bool AppendDict(Dict *NewDict, DictKey const &name);
 
 private:
    /// Hash table of all dictionaries contained in this DictSet
    DictSetHT Dicts;
+
    /// Directory path to dictionaries
    std::string DictPath;
+
    /// H table for the on the fly created DictEntries  
    TagKeyHT VirtualEntry; 
 };