COMP: Fix comp on dash8 (gcc296)

[gdcm.git] / src / gdcmDicomDir.h

diff --git a/src/gdcmDicomDir.h b/src/gdcmDicomDir.h
index d9ec5b339498aed6684b939b997e0653a8dadfbf..2a19ffd7f5a128ebf2221761fd61e21e64c9357b 100644 (file)
--- a/src/gdcmDicomDir.h
+++ b/src/gdcmDicomDir.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomDir.h,v $
   Language:  C++
-  Date:      $Date: 2005/11/28 15:20:32 $
-  Version:   $Revision: 1.71 $
+  Date:      $Date: 2006/05/11 19:49:38 $
+  Version:   $Revision: 1.75 $
   
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -56,6 +56,7 @@ public:
 /// \brief Constructs a DicomDir with a RefCounter
    static DicomDir *New() {return new DicomDir();}
 
+   GDCM_LEGACY( bool Load(std::string const &filename) )
    bool Load( );
    void Print(std::ostream &os = std::cout, std::string const &indent = "" );
    
@@ -98,6 +99,8 @@ public:
 
    bool Anonymize();
 
+   virtual void Copy(DocEntrySet *set);
+
    /// Types of the DicomDirObject within the DicomDir
    typedef enum
    {
@@ -112,12 +115,10 @@ public:
    
 protected:
    DicomDir(); 
+   GDCM_LEGACY( DicomDir(std::string const &filename, bool parseDir = false) )
    ~DicomDir();
 
    void CreateDicomDirChainedList(std::string const &path);
-   void CallStartMethod();
-   void CallProgressMethod();
-   void CallEndMethod();
 
 private:
    void Initialize();
@@ -145,12 +146,9 @@ private:
    ListDicomDirPatient Patients;
    ListDicomDirPatient::iterator ItPatient;
 
-   /// value of the ??? for any progress bar
-   float Progress;
    /// value of the ??? for any progress bar   
    bool ParseDir;
 
-   mutable bool Abort;
 };
 } // end namespace gdcm
 //-----------------------------------------------------------------------------