Changeset 7216 in orxonox.OLD for branches/std/src/lib/coord/p_node.cc

Timestamp:

Mar 12, 2006, 8:54:30 AM (18 years ago)

Author:

bensch

Message:

orxonox/std:: compile and run again, with many more std::strings….

File:

• branches/std/src/lib/coord/p_node.cc (modified) (5 diffs)

branches/std/src/lib/coord/p_node.cc

@@ -540 +540 @@
  * @param childName the name of the child to add to this PNode
  */
-void PNode::addChild (const char* childName)
+void PNode::addChild (const std::string& childName)
 {
   PNode* childNode = dynamic_cast<PNode*>(ClassList::getObject(childName, CL_PARENT_NODE));
@@ -624 +624 @@
  * @param parentName the name of the Parent to set to this PNode
  */
-void PNode::setParent (const char* parentName)
+void PNode::setParent (const std::string& parentName)
 {
   PNode* parentNode = dynamic_cast<PNode*>(ClassList::getObject(parentName, CL_PARENT_NODE));
@@ -631 +631 @@
   else
     PRINTF(2)("Not Found PNode's (%s::%s) new Parent by Name: %s\n",
-              this->getClassName(), this->getName(), parentName);
+        this->getClassName(), this->getName(), parentName.c_str());
 }
 
@@ -699 +699 @@
  * @param parentMode a String representing this parentingMode
  */
-void PNode::setParentMode (const char* parentingMode)
+void PNode::setParentMode (const std::string& parentingMode)
 {
   this->setParentMode(PNode::charToParentingMode(parentingMode));
@@ -1068 +1068 @@
  * @return the int corresponding to the named parentingMode
  */
-PARENT_MODE PNode::charToParentingMode(const char* parentingMode)
-{
-  if (!strcmp(parentingMode, "local-rotate"))
+PARENT_MODE PNode::charToParentingMode(const std::string& parentingMode)
+{
+  if (parentingMode == "local-rotate")
     return (PNODE_LOCAL_ROTATE);
-  else  if (!strcmp(parentingMode, "rotate-movement"))
+  else  if (parentingMode == "rotate-movement")
     return (PNODE_ROTATE_MOVEMENT);
-  else  if (!strcmp(parentingMode, "movement"))
+  else  if (parentingMode == "movement")
     return (PNODE_MOVEMENT);
-  else  if (!strcmp(parentingMode, "all"))
+  else  if (parentingMode == "all")
     return (PNODE_ALL);
-  else  if (!strcmp(parentingMode, "rotate-and-move"))
+  else  if (parentingMode == "rotate-and-move")
     return (PNODE_ROTATE_AND_MOVE);
 }