Changeset 7198 in orxonox.OLD for trunk/src/lib/util/loading/load_param.cc

Timestamp:

Mar 8, 2006, 2:30:19 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: new Default Values… they now too are in MultiType instead of (count, …) or (count, va_arg) style

File:

• trunk/src/lib/util/loading/load_param.cc (modified) (4 diffs)

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

@@ -63 +63 @@
     if (likely(this->object != NULL) &&
         ( this->loadString != NULL ||
-         ((this->executor->getType() & Executor_NoLoadString) == Executor_NoLoadString)))
+          ((this->executor->getType() & Executor_NoLoadString) == Executor_NoLoadString)))
     {
       PRINTF(4)("Loading '%s' with Parameters '%s' onto: '%s'(%s)\n", this->paramName, this->loadString, this->object->getName(), this->object->getClassName());
@@ -73 +73 @@
 
 /**
- * set the default values of the executor
- * @param count how many default values to set.
- * @param ... the default values !! must be at least count parameters!!
- */
-CLoadParam& CLoadParam::defaultValues(unsigned int count, ...)
-{
-  va_list values;
-  va_start(values, count);
-
-  assert(executor != NULL);
-  this->executor->defaultValues(count, values);
+ * @brief set the default values of the executor
+ * @param value0 the first default value
+ * @param value1 the second default value
+ * @param value2 the third default value
+ * @param value3 the fourth default value
+ * @param value4 the fifth default value
+ */
+CLoadParam& CLoadParam::defaultValues(const MultiType& value0, const MultiType& value1,
+                                      const MultiType& value2, const MultiType& value3,
+                                      const MultiType& value4)
+{
+  assert(this->executor != NULL);
+  this->executor->defaultValues(value0, value1, value2, value3, value4);
 
   return *this;
@@ -97 +99 @@
 {
   if (LoadClassDescription::parametersDescription && this->paramDesc && !this->paramDesc->getDescription())
-    {
-      this->paramDesc->setDescription(descriptionText);
-    }
+  {
+    this->paramDesc->setDescription(descriptionText);
+  }
   return *this;
 }
@@ -239 +241 @@
   node = element->FirstChild();
   while( node != NULL)
-    {
-      if( node->ToText()) return node->Value();
-      node = node->NextSibling();
-    }
+  {
+    if( node->ToText()) return node->Value();
+    node = node->NextSibling();
+  }
   return NULL;
 }