Changeset 7219 in orxonox.OLD for branches/std/src/lib/coord

Timestamp:

Mar 12, 2006, 5:14:44 PM (18 years ago)

Author:

bensch

Message:

orxonox/std: less char*

Location:

branches/std/src/lib/coord

Files:

• p_node.cc (modified) (5 diffs)
• p_node.h (modified) (2 diffs)

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

@@ -680 +680 @@
  * @param bias the speed to iterate to this new Positions
  */
-void PNode::setParentSoft(const char* parentName, float bias)
+void PNode::setParentSoft(const std::string& parentName, float bias)
 {
   PNode* parentNode = dynamic_cast<PNode*>(ClassList::getObject(parentName, CL_PARENT_NODE));
@@ -701 +701 @@
 void PNode::setParentMode (const std::string& parentingMode)
 {
-  this->setParentMode(PNode::charToParentingMode(parentingMode));
+  this->setParentMode(PNode::stringToParentingMode(parentingMode));
 }
 
@@ -927 +927 @@
            this->getAbsDirV().y,
            this->getAbsDirV().z,
-           this->parentingModeToChar(parentMode),
+           this->parentingModeToString(parentMode),
            childNodeCount);
   if (depth >= 2 || depth == 0)
@@ -1049 +1049 @@
  * @return the converted string
  */
-const char* PNode::parentingModeToChar(int parentingMode)
+const char* PNode::parentingModeToString(int parentingMode)
 {
   if (parentingMode == PNODE_LOCAL_ROTATE)
@@ -1068 +1068 @@
  * @return the int corresponding to the named parentingMode
  */
-PARENT_MODE PNode::charToParentingMode(const std::string& parentingMode)
+PARENT_MODE PNode::stringToParentingMode(const std::string& parentingMode)
 {
   if (parentingMode == "local-rotate")

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

@@ -158 +158 @@
 
   void setParentSoft(PNode* parentNode, float bias = 1.0);
-  void setParentSoft(const char* parentName, float bias = 1.0);
+  void setParentSoft(const std::string& parentName, float bias = 1.0);
 
   // PARENTING_MODE AND OTHER FLAGS //
@@ -183 +183 @@
 
   // HELPER_FUNCTIONS //
-  static const char* parentingModeToChar(int parentingMode);
-  static PARENT_MODE charToParentingMode(const std::string& parentingMode);
+  static const char* parentingModeToString(int parentingMode);
+  static PARENT_MODE stringToParentingMode(const std::string& parentingMode);
   float distance(const PNode* node) const { return (this->getAbsCoor() - node->getAbsCoor()).len(); };