Changeset 5141 in orxonox.OLD for trunk/src/util/loading

Timestamp:

Aug 26, 2005, 4:04:53 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: moved helper-functions to helper-functions.cc

Location:

trunk/src/util/loading

Files:

• load_param.cc (modified) (1 diff)
• load_param.h (modified) (2 diffs)

trunk/src/util/loading/load_param.cc

@@ -112 +112 @@
   }
 }
-
-/**
- * checks if the input was a Bool
- * @param BOOL a String that holds a bool: must be one of those: 1,0,true,false,TRUE,FALSE
- * @param defaultValue a default value that is set, if BOOL is corrupt
- * @return returns the bool, if BOOL was correct otherwise defaultValue
- */
-bool isBool(const char* BOOL, bool defaultValue)
-{
-  if(!strcmp(BOOL, "1") || !strcmp( BOOL,"true") || !strcmp(BOOL,"TRUE"))
-    return true;
-  else if (!strcmp(BOOL, "0") || !strcmp( BOOL,"false") || !strcmp(BOOL,"FALSE"))
-    return false;
-  else
-    return defaultValue;
-
-}
-
-int isInt(const char* INT, int defaultValue)
-{
-  char* endPtr = NULL;
-  int result = strtol(INT, &endPtr, 10);
-
-  if ( endPtr >= INT && endPtr < INT + strlen(INT))
-    return defaultValue;
-  else
-    return result;
-}
-
-float isFloat(const char* FLOAT, float defaultValue)
-{
-  char* endPtr = NULL;
-  double result = strtod(FLOAT, &endPtr);
-
-  if ( endPtr >= FLOAT && endPtr < FLOAT + strlen(FLOAT))
-    return defaultValue;
-  else
-    return result;
-}
-
-const Vector& isVector(const char* VECTOR, const Vector& defaultValue)
-{
-
-
-}
-
-const char* isString(const char* STRING, const char* defaultValue)
-{
-  if (STRING != NULL)
-    return STRING;
-  else
-    return defaultValue;
-}
-
 
 /**

trunk/src/util/loading/load_param.h

@@ -28 +28 @@
 #include "substring.h"
 #include "tinyxml.h"
+#include "helper_functions.h"
 
 // Forward Declaration //
@@ -216 +217 @@
         PRINTF(4)("Not loaded parameter %s of %s\n", paramName, pt2Object->getClassName()); \
 }
-
-
-/***********************
-*** HELPER FUNCTIONS ***
-***********************/
-bool          isBool(const char* BOOL, bool defaultValue);
-int           isInt(const char* INT, int defaultValue);
-float         isFloat(const char* FLOAT, float defaultValue);
-//const Vector& isVector(const char* VECTOR, const Vector& defaultValue);
-const char*   isString(const char* STRING, const char* defaultValue);
-
-//TiXmlEmlemnt* isXmlElem(const)
-
 
 /************************