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

Timestamp:

May 19, 2006, 4:21:01 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: Removed the old Executor, and inserted the new one into the ShellCommand

File:

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

trunk/src/lib/shell/shell_command.h

@@ -37 +37 @@
   //        ShellCommand* shell_command_##class##_##command = ShellCommand<class>::registerCommand(#command, #class, &class::function)
 #define SHELL_COMMAND(command, class, function) \
-           OrxShell::ShellCommand* shell_command_##class##_##command = OrxShell::ShellCommand::registerCommand(#command, #class, ExecutorObjective<class>(&class::function))
+           OrxShell::ShellCommand* shell_command_##class##_##command = OrxShell::ShellCommand::registerCommand(#command, #class, createExecutor<class>(&class::function))
 
   /**
@@ -53 +53 @@
    */
 #define SHELL_COMMAND_STATIC(command, class, function) \
-           OrxShell::ShellCommand* shell_command_##class##_##command = OrxShell::ShellCommand::registerCommand(#command, #class, ExecutorStatic<class>(function))
+           OrxShell::ShellCommand* shell_command_##class##_##command = OrxShell::ShellCommand::registerCommand(#command, #class, createExecutor<class>(function))
 
 
@@ -71 +71 @@
     ShellCommand* completionPlugin(unsigned int parameter, const CompletorPlugin& completorPlugin);
 
-    static ShellCommand* registerCommand(const std::string& commandName, const std::string& className, const Executor& executor);
+    static ShellCommand* registerCommand(const std::string& commandName, const std::string& className, Executor* executor);
     static void unregisterCommand(const std::string& commandName, const std::string& className);
     static const ShellCommand* const getCommand(const std::string& commandName, const std::string& className);
@@ -87 +87 @@
 
   protected:
-    ShellCommand(const std::string& commandName, const std::string& className, const Executor& executor);
+    ShellCommand(const std::string& commandName, const std::string& className, Executor* executor);
     virtual ~ShellCommand();