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

Timestamp:

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

Author:

bensch

Message:

orxonox/std: less char*

Location:

branches/std/src/lib/graphics/render2D

Files:

• element_2d.cc (modified) (4 diffs)
• element_2d.h (modified) (1 diff)

branches/std/src/lib/graphics/render2D/element_2d.cc

@@ -726 +726 @@
 void Element2D::setParentMode2D (const std::string& parentingMode)
 {
-  this->setParentMode2D(Element2D::charToParentingMode2D(parentingMode));
+  this->setParentMode2D(Element2D::stringToParentingMode2D(parentingMode));
 }
 
@@ -952 +952 @@
             this->relCoordinate.y,
             this->getAbsDir2D(),
-            Element2D::parentingModeToChar2D(parentMode),
+            Element2D::parentingModeToString2D(parentMode),
             Element2D::layer2DToChar(this->layer));
 
@@ -1074 +1074 @@
  * @return the converted string
  */
-const char* Element2D::parentingModeToChar2D(int parentingMode)
+const char* Element2D::parentingModeToString2D(int parentingMode)
 {
   if (parentingMode == E2D_PARENT_LOCAL_ROTATE)
@@ -1093 +1093 @@
  * @return the int corresponding to the named parentingMode
  */
-E2D_PARENT_MODE Element2D::charToParentingMode2D(const std::string& parentingMode)
+E2D_PARENT_MODE Element2D::stringToParentingMode2D(const std::string& parentingMode)
 {
   if (parentingMode == "local-rotate")

branches/std/src/lib/graphics/render2D/element_2d.h

@@ -212 +212 @@
 
     // helper functions //
-    static const char* parentingModeToChar2D(int parentingMode);
-    static E2D_PARENT_MODE charToParentingMode2D(const std::string& parentingMode);
+    static const char* parentingModeToString2D(int parentingMode);
+    static E2D_PARENT_MODE stringToParentingMode2D(const std::string& parentingMode);
 
     static const char* layer2DToChar(E2D_LAYER layer);