Changeset 1430 for code/branches/console/src/core/ConsoleCommand.h

Timestamp:

May 26, 2008, 8:30:33 PM (16 years ago)

Author:

landauf

Message:

I start to like it

File:

• code/branches/console/src/core/ConsoleCommand.h (modified) (3 diffs)

code/branches/console/src/core/ConsoleCommand.h

@@ -43 +43 @@
 
 #define SetConsoleCommandGeneric(fakevariable, classname, command, bCreateShortcut) \
-    ConsoleCommand& fakevariable = ClassManager<classname>::getIdentifier()->addConsoleCommand((ConsoleCommand*)command, bCreateShortcut)
+    ConsoleCommand& fakevariable = ClassManager<classname>::getIdentifier()->addConsoleCommand(command, bCreateShortcut)
 
 
@@ -53 +53 @@
 
 #define SetConsoleCommandShortcutGeneric(fakevariable, command) \
-    ConsoleCommand& fakevariable = CommandExecutor::addConsoleCommandShortcut((ConsoleCommand*)command)
+    ConsoleCommand& fakevariable = CommandExecutor::addConsoleCommandShortcut(command)
 
 
@@ -100 +100 @@
                 { return this->accessLevel_; }
 
-            ConsoleCommand& setArgumentCompletionList(unsigned int param, std::list<std::pair<std::string, std::string> > (*function) (void));
-
-            const std::list<std::pair<std::string, std::string> >& getArgumentCompletionList(unsigned int param);
-            std::list<std::pair<std::string, std::string> >::const_iterator getArgumentCompletionListBegin(unsigned int param);
-            std::list<std::pair<std::string, std::string> >::const_iterator getArgumentCompletionListEnd(unsigned int param);
+            ConsoleCommand& setArgumentCompletionList(unsigned int param, ArgumentCompleter* completer);
+            void createArgumentCompletionList(unsigned int param, const std::string& param1 = "", const std::string& param2 = "", const std::string& param3 = "", const std::string& param4 = "", const std::string& param5 = "");
+            const std::list<std::pair<std::string, std::string> >& getArgumentCompletionList() const
+                { return this->argumentList_; }
+            std::list<std::pair<std::string, std::string> >::const_iterator getArgumentCompletionListBegin() const
+                { return this->argumentList_.begin(); }
+            std::list<std::pair<std::string, std::string> >::const_iterator getArgumentCompletionListEnd() const
+                { return this->argumentList_.end(); }
 
         private:
             AccessLevel::Level accessLevel_;
-            std::list<std::pair<std::string, std::string> > (*autocompletionFunction_[5]) (void);
+            ArgumentCompleter* argumentCompleter_[5];
             std::list<std::pair<std::string, std::string> > argumentList_;
     };