Fix mistypings

[gdcm.git] / src / gdcmSQItem.h

diff --git a/src/gdcmSQItem.h b/src/gdcmSQItem.h
index 4874a218e99e31e4746bdb6001f71992e6570ce1..94918015755301409555a5a2b0c709bdcd1698ab 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: 2005/07/07 13:55:39 $
-  Version:   $Revision: 1.42 $
+  Date:      $Date: 2007/09/17 12:16:01 $
+  Version:   $Revision: 1.56 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
                                                                                 
 =========================================================================*/
-#ifndef GDCMSQITEM_H
-#define GDCMSQITEM_H
+#ifndef _GDCMSQITEM_H_
+#define _GDCMSQITEM_H_
 
 #include "gdcmDocEntrySet.h"
 #include "gdcmElementSet.h"
@@ -24,7 +24,7 @@
 #include <list>
 #include <fstream>
 
-namespace gdcm 
+namespace GDCM_NAME_SPACE 
 {
 class DocEntry;
 
@@ -40,16 +40,19 @@ typedef std::list<DocEntry *> ListDocEntry;
  */ 
 class GDCM_EXPORT SQItem : public DocEntrySet 
 {
+   gdcmTypeMacro(SQItem);
+
 public:
-   SQItem(int depthLevel);
-   ~SQItem();
+   static SQItem *New(int depthLevel) {return new SQItem(depthLevel);}
 
-   virtual void Print(std::ostream &os = std::cout, std::string const &indent = "" ); 
-   void WriteContent(std::ofstream *fp, FileType filetype);
+   virtual void Print(std::ostream &os = std::cout, 
+                      std::string const &indent = "" ); 
+   void WriteContent(std::ofstream *fp, FileType filetype,
+                           bool insideMetaElements, bool insideSequence);
+   uint32_t ComputeFullLength();
 
    bool AddEntry(DocEntry *Entry); // add to the List
    bool RemoveEntry(DocEntry *EntryToRemove);
-   bool RemoveEntryNoDestroy(DocEntry *EntryToRemove);
    void ClearEntry();
   
    DocEntry *GetFirstEntry();
@@ -57,47 +60,39 @@ public:
 
    DocEntry *GetDocEntry(uint16_t group, uint16_t elem);
 
-   bool IsEmpty() { return DocEntries.empty(); };
+   bool IsEmpty() { return DocEntries.empty(); }
 
    /// \brief   returns the ordinal position of a given SQItem
-   int GetSQItemNumber() { return SQItemNumber; };
+   int GetSQItemNumber() { return SQItemNumber; }
    /// \brief   Sets the ordinal position of a given SQItem
-   void SetSQItemNumber(int itemNumber) { SQItemNumber = itemNumber; };
+   void SetSQItemNumber(int itemNumber) { SQItemNumber = itemNumber; }
 
-   ///  \brief Accessor on \ref SQDepthLevel.
+   ///  \brief Accessor on  SQDepthLevel.
    int GetDepthLevel() { return SQDepthLevel; }                                                                             
 
-   ///  \brief Accessor on \ref SQDepthLevel.
+   ///  \brief Accessor on  SQDepthLevel.
    void SetDepthLevel(int depth) { SQDepthLevel = depth; }
 
-   // waste time hunting
-   // /  \brief Accessor on \ref BaseTagKey.
-   //void SetBaseTagKey( BaseTagKey const &key ) { BaseTagKeyNested = key; }
-   // /  \brief Accessor on \ref BaseTagKey.
-   //BaseTagKey const &GetBaseTagKey() const { return BaseTagKeyNested; }
+   virtual void Copy(DocEntrySet *set);
 
 protected:
+   SQItem(int depthLevel);
+   ~SQItem();
+
 // Variables that need to be accessed in subclasses
    /// \brief Chained list of Doc Entries
    ListDocEntry DocEntries;
    /// Iterator, used to visit the entries
    ListDocEntry::iterator ItDocEntries;
-   /// Iterator, used to visit the Val Entries (for Python users)
-   ListDocEntry::iterator ItValEntries;
   
 private:
-   /// \brief Sequences can be nested. This \ref SQDepthLevel represents
+   /// \brief Sequences can be nested. This  SQDepthLevel represents
    ///        the level of the nesting of instances of this class.
-   ///        \ref SQDepthLevel and its \ref SeqEntry::SQDepthLevel
+   ///         SQDepthLevel and its  SeqEntry::SQDepthLevel
    ///        counterpart are only defined on printing purposes
-   ///        (see \ref Print).
+   ///        (see  Print).
    int SQDepthLevel;
 
-   // waste time hunting
-   // / \brief A TagKey of a DocEntry nested in a sequence is prepended
-   // /        with this BaseTagKey.
-   //BaseTagKey BaseTagKeyNested;
-
    /// \brief SQ Item ordinal number 
    int SQItemNumber;
 };