Add TestValidate, to be used as stand alone exec.

[gdcm.git] / src / gdcmSQItem.h

diff --git a/src/gdcmSQItem.h b/src/gdcmSQItem.h
index ba42f1c0ddaf8447222d203f8846878c37dfbf06..0d8852258e9471ff5481c4fb87a026312dadb440 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/12 17:08:12 $
-  Version:   $Revision: 1.43 $
+  Date:      $Date: 2005/10/25 14:52:35 $
+  Version:   $Revision: 1.47 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -40,18 +40,17 @@ 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);
 
    bool AddEntry(DocEntry *Entry); // add to the List
    bool RemoveEntry(DocEntry *EntryToRemove);
-   bool RemoveEntryNoDestroy(DocEntry *EntryToRemove);
    void ClearEntry();
-   void ClearEntryNoDestroy();
    void MoveObject(SQItem *source);
   
    DocEntry *GetFirstEntry();
@@ -59,12 +58,12 @@ 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.
    int GetDepthLevel() { return SQDepthLevel; }                                                                             
@@ -72,13 +71,10 @@ public:
    ///  \brief Accessor on \ref 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; }
-
 protected:
+   SQItem(int depthLevel);
+   ~SQItem();
+
 // Variables that need to be accessed in subclasses
    /// \brief Chained list of Doc Entries
    ListDocEntry DocEntries;
@@ -95,11 +91,6 @@ private:
    ///        (see \ref 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;
 };