* Fix memory leaks

[gdcm.git] / src / gdcmDocEntrySet.h

diff --git a/src/gdcmDocEntrySet.h b/src/gdcmDocEntrySet.h
index 33106012bd679481ac2619eb246b13b639cc5883..0173958a015a6c936bbd18374775808ace0e646d 100644 (file)
--- a/src/gdcmDocEntrySet.h
+++ b/src/gdcmDocEntrySet.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDocEntrySet.h,v $
   Language:  C++
-  Date:      $Date: 2005/09/02 07:10:03 $
-  Version:   $Revision: 1.55 $
+  Date:      $Date: 2005/10/20 15:24:09 $
+  Version:   $Revision: 1.60 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -20,19 +20,19 @@
 #define GDCMDOCENTRYSET_H
 
 #include "gdcmBase.h"
+#include "gdcmVRKey.h"
+#include "gdcmTagKey.h"
+
 #include <fstream>
 
 namespace gdcm 
 {
 //-----------------------------------------------------------------------------
 class DocEntry;
-class ValEntry;
-class BinEntry;
+class DataEntry;
 class SeqEntry;
 class DictEntry;
 
-typedef TagKey BaseTagKey;
-
 //-----------------------------------------------------------------------------
 /**
  * \brief
@@ -80,56 +80,46 @@ public:
    /// Gets the next entry of any type of set
    virtual DocEntry *GetNextEntry()=0;
 
-   virtual std::string GetEntryValue(uint16_t group, uint16_t elem);
-   virtual void *GetEntryBinArea(uint16_t group, uint16_t elem);   
+   virtual std::string GetEntryString(uint16_t group, uint16_t elem);
+   virtual void *GetEntryBinArea(uint16_t group, uint16_t elem);
    virtual int GetEntryLength(uint16_t group, uint16_t elem);
-   virtual std::string GetEntryVR(uint16_t group, uint16_t elem);
+   virtual std::string GetEntryForcedAsciiValue(uint16_t group, uint16_t elem);
 
    /// \brief Gets any type of DocEntry, identified by its (group,elem)
    virtual DocEntry *GetDocEntry(uint16_t group, uint16_t elem) = 0;
-   /// \brief Gets a ValEntry, identified by its (group, elem)
-   ValEntry *GetValEntry(uint16_t group, uint16_t elem);
-   /// \brief Gets a BinEntry, identified by its (group,elem)
-   BinEntry *GetBinEntry(uint16_t group, uint16_t elem);
+   /// \brief Gets a DataEntry, identified by its (group, elem)
+   DataEntry *GetDataEntry(uint16_t group, uint16_t elem);
    /// \brief Gets a SeqEntry, identified by its (group,elem)
    SeqEntry *GetSeqEntry(uint16_t group, uint16_t elem);
 
-   bool SetValEntry(std::string const &content,
-                            uint16_t group, uint16_t elem);
-   bool SetBinEntry(uint8_t *content, int lgth,
-                            uint16_t group, uint16_t elem);
-   bool SetValEntry(std::string const &content, ValEntry *entry);
-   bool SetBinEntry(uint8_t *content, int lgth, BinEntry *entry);
-
-   ValEntry *InsertValEntry(std::string const &value,
+   bool SetEntryString(std::string const &content,
+                       uint16_t group, uint16_t elem);
+   bool SetEntryBinArea(uint8_t *content, int lgth,
+                        uint16_t group, uint16_t elem);
+   bool SetEntryString(std::string const &content, DataEntry *entry);
+   bool SetEntryBinArea(uint8_t *content, int lgth, DataEntry *entry);
+
+   DataEntry *InsertEntryString(std::string const &value,
+                                   uint16_t group, uint16_t elem,
+                                   VRKey const &vr = GDCM_VRUNKNOWN);
+   DataEntry *InsertEntryBinArea(uint8_t *binArea, int lgth,
                                     uint16_t group, uint16_t elem,
-                                    TagName const &vr = GDCM_UNKNOWN);
-   BinEntry *InsertBinEntry(uint8_t *binArea, int lgth,
-                                    uint16_t group, uint16_t elem,
-                                    TagName const &vr = GDCM_UNKNOWN);
+                                    VRKey const &vr = GDCM_VRUNKNOWN);
    SeqEntry *InsertSeqEntry(uint16_t group, uint16_t elem);
    /// tells us if the set contains no entry
    virtual bool IsEmpty() = 0;
    virtual bool CheckIfEntryExist(uint16_t group, uint16_t elem);
 
 // DocEntry  related utilities 
-   ValEntry *NewValEntry(uint16_t group,uint16_t elem,
-                         TagName const &vr = GDCM_UNKNOWN);
-   BinEntry *NewBinEntry(uint16_t group, uint16_t elem,
-                         TagName const &vr = GDCM_UNKNOWN);
+   DataEntry *NewDataEntry(uint16_t group,uint16_t elem,
+                         VRKey const &vr = GDCM_VRUNKNOWN);
    SeqEntry *NewSeqEntry(uint16_t group, uint16_t elem);
 
-// DictEntry  related utilities 
-   DictEntry *NewVirtualDictEntry(uint16_t group,uint16_t elem,
-                                  TagName const &vr     = GDCM_UNKNOWN,
-                                  TagName const &vm     = GDCM_UNKNOWN,
-                                  TagName const &name   = GDCM_UNKNOWN );
-
 protected:
 // DictEntry  related utilities
    DictEntry *GetDictEntry(uint16_t group, uint16_t elem);
    DictEntry *GetDictEntry(uint16_t group, uint16_t elem,
-                           TagName const &vr);
+                           VRKey const &vr);
    /// To be able to backtrack (Private Sequence, Implicit VR related pb)
    DocEntry *PreviousDocEntry;