ENH: Mostly cosmetic, but in theory this should be faster

[gdcm.git] / src / gdcmDirList.cxx

diff --git a/src/gdcmDirList.cxx b/src/gdcmDirList.cxx
index c04df60f64d1d895d7d37a790051d010d241f90b..938dbb3fb948af4b9e65da419ad48bc8110a64c9 100644 (file)
--- a/src/gdcmDirList.cxx
+++ b/src/gdcmDirList.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDirList.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/10/12 04:35:45 $
-  Version:   $Revision: 1.23 $
+  Date:      $Date: 2004/11/16 10:25:53 $
+  Version:   $Revision: 1.27 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -22,9 +22,9 @@
 #include <iostream>
 #include <algorithm>
 
-#if defined(_MSC_VER) || defined (__CYGWIN__)
+#if defined(_MSC_VER) || defined (__CYGWIN__) || defined(__BORLANDC__)
    #include <windows.h> 
-#ifdef _MSC_VER
+#if defined _MSC_VER || defined(__BORLANDC__)
    #include <direct.h>
 #endif //_MSC_VER
 #else
@@ -33,9 +33,9 @@
    #include <sys/stat.h>
    #include <sys/types.h>
 #endif
+
 namespace gdcm 
 {
-
 // Constructor / Destructor
 /**
  * \ingroup DirList
@@ -43,7 +43,7 @@ namespace gdcm
  * @param  dirName root directory name
  * @param  recursive whether we want to explore recursively or not 
  */
-DirList::DirList(std::string dirName, bool recursive)
+DirList::DirList(std::string const & dirName, bool recursive)
 {
    name = dirName;
    Util::NormalizePath(name);
@@ -68,7 +68,7 @@ DirList::~DirList()
  * \brief   Get the directory name
  * @return the directory name 
  */
-std::string DirList::GetDirName()
+std::string const & DirList::GetDirName() const
 {
    return name;
 }
@@ -80,18 +80,17 @@ std::string DirList::GetDirName()
 // Private
 
 /**
- * \ingroup DirList
  * \brief   Explore a directory with possibility of recursion
  *          return number of files read
- * @param  dirName directory to explore
+ * @param  dirpath   directory to explore
  * @param  recursive whether we want recursion or not
  */
-int DirList::Explore(std::string dirName, bool recursive)
+int DirList::Explore(std::string const & dirpath, bool recursive)
 {
    int numberOfFiles = 0;
    std::string fileName;
-   Util::NormalizePath(dirName);
-#if defined(_MSC_VER) || (__CYGWIN__)
+   std::string dirName = Util::NormalizePath(dirpath);
+#if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__BORLANDC__)
    WIN32_FIND_DATA fileData; 
    HANDLE hFile=FindFirstFile((dirName+"*").c_str(),&fileData);
    int found = true;