Changeset 3667 in orxonox.OLD

Timestamp:

Mar 30, 2005, 10:59:02 AM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: changed all old enumerations to iterations in ResourceManager. Bensch: sorry for interference, since i didn't change anything realy its no big deal.

File:

• orxonox/trunk/src/lib/util/resource_manager.cc (modified) (5 diffs)

orxonox/trunk/src/lib/util/resource_manager.cc

@@ -222 +222 @@
           else
             {
-              tmpDir = imageDirs->enumerate();
+              tIterator<char>* iterator = imageDirs->getIterator();
+              tmpDir = iterator->nextElement();
+              //tmpDir = imageDirs->enumerate();
               while(tmpDir)
                 {
@@ -230 +232 @@
                     tmpResource->pointer = new Texture(imgName);
                   delete []imgName;
-                  tmpDir = imageDirs->nextElement();
+                  tmpDir = iterator->nextElement();
                 }
+              delete iterator;
             }
           if(!tmpResource)
@@ -326 +329 @@
 
   tIterator<Resource>* iterator = resourceList->getIterator();
-  //Resource* enumRes = resourceList->enumerate();
   Resource* enumRes = iterator->nextElement();
   while (enumRes)
@@ -345 +347 @@
 Resource* ResourceManager::locateResourceByName(const char* fileName)
 {
-  Resource* enumRes = resourceList->enumerate();
+  //  Resource* enumRes = resourceList->enumerate();
+  tIterator<Resource>* iterator = resourceList->getIterator();
+  Resource* enumRes = iterator->nextElement();
   while (enumRes)
     {
       if (!strcmp(fileName, enumRes->name))
-        return enumRes;
-      enumRes = resourceList->nextElement();
-    }
+        {
+          delete iterator;
+          return enumRes;
+        }
+      enumRes = iterator->nextElement();
+    }
+  delete iterator;
   return NULL;
 }
@@ -362 +370 @@
 Resource* ResourceManager::locateResourceByPointer(const void* pointer)
 {
-  Resource* enumRes = resourceList->enumerate();
+  //  Resource* enumRes = resourceList->enumerate();
+  tIterator<Resource>* iterator = resourceList->getIterator();
+  Resource* enumRes = iterator->nextElement();
   while (enumRes)
     {
       if (pointer == enumRes->pointer)
-        return enumRes;
-      enumRes = resourceList->nextElement();
-    }
+        {
+          delete iterator;
+          return enumRes;
+        }
+      enumRes = iterator->nextElement();
+    }
+  delete iterator;
   return NULL;
 }