Changeset 4492 in orxonox.OLD for orxonox/trunk/src/util

Timestamp:

Jun 3, 2005, 1:55:22 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: importer works again

Location:

orxonox/trunk/src/util/loading

Files:

• factory.cc (modified) (1 diff)
• factory.h (modified) (1 diff)
• load_param.cc (modified) (1 diff)
• load_param.h (modified) (1 diff)

orxonox/trunk/src/util/loading/factory.cc

@@ -94 +94 @@
 }
 
-/**
-   \param root: The XML-element to grab a parameter from
-   \param parameterName: the parameter to grab
-   \returns the Value of the parameter if found, NULL otherwise
-*/
-const char* grabParameter(const TiXmlElement* root, const char* parameterName)
-{
-  const TiXmlElement* element;
-  const TiXmlNode* node;
-        
-  if (root == NULL)
-    return NULL;
-  assert( parameterName != NULL);
-        
-  element = root->FirstChildElement( parameterName);
-  if( element == NULL) return NULL;
-        
-  node = element->FirstChild();
-  while( node != NULL)
-    {
-      if( node->ToText()) return node->Value();
-      node = node->NextSibling();
-    }
-  return NULL;
-}
-

orxonox/trunk/src/util/loading/factory.h

@@ -100 +100 @@
 }
 
-// helper function
-
-const char* grabParameter(const TiXmlElement* root, const char* parameterName);
-
 #endif /* _FACTORY_H */
 

orxonox/trunk/src/util/loading/load_param.cc

@@ -236 +236 @@
   PRINT(3)("===============================================================\n");
 }
+
+
+
+/**
+   \param root: The XML-element to grab a parameter from
+   \param parameterName: the parameter to grab
+   \returns the Value of the parameter if found, NULL otherwise
+*/
+const char* grabParameter(const TiXmlElement* root, const char* parameterName)
+{
+  const TiXmlElement* element;
+  const TiXmlNode* node;
+        
+  if (root == NULL)
+    return NULL;
+  assert( parameterName != NULL);
+        
+  element = root->FirstChildElement( parameterName);
+  if( element == NULL) return NULL;
+        
+  node = element->FirstChild();
+  while( node != NULL)
+    {
+      if( node->ToText()) return node->Value();
+      node = node->NextSibling();
+    }
+  return NULL;
+}

orxonox/trunk/src/util/loading/load_param.h

@@ -266 +266 @@
 };
 
+// helper function
+
+const char* grabParameter(const TiXmlElement* root, const char* parameterName);
 
 #endif /* _LOAD_PARAM_H */