Changeset 7129 in orxonox.OLD for trunk/src

Timestamp:

Feb 13, 2006, 1:30:31 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: minor cleanup in PNode (removed unused lines)

File:

• trunk/src/lib/coord/p_node.cc (modified) (1 diff)

trunk/src/lib/coord/p_node.cc

@@ -82 +82 @@
   PRINTF(4)("delete %s::%s\n", this->getClassName(), this->getName());
   // remove the Node, delete it's children (if required).
-  std::list<PNode*>::iterator tmp = this->children.begin();
   std::list<PNode*>::iterator deleteNode;
   unsigned int size;
   while(!this->children.empty())
   {
-    tmp = this->children.begin();
-    //while (tmp != this->children.end())
+    deleteNode = this->children.begin();
+    size = this->children.size();
+    if ((this->parentMode & PNODE_PROHIBIT_CHILD_DELETE) ||
+        ((*deleteNode)->parentMode & PNODE_PROHIBIT_DELETE_WITH_PARENT))
     {
-      deleteNode = tmp;
-      tmp++;
-      size = this->children.size();
-      if ((this->parentMode & PNODE_PROHIBIT_CHILD_DELETE) ||
-          ((*deleteNode)->parentMode & PNODE_PROHIBIT_DELETE_WITH_PARENT))
+      if (this == PNode::nullParent && (*deleteNode)->parentMode & PNODE_REPARENT_TO_NULL)
       {
-        if (this == PNode::nullParent && (*deleteNode)->parentMode & PNODE_REPARENT_TO_NULL)
-        {
-          PRINTF(4)("%s::%s deletes %s::%s\n",
-                 this->getClassName(), this->getName(),
-                 (*deleteNode)->getClassName(), (*deleteNode)->getName());
-          delete (*deleteNode);
-        }
-        else
-        {
-          PRINTF(4)("%s::%s reparents %s::%s\n",
-                 this->getClassName(), this->getName(),
-                 (*deleteNode)->getClassName(), (*deleteNode)->getName());
-          (*deleteNode)->reparent();
-        }
+        PRINTF(4)("%s::%s deletes %s::%s\n",
+                  this->getClassName(), this->getName(),
+                  (*deleteNode)->getClassName(), (*deleteNode)->getName());
+        delete (*deleteNode);
       }
       else
       {
-        PRINTF(4)("%s::%s deletes PNode: %s::%s\n",
-               this->getClassName(), this->getName(),
-               (*deleteNode)->getClassName(), (*deleteNode)->getName());
-        delete (*deleteNode);
+        PRINTF(4)("%s::%s reparents %s::%s\n",
+                  this->getClassName(), this->getName(),
+                  (*deleteNode)->getClassName(), (*deleteNode)->getName());
+        (*deleteNode)->reparent();
       }
-      //if (size <= this->children.size()) break;
+    }
+    else
+    {
+      PRINTF(4)("%s::%s deletes PNode: %s::%s\n",
+                this->getClassName(), this->getName(),
+                (*deleteNode)->getClassName(), (*deleteNode)->getName());
+      delete (*deleteNode);
     }
   }