Changeset 5779 in orxonox.OLD for trunk/src/lib/graphics

Timestamp:

Nov 26, 2005, 2:20:58 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: ClassList is now in std::list style
ShellCommand is now in std::list style

File:

• trunk/src/lib/graphics/text_engine/text_engine.cc (modified) (3 diffs)

trunk/src/lib/graphics/text_engine/text_engine.cc

@@ -64 +64 @@
 {
   // first remove all the remaining Texts (if any).
-  tList<BaseObject>* textList = ClassList::getList(CL_TEXT);
+  std::list<BaseObject*>* textList = ClassList::getList(CL_TEXT);
   if (textList != NULL)
   {
-    tIterator<BaseObject>* textIterator = textList->getIterator();
-    Text* text = dynamic_cast<Text*>(textIterator->firstElement());
-    while( text != NULL)
+    while(textList->size() > 0)
     {
-      delete text;
-      text = dynamic_cast<Text*>(textIterator->nextElement());
+      delete dynamic_cast<Text*>(textList->front());
     }
-    delete textIterator;
   }
   // delete all remaining fonts (There should not be Anything to do here)
-  tList<BaseObject>* fontList = ClassList::getList(CL_FONT);
+  std::list<BaseObject*>* fontList = ClassList::getList(CL_FONT);
   if (fontList != NULL)
   {
-    tIterator<BaseObject>* fontIterator = fontList->getIterator();
-    Font* font = dynamic_cast<Font*>(fontIterator->firstElement());
-    while( font != NULL)
+//    while (fontList->size() > 0)
     {
+      Font* font = dynamic_cast<Font*>(fontList->front());
       if (likely(font != Font::getDefaultFont()))
         ResourceManager::getInstance()->unload(font, RP_GAME);
-      font = dynamic_cast<Font*>(fontIterator->nextElement());
     }
-    delete fontIterator;
   }
-
   this->disableFonts();
 
@@ -133 +125 @@
 void TextEngine::debug() const
 {
-  tList<BaseObject>* textList = ClassList::getList(CL_TEXT);
+  list<BaseObject*>* textList = ClassList::getList(CL_TEXT);
   if (textList != NULL)
   {
@@ -139 +131 @@
     PRINT(0)("+ TEXT ENGINE DEBUG INFORMATION +\n");
     PRINT(0)("+-------------------------------+\n");
-    PRINT(0)("Reference: %p; Text Counts: %d\n", this, textList->getSize());
+    PRINT(0)("Reference: %p; Text Counts: %d\n", this, textList->size());
 
-    tIterator<BaseObject>* textIterator = textList->getIterator();
-    Text* text = dynamic_cast<Text*>(textIterator->firstElement());
-    while( text != NULL)
-      {
-        text->debug();
-        text = dynamic_cast<Text*>(textIterator->nextElement());
-      }
-    delete textIterator;
+    list<BaseObject*>::iterator text;
+    for ( text = textList->begin(); text != textList->end(); text++)
+      dynamic_cast<Text*>(*text)->debug();
     PRINT(0)("+---------------------------TE--+\n");
   }