Changeset 5641 in orxonox.OLD for trunk/src/lib/shell/shell_command.h

Timestamp:

Nov 18, 2005, 9:22:23 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: Passing Reference inastead of Pointer to create ShellCommand

File:

• trunk/src/lib/shell/shell_command.h (modified) (4 diffs)

trunk/src/lib/shell/shell_command.h

@@ -41 +41 @@
 //        ShellCommand* shell_command_##class##_##command = ShellCommand<class>::registerCommand(#command, #class, &class::function)
 #define SHELL_COMMAND(command, class, function) \
-           ShellCommand* shell_command_##class##_##command = ShellCommand::registerCommand(#command, #class, new ExecutorObjective<class>(&class::function))
+           ShellCommand* shell_command_##class##_##command = ShellCommand::registerCommand(#command, #class, ExecutorObjective<class>(&class::function))
 
 /**
@@ -57 +57 @@
  */
 #define SHELL_COMMAND_STATIC(command, class, function) \
-           ShellCommand* shell_command_##class##_##command = ShellCommand::registerCommand(#command, #class, new ExecutorStatic<class>(function))
+           ShellCommand* shell_command_##class##_##command = ShellCommand::registerCommand(#command, #class, ExecutorStatic<class>(function))
 
 
@@ -72 +72 @@
     ShellCommand* defaultValues(unsigned int count, ...);
 
-    static ShellCommand* registerCommand(const char* commandName, const char* className, Executor* executor);
+    static ShellCommand* registerCommand(const char* commandName, const char* className, const Executor& executor);
 
     static void unregisterCommand(const char* commandName, const char* className);
@@ -79 +79 @@
 
   protected:
-    ShellCommand(const char* commandName, const char* className, Executor* executor);
+    ShellCommand(const char* commandName, const char* className, const Executor& executor);
     ~ShellCommand();
 
-    static bool isRegistered(const char* commandName, const char* className, Executor* executor);
+    static bool isRegistered(const char* commandName, const char* className, const Executor& executor);
     static const char* paramToString(long parameter);
 
   protected:
-    void*                            functionPointer;                      //!< The pointeer to the function of the Class (or static pointer if ClassID == CL_NULL )
     unsigned int                     paramCount;                           //!< the count of parameters.
     unsigned int*                    parameters;                           //!< Parameters the function of this Command takes.