* src/gdcmSQItem[h|cxx] : rename some methods to have coherent names

[gdcm.git] / src / gdcmDicomDir.cxx

diff --git a/src/gdcmDicomDir.cxx b/src/gdcmDicomDir.cxx
index 9f05141bcf99c667e3405ce41cbc190659e9ffa4..4d2973c9d95b9d61bd2a1ee8f128401ff57f6168 100644 (file)
--- a/src/gdcmDicomDir.cxx
+++ b/src/gdcmDicomDir.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomDir.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/01/20 11:09:23 $
-  Version:   $Revision: 1.108 $
+  Date:      $Date: 2005/01/20 11:26:17 $
+  Version:   $Revision: 1.109 $
   
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -762,15 +762,16 @@ void DicomDir::CreateDicomDir()
 
    NewMeta();
 
-   ListSQItem listItems = s->GetSQItems();
+   //ListSQItem listItems = s->GetSQItems();
    
    DocEntry *d;
    std::string v;
    SQItem *si;
-   for( ListSQItem::iterator i = listItems.begin(); 
-                             i !=listItems.end(); ++i ) 
+
+   SQItem *tmpSI=s->GetFirstSQItem();
+   while(tmpSI)
    {
-      d = (*i)->GetDocEntry(0x0004, 0x1430); // Directory Record Type
+      d = tmpSI->GetDocEntry(0x0004, 0x1430); // Directory Record Type
       if ( ValEntry* valEntry = dynamic_cast<ValEntry *>(d) )
       {
          v = valEntry->GetValue();
@@ -829,7 +830,9 @@ void DicomDir::CreateDicomDir()
       }
 
       if( si )
-         MoveSQItem(si,*i);
+         MoveSQItem(si,tmpSI);
+
+      tmpSI=s->GetNextSQItem();
    }
    TagHT.clear();
 }