Changeset 7130 in orxonox.OLD for trunk/src/lib

Timestamp:

Feb 13, 2006, 2:59:17 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: removed some std::list

Location:

trunk/src/lib

Files:

• gui/gl_gui/glgui_box.cc (modified) (7 diffs)
• gui/gl_gui/glgui_box.h (modified) (2 diffs)
• particles/engine/particle_engine.cc (modified) (1 diff)
• particles/engine/particle_engine.h (modified) (2 diffs)
• physics/physics_engine.cc (modified) (1 diff)
• physics/physics_interface.cc (modified) (1 diff)

trunk/src/lib/gui/gl_gui/glgui_box.cc

@@ -18 +18 @@
 #include "glgui_box.h"
 
-#include "list.h"
-
 using namespace std;
 
@@ -38 +36 @@
 GLGuiBox::~GLGuiBox()
 {
-  delete this->children;
 }
 
@@ -47 +44 @@
 {
   this->setClassID(CL_GLGUI_BOX, "GLGuiBox");
-  this->children = new tList<GLGuiWidget>;
 }
 
@@ -55 +51 @@
     return;
 
-  this->children->add(widget);
+  this->children.push_back(widget);
 }
 
@@ -63 +59 @@
   if (widget == NULL)
   {
-    delete this->children;
-    this->children = new tList<GLGuiWidget>;
+    this->children.clear();
   }
   else
   {
-    this->children->remove(widget);
+    this->children.remove(widget);
   }
 }
@@ -74 +69 @@
 void GLGuiBox::showAll()
 {
-  tIterator<GLGuiWidget>* itC = this->children->getIterator();
-  GLGuiWidget* enumC = itC->firstElement();
-  while (enumC != NULL)
+  std::list<GLGuiWidget*>::iterator itC = this->children.begin();
+  while (itC != this->children.end())
   {
-    if (enumC->isA(CL_GLGUI_CONTAINER))
-      static_cast<GLGuiContainer*>(enumC)->showAll();
+    if ((*itC)->isA(CL_GLGUI_CONTAINER))
+      static_cast<GLGuiContainer*>(*itC)->showAll();
     else
-      enumC->show();
-    enumC = itC->nextElement();
+      (*itC)->show();
+    itC++;
   }
-  delete itC;
 
   this->show();
@@ -92 +85 @@
 void GLGuiBox::hideAll()
 {
-  tIterator<GLGuiWidget>* itC = this->children->getIterator();
-  GLGuiWidget* enumC = itC->firstElement();
-  while (enumC != NULL)
+  std::list<GLGuiWidget*>::iterator itC = this->children.begin();
+  while (itC != this->children.end())
   {
-    if (enumC->isA(CL_GLGUI_CONTAINER))
-      static_cast<GLGuiContainer*>(enumC)->showAll();
+    if ((*itC)->isA(CL_GLGUI_CONTAINER))
+      static_cast<GLGuiContainer*>(*itC)->hideAll();
     else
-      enumC->hide();
-    enumC = itC->nextElement();
+      (*itC)->hide();
+    itC++;
   }
-  delete itC;
 
   this->hide();

trunk/src/lib/gui/gl_gui/glgui_box.h

@@ -11 +11 @@
 
 // FORWARD DECLARATION
-template<class T> class tList;
 
 typedef enum
@@ -41 +40 @@
  private:
    GLGuiBoxType             type;
-   tList<GLGuiWidget>*      children;
-
+   std::list<GLGuiWidget*>  children;
 };
 

trunk/src/lib/particles/engine/particle_engine.cc

@@ -20 +20 @@
 #include "class_list.h"
 
-#include "list.h"
 #include "debug.h"
 #include "stdlibincl.h"

trunk/src/lib/particles/engine/particle_engine.h

@@ -11 +11 @@
 #include "particle_system.h"
 #include "particle_emitter.h"
+#include <list>
 
 #include "parser/tinyxml/tinyxml.h"
 
 // FORWARD DECLARATION
-template<class T> class tList;
 
 //! A ParticleConnection enables us to emitt from any emitter into any other particleSystem
@@ -64 +64 @@
   static ParticleEngine* singletonRef;        //!< The reference to the engine.
 
-  tList<ParticleSystem>* systemList;          //!< A list of Systems handled by the ParticleEngine.
-  tList<ParticleEmitter>* emitterList;        //!< A list of Emitters handled by the ParticleEngine.
+  std::list<ParticleSystem> systemList;          //!< A list of Systems handled by the ParticleEngine.
+  std::list<ParticleEmitter> emitterList;        //!< A list of Emitters handled by the ParticleEngine.
 
   tList<ParticleConnection>* connectionList;  //!< A list of Connections between Systems and Emitters.

trunk/src/lib/physics/physics_engine.cc

@@ -19 +19 @@
 
 #include "class_list.h"
-#include "list.h"
 #include "parser/tinyxml/tinyxml.h"
 #include "factory.h"

trunk/src/lib/physics/physics_interface.cc

@@ -26 +26 @@
 #include "p_node.h"
 
-#include "list.h"
 #include "string.h"
 #include "stdincl.h"