Changeset 1755 for code/trunk/src/core/ConsoleCommand.h

Timestamp:

Sep 10, 2008, 1:37:36 AM (16 years ago)

Author:

rgrieder

Message:

merged gui back to trunk.
update the media repository!

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/core/ConsoleCommand.h (modified) (2 diffs)

code/trunk/src/core/ConsoleCommand.h

@@ -82 +82 @@
     }
 
-    class _CoreExport ConsoleCommand : public ExecutorStatic
+    class _CoreExport ConsoleCommand : public Executor
     {
         public:
-            ConsoleCommand(FunctorStatic* functor, const std::string& name = "");
+            ConsoleCommand(Functor* functor, const std::string& name = "");
 
             inline ConsoleCommand& description(const std::string& description)
-                { this->ExecutorStatic::setDescription(description); return (*this); }
+                { this->Executor::setDescription(description); return (*this); }
             inline ConsoleCommand& descriptionParam(int param, const std::string& description)
-                { this->ExecutorStatic::setDescriptionParam(param, description); return (*this); }
+                { this->Executor::setDescriptionParam(param, description); return (*this); }
             inline ConsoleCommand& descriptionReturnvalue(const std::string& description)
-                { this->ExecutorStatic::setDescriptionReturnvalue(description); return (*this); }
+                { this->Executor::setDescriptionReturnvalue(description); return (*this); }
             inline ConsoleCommand& defaultValues(const MultiType& param1)
-                { this->ExecutorStatic::setDefaultValues(param1); return (*this); }
+                { this->Executor::setDefaultValues(param1); return (*this); }
             inline ConsoleCommand& defaultValues(const MultiType& param1, const MultiType& param2)
-                { this->ExecutorStatic::setDefaultValues(param1, param2); return (*this); }
+                { this->Executor::setDefaultValues(param1, param2); return (*this); }
             inline ConsoleCommand& defaultValues(const MultiType& param1, const MultiType& param2, const MultiType& param3)
-                { this->ExecutorStatic::setDefaultValues(param1, param2, param3); return (*this); }
+                { this->Executor::setDefaultValues(param1, param2, param3); return (*this); }
             inline ConsoleCommand& defaultValues(const MultiType& param1, const MultiType& param2, const MultiType& param3, const MultiType& param4)
-                { this->ExecutorStatic::setDefaultValues(param1, param2, param3, param4); return (*this); }
+                { this->Executor::setDefaultValues(param1, param2, param3, param4); return (*this); }
             inline ConsoleCommand& defaultValues(const MultiType& param1, const MultiType& param2, const MultiType& param3, const MultiType& param4, const MultiType& param5)
-                { this->ExecutorStatic::setDefaultValues(param1, param2, param3, param4, param5); return (*this); }
+                { this->Executor::setDefaultValues(param1, param2, param3, param4, param5); return (*this); }
             inline ConsoleCommand& defaultValue(unsigned int index, const MultiType& param)
-                { this->ExecutorStatic::setDefaultValue(index, param); return (*this); }
+                { this->Executor::setDefaultValue(index, param); return (*this); }
 
             inline ConsoleCommand& accessLevel(AccessLevel::Level level)
@@ -147 +147 @@
     };
 
-    inline ConsoleCommand* createConsoleCommand(FunctorStatic* functor, const std::string& name = "")
+    inline ConsoleCommand* createConsoleCommand(Functor* functor, const std::string& name = "")
     {
         return new ConsoleCommand(functor, name);