* Remove memory leaks on the DicomDir

[gdcm.git] / src / gdcmDicomDirObject.h

diff --git a/src/gdcmDicomDirObject.h b/src/gdcmDicomDirObject.h
index 8997df873c6d4930a9bbfa17b14a2e32888b264a..8503569b765c2edb27b4ee800f9f3d0472cce1d2 100644 (file)
--- a/src/gdcmDicomDirObject.h
+++ b/src/gdcmDicomDirObject.h
@@ -3,12 +3,12 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomDirObject.h,v $
   Language:  C++
-  Date:      $Date: 2004/09/23 10:47:10 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2004/12/03 17:13:18 $
+  Version:   $Revision: 1.7 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
-  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details.
+  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details.
                                                                                 
      This software is distributed WITHOUT ANY WARRANTY; without even
      the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
@@ -16,32 +16,33 @@
                                                                                 
 =========================================================================*/
 
-#ifndef GDCMOBJECT_H
-#define GDCMOBJECT_H
+#ifndef GDCMDICOMDIROBJECT_H
+#define GDCMDICOMDIROBJECT_H
+
+#include "gdcmSQItem.h"
+#include "gdcmDicomDirElement.h"
 
 #include <string>
 #include <list>
-#include "gdcmCommon.h"
-#include "gdcmDocEntry.h"
-#include "gdcmDocument.h"
-#include "gdcmDicomDirElement.h"
-#include "gdcmSQItem.h"
 
+namespace gdcm 
+{
 //-----------------------------------------------------------------------------
-class gdcmDicomDirObject;
-typedef std::list<gdcmDicomDirObject *> ListContent;
+class DicomDirObject;
+typedef std::list<DicomDirObject *> ListContent;
 
 //-----------------------------------------------------------------------------
 /**
- * \ingroup gdcmDicomDirObject
+ * \ingroup DicomDirObject
  * \brief   Base object
  */
-class GDCM_EXPORT gdcmDicomDirObject : public gdcmSQItem
+class GDCM_EXPORT DicomDirObject : public SQItem
 {
 public:
 
-   gdcmDicomDirObject(TagDocEntryHT *ptagHT, int depth = 0);
-   virtual ~gdcmDicomDirObject();
+   DicomDirObject(int depth = 1);
+   ~DicomDirObject();
+
    /**
     * \brief   Sets the print level for the Dicom Header 
     * \note    0 for Light Print; 1 for 'medium' Print, 2 for Heavy
@@ -49,18 +50,19 @@ public:
    void SetPrintLevel(int level) { PrintLevel = level; };
    
    TagDocEntryHT GetEntry();
-   void FillObject(std::list<gdcmElement> elemList);
+   void FillObject(ListDicomDirMetaElem const & elemList);
 
 protected:
 
    // Constructor and destructor are protected to avoid end user to
    // instanciate from this class. 
-   // NO ! gdcmDicomDir needs to instanciate it!
+   // NO ! DicomDir needs to instanciate it!
 
 // Members :
    ///\brief detail level to be printed 
    int PrintLevel;
 };
+} // end namespace gdcm
 
 //-----------------------------------------------------------------------------
 #endif