Changeset 7331 in orxonox.OLD for trunk/src/lib/util/executor/executor.h

Timestamp:

Apr 18, 2006, 4:48:37 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: small improved functoid

File:

• trunk/src/lib/util/executor/executor.h (modified) (6 diffs)

trunk/src/lib/util/executor/executor.h

@@ -34 +34 @@
  *  Default Values
  *  Functions with up to 5 parameters (more seems useless)
- *  Functions with many types (see functor_list.h)
+ *  Functions with many types (@see functor_list.h)
  */
 class Executor: public BaseObject
@@ -43 +43 @@
     virtual Executor* clone () const = 0;
 
+    // SETTING up the EXECUTOR
     Executor* 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);
 
+    // EXECUTE
     /** executes a Command @param object the object to apply this to @param parameters the parameters the command takes */
-    virtual void execute (BaseObject* object, const std::string& parameters = "") = 0;
-
+    virtual void operator()(BaseObject* object, const std::string& parameters = "") = 0;
+    /** executes a Command @param object the object to apply this to @param parameters the parameters the command takes @brief here for your convenience*/
+    void execute (BaseObject* object, const std::string& parameters = "") { (*this)(object, parameters); };
+
+    // RETRIEVE INFORMATION
     /** @returns the Type of this Function (either static or objective) */
     inline long getType() const { return this->functorType; };
@@ -65 +70 @@
 
   protected:
-    long                        functorType;      //!< The type of Function we've got (either static or objective).
+    short                       functorType;      //!< The type of Function we've got (either static or objective).
     unsigned int                paramCount;       //!< the count of parameters.
     MultiType                   defaultValue[5];  //!< Default Values.
@@ -72 +77 @@
 ///////////////////////////////////////////////////
 ///////////////////////////////////////////////////
-
-/////////////////////////////////
-// MACRO DEFINITION EXTENSIONS //
-/////////////////////////////////
-//! where to chek for default BOOL values
-#define   l_BOOL_DEFGRAB(i)         this->defaultValue[i].getBool()
-//! where to chek for default INT values
-#define   l_INT_DEFGRAB(i)          this->defaultValue[i].getInt()
-//! where to chek for default UINT values
-#define   l_UINT_DEFGRAB(i)         (unsigned int)this->defaultValue[i].getInt()
-//! where to chek for default LONG values
-#define   l_LONG_DEFGRAB(i)         (long)this->defaultValue[i].getInt()
-//! where to chek for default FLOAT values
-#define   l_FLOAT_DEFGRAB(i)        this->defaultValue[i].getFloat()
-//! where to chek for default STRING values
-#define   l_STRING_DEFGRAB(i)       this->defaultValue[i].getString()
-//! where to chek for default CSTRING values
-#define   l_CSTRING_DEFGRAB(i)      this->defaultValue[i].getCString()
 
 //////////////////////////
@@ -267 +254 @@
     } fp;
 
-    virtual void execute (BaseObject* object, const std::string& parameters = "")
+    virtual void operator()(BaseObject* object, const std::string& parameters = "")
     {
       SubString sub;
@@ -330 +317 @@
 
 
-    virtual void execute (BaseObject* object, const std::string& parameters = "")
+    virtual void operator()(BaseObject* object, const std::string& parameters = "")
     {
       SubString sub;