* Change the DocEntry inheritance to RefCounter

[gdcm.git] / src / gdcmElementSet.h

diff --git a/src/gdcmElementSet.h b/src/gdcmElementSet.h
index 626a85e2c7fae1a27a0f04b43ef40df976f245cc..d924c6e867ed2106d94a46d2f5c0667e5c622116 100644 (file)
--- a/src/gdcmElementSet.h
+++ b/src/gdcmElementSet.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmElementSet.h,v $
   Language:  C++
-  Date:      $Date: 2005/01/26 10:29:17 $
-  Version:   $Revision: 1.39 $
+  Date:      $Date: 2005/10/24 16:00:47 $
+  Version:   $Revision: 1.48 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -27,8 +27,6 @@
 
 namespace gdcm 
 {
-class ValEntry;
-class BinEntry;
 class SeqEntry;
 
 typedef std::map<TagKey, DocEntry *> TagDocEntryHT;
@@ -44,35 +42,32 @@ typedef std::map<TagKey, DocEntry *> TagDocEntryHT;
 class GDCM_EXPORT ElementSet : public DocEntrySet
 {
 public:
-   ElementSet(int);
+   ElementSet();
    ~ElementSet();
 
-   virtual void Print(std::ostream &os = std::cout, std::string const &indent = "" ); 
+   virtual void Print(std::ostream &os = std::cout, 
+                      std::string const &indent = "" ); 
 
    void WriteContent(std::ofstream *fp, FileType filetype); 
 
-   void ClearEntry();
    bool AddEntry(DocEntry *Entry);
    bool RemoveEntry(DocEntry *EntryToRemove);
-   bool RemoveEntryNoDestroy(DocEntry *EntryToRemove);
+   void ClearEntry();
    
    DocEntry *GetFirstEntry();
    DocEntry *GetNextEntry();
-
    DocEntry *GetDocEntry(uint16_t group, uint16_t elem);
-
-   bool IsEmpty() { return TagHT.empty(); };
+   /// Tells us if the ElementSet contains no entry
+   bool IsEmpty() { return TagHT.empty(); }
 
 protected:
 
 private:
 // Variables
    /// Hash Table (map), to provide fast access
-   TagDocEntryHT TagHT; 
-   /// Hash Table (map) iterator, used to visit the TagHT variable
-   TagDocEntryHT::iterator ItTagHT; 
-     
-   friend class DocEntryArchive; //For accessing private TagHT
+   TagDocEntryHT TagHT;
+   /// iterator, used to visit the TagHT variable
+   TagDocEntryHT::iterator ItTagHT;
 };
 } // end namespace gdcm
 //-----------------------------------------------------------------------------