Changeset 7221 in orxonox.OLD for trunk/src/lib/coord/p_node.h

Timestamp:

Mar 15, 2006, 3:10:45 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the std-branche back, it runs on windows and Linux

svn merge ​https://svn.orxonox.net/orxonox/branches/std . -r7202:HEAD

File:

• trunk/src/lib/coord/p_node.h (modified) (4 diffs)

trunk/src/lib/coord/p_node.h

@@ -143 +143 @@
   // PARENTING //
   void addChild (PNode* child);
-  void addChild (const char* childName);
+  void addChild (const std::string& childName);
   void removeChild (PNode* child);
   void removeNode();
@@ -151 +151 @@
   /** @param parent the new parent of this node */
   inline void setParent (PNode* parent) { parent->addChild(this); };
-  void setParent (const char* parentName);
+  void setParent (const std::string& parentName);
   /** @returns the parent of this PNode */
   inline PNode* getParent () const { return this->parent; };
@@ -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 //
   void setParentMode (PARENT_MODE parentMode);
-  void setParentMode (const char* parentingMode);
+  void setParentMode (const std::string& parentingMode);
   /** @returns the Parenting mode of this node */
   int getParentMode() const { return 0x000f & this->parentMode; };
@@ -183 +183 @@
 
   // HELPER_FUNCTIONS //
-  static const char* parentingModeToChar(int parentingMode);
-  static PARENT_MODE charToParentingMode(const char* 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(); };