BUG: Remove demangle code this was seg faulting on some linux gcc 3.3.2 machine

[gdcm.git] / src / gdcmSQItem.h

diff --git a/src/gdcmSQItem.h b/src/gdcmSQItem.h
index 0f42e54b1d717ad097285e3ac99d335d2013be49..22eaedb32a1e7cda2037a576591a7bed466ac93c 100644 (file)
--- a/src/gdcmSQItem.h
+++ b/src/gdcmSQItem.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmSQItem.h,v $
   Language:  C++
-  Date:      $Date: 2004/10/22 03:05:42 $
-  Version:   $Revision: 1.20 $
+  Date:      $Date: 2004/10/28 03:10:58 $
+  Version:   $Revision: 1.22 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -21,10 +21,6 @@
 #include "gdcmDocEntrySet.h"
 #include "gdcmElementSet.h"
 
-//#include "gdcmDocEntry.h"
-//#include "gdcmDocument.h"
-//#include "gdcmBinEntry.h"
-
 #include <list>
 
 namespace gdcm 
@@ -34,23 +30,21 @@ class DocEntry;
 //-----------------------------------------------------------------------------
 typedef std::list<DocEntry *> ListDocEntry;
 //-----------------------------------------------------------------------------
-class GDCM_EXPORT SQItem 
-  : 
-  public DocEntrySet 
+class GDCM_EXPORT SQItem : public DocEntrySet 
 {
 public:
-   SQItem(int);
+   SQItem(int depthLevel);
    ~SQItem();
 
-   virtual void Print(std::ostream &os = std::cout); 
-   virtual void Write(std::ofstream *fp, FileType filetype);
+   void Print(std::ostream &os = std::cout); 
+   void Write(std::ofstream *fp, FileType filetype);
 
    /// \brief   returns the DocEntry chained List for this SQ Item.
-   ListDocEntry &GetDocEntries() { return docEntries; };
+   ListDocEntry const & GetDocEntries() const { return DocEntries; };
    
    /// \brief   adds the passed DocEntry to the DocEntry chained List for
    /// this SQ Item.      
-   void AddDocEntry(DocEntry *e) { docEntries.push_back(e); };
+   void AddDocEntry(DocEntry *e) { DocEntries.push_back(e); };
 
    virtual bool AddEntry(DocEntry *Entry); // add to the List
   
@@ -58,9 +52,10 @@ public:
    // FIXME method to write
    //DocEntry *GetDocEntryByName  (std::string Name);
    
-   bool SetEntryByNumber(std::string val, uint16_t group, uint16_t element);                   
+   bool SetEntryByNumber(std::string const & val, uint16_t group, 
+                                                  uint16_t element);
     
-   virtual std::string GetEntryByNumber(uint16_t group, uint16_t element);
+   std::string GetEntryByNumber(uint16_t group, uint16_t element);
 
    /// \brief   returns the ordinal position of a given SQItem
    int GetSQItemNumber() { return SQItemNumber; };
@@ -75,27 +70,22 @@ public:
    void SetDepthLevel(int depth) { SQDepthLevel = depth; }
 
    /// Accessor on \ref BaseTagKey.
-   void           SetBaseTagKey( BaseTagKey key ) { BaseTagKeyNested = key; }
+   void SetBaseTagKey( BaseTagKey const & key ) { BaseTagKeyNested = key; }
 
    /// Accessor on \ref BaseTagKey.
-   BaseTagKey GetBaseTagKey( ) { return BaseTagKeyNested; }
+   BaseTagKey const & GetBaseTagKey() const { return BaseTagKeyNested; }
 
 
 protected:
-
-// Variables
+// Variables that need to be access in subclasses
 
    /// \brief chained list of (Elementary) Doc Entries
-   ListDocEntry docEntries;
-  
-   /// \brief SQ Item ordinal number 
-   int SQItemNumber;
-
+   ListDocEntry DocEntries;
+   
    ///\brief pointer to the HTable of the Document,
    ///       (because we don't know it within any DicomDirObject nor any SQItem)
    TagDocEntryHT *PtagHT;
 
-       
 private:
 
    /// \brief Sequences can be nested. This \ref SQDepthLevel represents
@@ -109,6 +99,10 @@ private:
    ///        with this BaseTagKey.
    BaseTagKey BaseTagKeyNested;
 
+ 
+   /// \brief SQ Item ordinal number 
+   int SQItemNumber;
+
 };
 } // end namespace gdcm
 //-----------------------------------------------------------------------------