ENH: Finally fix setup.py.in. both binary and install mode are working again

[gdcm.git] / src / gdcmDirList.cxx

diff --git a/src/gdcmDirList.cxx b/src/gdcmDirList.cxx
index 71c09f24a242d0f742ded301c2180a0ede5351e2..d3a8b46405b832b5afaaf45ec4414a5fd0ddbc7e 100644 (file)
--- a/src/gdcmDirList.cxx
+++ b/src/gdcmDirList.cxx
@@ -3,12 +3,12 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDirList.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/07/26 19:36:56 $
-  Version:   $Revision: 1.18 $
+  Date:      $Date: 2004/10/10 00:42:54 $
+  Version:   $Revision: 1.22 $
                                                                                 
   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
@@ -44,7 +44,7 @@
 gdcmDirList::gdcmDirList(std::string dirName, bool recursive)
 {
    name = dirName;
-   NormalizePath(name);
+   gdcmUtil::NormalizePath(name);
    Explore(name, recursive);
 }
 
@@ -88,7 +88,7 @@ int gdcmDirList::Explore(std::string dirName, bool recursive)
 {
    int numberOfFiles = 0;
    std::string fileName;
-   NormalizePath(dirName);
+   gdcmUtil::NormalizePath(dirName);
 #if defined(_MSC_VER) || (__CYGWIN__)
    WIN32_FIND_DATA fileData; 
    HANDLE hFile=FindFirstFile((dirName+"*").c_str(),&fileData);
@@ -107,7 +107,7 @@ int gdcmDirList::Explore(std::string dirName, bool recursive)
       }
       else
       {
-         this->push_back(dirName+fileName);
+         push_back(dirName+fileName);
          numberOfFiles++;
       }
 
@@ -135,9 +135,9 @@ int gdcmDirList::Explore(std::string dirName, bool recursive)
    {
       fileName = dirName + d->d_name;
       stat(fileName.c_str(), &buf); //really discard output ?
-      if( S_ISREG(buf.st_mode) ) //is it a regular file?
+      if( S_ISREG(buf.st_mode) )    //is it a regular file?
       {
-         this->push_back( fileName );
+         push_back( fileName );
          numberOfFiles++;
       }
       else if( S_ISDIR(buf.st_mode) ) //directory?