COMP: Fix compilation on MINGW32

[gdcm.git] / src / gdcmDirList.h

diff --git a/src/gdcmDirList.h b/src/gdcmDirList.h
index c66aa837ae78586d3fb85f0b71d91a990a2964e9..99ea714acddd68c3a9579472d2a66de3e23bc083 100644 (file)
--- a/src/gdcmDirList.h
+++ b/src/gdcmDirList.h
@@ -3,12 +3,12 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDirList.h,v $
   Language:  C++
-  Date:      $Date: 2004/07/26 19:36:56 $
-  Version:   $Revision: 1.8 $
+  Date:      $Date: 2005/02/02 15:07:41 $
+  Version:   $Revision: 1.23 $
                                                                                 
   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
@@ -22,33 +22,47 @@
 #include "gdcmCommon.h"
 
 #include <string>
-#include <list>
+#include <vector>
+#include <iostream>
+
+namespace gdcm 
+{
+
+typedef std::vector<std::string> DirListType;
 
 //-----------------------------------------------------------------------------
+
+// NOTE: Due to a VC6 'feature' we can not export a std::list in a dll, 
+// so GDCM_EXPORT keyword was removed for this class only
+
 /**
- * \ingroup gdcmDirList
- * \brief   List containing the file headers from root directory. 
+ * \brief   List containing the file headers of all the gdcm readable files
+ *          found by exploring recursively a root directory. 
  */
-class GDCM_EXPORT gdcmDirList: public std::list<std::string>
+class GDCM_EXPORT DirList
 {
 public :
-   gdcmDirList(std::string dirName,bool recursive=false);
-   virtual ~gdcmDirList(void);
+   DirList(std::string const &dirName, bool recursive=false);
+   ~DirList();
 
-   std::string GetDirName(void);
+   void Print(std::ostream &os = std::cout);
 
-   /// Character '\' 
-   static const char SEPARATOR_X;
-   /// Character '/'  
-   static const char SEPARATOR_WIN;
-   /// depending on the O.S.
-   static const std::string SEPARATOR;
+   /// Return the name of the directory
+   std::string const &GetDirName() const { return DirName; }
+
+   /// Return the file names
+   DirListType const &GetFilenames() const { return Filenames; };
+
+   static bool IsDirectory(std::string const &dirName);
 
 private :
-   int Explore(std::string dirName,bool recursive=false);
+   int Explore(std::string const &dirName, bool recursive=false);
+
+   /// List of file names
+   DirListType Filenames;
    /// name of the root directory to explore
-   std::string name;
+   std::string DirName;
 };
-
+} // end namespace gdcm
 //-----------------------------------------------------------------------------
 #endif