Changeset 7198 in orxonox.OLD for trunk/src/lib/shell

Timestamp:

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

Author:

bensch

Message:

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

Location:

trunk/src/lib/shell

Files:

• shell.cc (modified) (1 diff)
• shell_command.cc (modified) (1 diff)
• shell_command.h (modified) (1 diff)

trunk/src/lib/shell/shell.cc

@@ -43 +43 @@
 SHELL_COMMAND(textsize, Shell, setTextSize)
     ->describe("Sets the size of the Text size, linespacing")
-    ->defaultValues(1, 15, 0);
+    ->defaultValues(15, 0);
 SHELL_COMMAND(textcolor, Shell, setTextColor)
     ->describe("Sets the Color of the Shells Text (red, green, blue, alpha)")
-    ->defaultValues(4, SHELL_DEFAULT_TEXT_COLOR);
+    ->defaultValues(SHELL_DEFAULT_TEXT_COLOR);
 SHELL_COMMAND(backgroundcolor, Shell, setBackgroundColor)
     ->describe("Sets the Color of the Shells Background (red, green, blue, alpha)")
-    ->defaultValues(4, SHELL_DEFAULT_BACKGROUND_COLOR);
+    ->defaultValues(SHELL_DEFAULT_BACKGROUND_COLOR);
 SHELL_COMMAND(backgroundimage, Shell, setBackgroundImage)
     ->describe("sets the background image to load for the Shell");
 SHELL_COMMAND(font, Shell, setFont)
     ->describe("Sets the font of the Shell")
-    ->defaultValues(1, SHELL_DEFAULT_FONT);
+    ->defaultValues(SHELL_DEFAULT_FONT);
 
 /**

trunk/src/lib/shell/shell_command.cc

@@ -292 +292 @@
 
 /**
- * sets default Values of the Commands
- * @param count how many default Values to set.
- * @param ... the default Values in order. They will be cast to the right type
- * @returns itself
- *
- * Be aware, that when you use this Function, you !!MUST!! match the input as
- * count, [EXACTLY THE SAME AS IF YOU WOULD CALL THE FUNCTION UP TO count ARGUMENTS]
- */
-ShellCommand* ShellCommand::defaultValues(unsigned int count, ...)
+ * @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
+ */
+ShellCommand* ShellCommand::defaultValues(const MultiType& value0, const MultiType& value1,
+                                          const MultiType& value2, const MultiType& value3,
+                                          const MultiType& value4)
 {
   if (this == NULL)
     return NULL;
 
-  va_list values;
-  va_start(values, count);
-
-  this->executor->defaultValues(count, values);
+  this->executor->defaultValues(value0, value1, value2, value3, value4);
 
   return this;

trunk/src/lib/shell/shell_command.h

@@ -65 +65 @@
     ShellCommand* describe(const char* description);
     ShellCommand* setAlias(const char* alias);
-    ShellCommand* defaultValues(unsigned int count, ...);
+    ShellCommand* defaultValues(const MultiType& value0 = MT_NULL, const MultiType& value1 = MT_NULL,
+                                const MultiType& value2 = MT_NULL, const MultiType& value3 = MT_NULL,
+                                const MultiType& value4 = MT_NULL);
 
     static ShellCommand* registerCommand(const char* commandName, const char* className, const Executor& executor);