Changeset 7186 for code/branches/consolecommands3/src/libraries/core/ConsoleCommand.h

Timestamp:

Aug 19, 2010, 2:14:54 AM (14 years ago)

Author:

landauf

Message:

Moved ability to possess descriptions from Executor to ConsoleCommand, since no other executors use this feature. Also simplified this code a little by introducing a new shortcut in Language.h. XMLPort has to use a temporary solution for descriptions without Language support atm.

File:

• code/branches/consolecommands3/src/libraries/core/ConsoleCommand.h (modified) (2 diffs)

code/branches/consolecommands3/src/libraries/core/ConsoleCommand.h

@@ -90 +90 @@
             ConsoleCommand(Functor* functor, const std::string& name = "");
 
-            inline ConsoleCommand& description(const std::string& description)
-                { this->Executor::setDescription(description); return (*this); }
-            inline ConsoleCommand& descriptionParam(int param, const std::string& description)
-                { this->Executor::setDescriptionParam(param, description); return (*this); }
-            inline ConsoleCommand& descriptionReturnvalue(const std::string& description)
-                { this->Executor::setDescriptionReturnvalue(description); return (*this); }
+            ConsoleCommand& description(const std::string& description);
+            const std::string& getDescription() const;
+
+            ConsoleCommand& descriptionParam(unsigned int param, const std::string& description);
+            const std::string& getDescriptionParam(unsigned int param) const;
+
+            ConsoleCommand& descriptionReturnvalue(const std::string& description);
+            const std::string& getDescriptionReturnvalue(int param) const;
+
             inline ConsoleCommand& defaultValues(const MultiType& param1)
                 { this->Executor::setDefaultValues(param1); return (*this); }
@@ -150 +153 @@
             KeybindMode::Value keybindMode_;
             int inputConfiguredParam_;
+
+            LanguageEntryLabel description_;
+            LanguageEntryLabel descriptionReturnvalue_;
+            LanguageEntryLabel descriptionParam_[MAX_FUNCTOR_ARGUMENTS];
     };