Changeset 5636 in orxonox.OLD for trunk/src/lib/util

Timestamp:

Nov 18, 2005, 6:55:18 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: adapting ShellCommand to use Executor.
On the go

Location:

trunk/src/lib/util/executor

Files:

• executor.cc (modified) (1 diff)
• executor.h (modified) (9 diffs)

trunk/src/lib/util/executor/executor.cc

@@ -38 +38 @@
  * @param paramCount the count of parameters this command takes
  */
-Executor::Executor(const char* commandName, const char* className, unsigned int paramCount, ...)
+Executor::Executor(unsigned int paramCount, ...)
 {
   this->setClassID(CL_EXECUTOR, "Executor");
-  this->setName(commandName);
 
-//  this->classID = classID;
-  // handling parameters, and storing them:
   if (paramCount > FUNCTOR_MAX_ARGUMENTS)
     paramCount = FUNCTOR_MAX_ARGUMENTS;

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

@@ -41 +41 @@
 
   protected:
-    Executor(const char* commandName, const char* className, unsigned int paramCount, ...);
+    Executor(unsigned int paramCount, ...);
     ~Executor();
 
@@ -77 +77 @@
 // COMMAND REGISTRATION //
 //////////////////////////
-// EXECUTOR can be redefined as Executor or ExecutorStatic
-// EXECUTOREXECUTER can be redefined too.
+// EXECUTOR             can be redefined as Executor or ExecutorStatic
+// EXECUTOREXECUTER     can be redefined too.
 // EXECUTORINCLASS
 // EXECUTORTYPE
+
 
 ///////////////////////
@@ -111 +112 @@
 //! creates a command that takes no parameters
 #define ExecutorConstructor0() \
-  EXECUTOR(const char* commandName, const char* className, void EXECUTORINCLASS(*function)()) \
-  : Executor(commandName, className, 0) \
+  EXECUTOR(void EXECUTORINCLASS(*function)()) \
+  : Executor(0) \
   { \
     this->functorType = EXECUTORTYPE; \
@@ -120 +121 @@
 //! creates a command that takes one parameter
 #define ExecutorConstructor1(t1) \
-  EXECUTOR(const char* commandName, const char* className, void EXECUTORINCLASS(*function)(t1##_TYPE)) \
-  : Executor(commandName, className, 1, t1##_PARAM) \
+  EXECUTOR(void EXECUTORINCLASS(*function)(t1##_TYPE)) \
+  : Executor(1, t1##_PARAM) \
   { \
     this->functorType = EXECUTORTYPE; \
@@ -129 +130 @@
 //! creates a command that takes two parameters
 #define ExecutorConstructor2(t1,t2) \
-  EXECUTOR(const char* commandName, const char* className, void EXECUTORINCLASS(*function)(t1##_TYPE, t2##_TYPE)) \
-  : Executor(commandName, className, 2, t1##_PARAM, t2##_PARAM) \
+  EXECUTOR(void EXECUTORINCLASS(*function)(t1##_TYPE, t2##_TYPE)) \
+  : Executor(2, t1##_PARAM, t2##_PARAM) \
   { \
     this->functorType = EXECUTORTYPE; \
@@ -138 +139 @@
 //! creates a command that takes three parameter
 #define ExecutorConstructor3(t1,t2,t3) \
-  EXECUTOR(const char* commandName, const char* className, void EXECUTORINCLASS(*function)(t1##_TYPE, t2##_TYPE, t3##_TYPE)) \
-  : Executor(commandName, className, 3, t1##_PARAM, t2##_PARAM, t3##_PARAM) \
+  EXECUTOR(void EXECUTORINCLASS(*function)(t1##_TYPE, t2##_TYPE, t3##_TYPE)) \
+  : Executor(3, t1##_PARAM, t2##_PARAM, t3##_PARAM) \
   { \
     this->functorType = EXECUTORTYPE; \
@@ -147 +148 @@
 //! creates a command that takes four parameter
 #define ExecutorConstructor4(t1,t2,t3,t4) \
-  EXECUTOR(const char* commandName, const char* className, void EXECUTORINCLASS(*function)(t1##_TYPE, t2##_TYPE, t3##_TYPE, t4##_TYPE)) \
-  : Executor(commandName, className, 4, t1##_PARAM, t2##_PARAM, t3##_PARAM, t4##_PARAM) \
+  EXECUTOR(void EXECUTORINCLASS(*function)(t1##_TYPE, t2##_TYPE, t3##_TYPE, t4##_TYPE)) \
+  : Executor(4, t1##_PARAM, t2##_PARAM, t3##_PARAM, t4##_PARAM) \
   { \
     this->functorType = EXECUTORTYPE; \
@@ -156 +157 @@
 //! creates a command that takes five parameter
 #define ExecutorConstructor5(t1,t2,t3,t4,t5) \
-  EXECUTOR(const char* commandName, const char* className, void EXECUTORINCLASS(*function)(t1##_TYPE, t2##_TYPE, t3##_TYPE, t4##_TYPE, t5##_TYPE)) \
-  : Executor(commandName, className, 5, t1##_PARAM, t2##_PARAM, t3##_PARAM, t4##_PARAM, t5##_PARAM) \
+  EXECUTOR(void EXECUTORINCLASS(*function)(t1##_TYPE, t2##_TYPE, t3##_TYPE, t4##_TYPE, t5##_TYPE)) \
+  : Executor(5, t1##_PARAM, t2##_PARAM, t3##_PARAM, t4##_PARAM, t5##_PARAM) \
   { \
     this->functorType = EXECUTORTYPE; \
@@ -292 +293 @@
 
 
-    virtual void executeCommand (BaseObject* object, const char* parameters)
+    virtual void execute (BaseObject* object, const char* parameters)
     {
   SubString sub(parameters, true);