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

Timestamp:

Nov 22, 2005, 3:31:30 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: newer data-revision

Location:

trunk/src/util/loading

Files:

• load_param.cc (modified) (4 diffs)
• load_param.h (modified) (1 diff)
• load_param_description.h (modified) (1 diff)

trunk/src/util/loading/load_param.cc

@@ -82 +82 @@
  * @param ... the default values !! must be at least count parameters!!
  */
-CLoadParam* CLoadParam::defaultValues(unsigned int count, ...)
-{
-  if (this == NULL)
-    return NULL;
-
+CLoadParam& CLoadParam::defaultValues(unsigned int count, ...)
+{
   va_list values;
   va_start(values, count);
@@ -93 +90 @@
   this->executor->defaultValues(count, values);
 
-  return this;
+  return *this;
 }
 
@@ -102 +99 @@
  * @returns a pointer to itself.
 */
-CLoadParam* CLoadParam::describe(const char* descriptionText)
+CLoadParam& CLoadParam::describe(const char* descriptionText)
 {
   if (LoadClassDescription::parametersDescription && this->paramDesc && !this->paramDesc->getDescription())
@@ -108 +105 @@
       this->paramDesc->setDescription(descriptionText);
     }
-  return this;
+  return *this;
 }
 

trunk/src/util/loading/load_param.h

@@ -91 +91 @@
     ~CLoadParam();
 
-    CLoadParam* describe(const char* descriptionText);
-    CLoadParam* defaultValues(unsigned int count, ...);
+    CLoadParam& describe(const char* descriptionText);
+    CLoadParam& defaultValues(unsigned int count, ...);
+    CLoadParam& attribute(const char* attributeName, const Executor& executor);
 
 

trunk/src/util/loading/load_param_description.h

@@ -45 +45 @@
 
   void print() const;
+
  private:
   char*         paramName;             //!< The name of the parameter.