Changeset 7219 for code/branches/consolecommands3/src/libraries/core/command

Timestamp:

Aug 26, 2010, 12:09:12 AM (14 years ago)

Author:

landauf

Message:

adapted all console commands to the new interface

Location:

code/branches/consolecommands3/src/libraries/core/command

Files:

• ConsoleCommandCompilation.cc (modified) (1 diff)
• IRC.cc (modified) (1 diff)
• Shell.cc (modified) (1 diff)
• TclBind.cc (modified) (1 diff)
• TclThreadManager.cc (modified) (1 diff)

code/branches/consolecommands3/src/libraries/core/command/ConsoleCommandCompilation.cc

@@ -37 +37 @@
 #include "util/StringUtils.h"
 #include "ConsoleCommand.h"
+#include "CommandExecutor.h"
 
 namespace orxonox
 {
-    SetConsoleCommandShortcutExtern(source).argumentCompleter(0, autocompletion::files());
-    SetConsoleCommandShortcutExtern(echo);
-    SetConsoleCommandShortcutExtern(puts);
+    _SetConsoleCommand("source", source).argumentCompleter(0, autocompletion::files());
+    _SetConsoleCommand("echo", echo);
+    _SetConsoleCommand("puts", puts);
 
-    SetConsoleCommandShortcutExtern(read).argumentCompleter(0, autocompletion::files());
-    SetConsoleCommandShortcutExtern(append).argumentCompleter(0, autocompletion::files());
-    SetConsoleCommandShortcutExtern(write).argumentCompleter(0, autocompletion::files());
+    _SetConsoleCommand("read", read).argumentCompleter(0, autocompletion::files());
+    _SetConsoleCommand("append", append).argumentCompleter(0, autocompletion::files());
+    _SetConsoleCommand("write", write).argumentCompleter(0, autocompletion::files());
 
-    SetConsoleCommandShortcutExtern(calculate);
+    _SetConsoleCommand("calculate", calculate);
 
     void source(const std::string& filename)

code/branches/consolecommands3/src/libraries/core/command/IRC.cc

@@ -42 +42 @@
     static const unsigned int IRC_TCL_THREADID  = 1421421421;
 
-    SetConsoleCommand(IRC, say,  true).accessLevel(AccessLevel::User);
-    SetConsoleCommand(IRC, msg,  false).accessLevel(AccessLevel::User);
-    SetConsoleCommand(IRC, nick, false).accessLevel(AccessLevel::User);
+    _SetConsoleCommand("IRC", "say",  &IRC::say);
+    _SetConsoleCommand("IRC", "msg",  &IRC::msg);
+    _SetConsoleCommand("IRC", "nick", &IRC::nick);
 
     IRC::IRC()

code/branches/consolecommands3/src/libraries/core/command/Shell.cc

@@ -40 +40 @@
 namespace orxonox
 {
-    SetConsoleCommandShortcut(OutputHandler, log);
-    SetConsoleCommandShortcut(OutputHandler, error);
-    SetConsoleCommandShortcut(OutputHandler, warning);
-    SetConsoleCommandShortcut(OutputHandler, info);
-    SetConsoleCommandShortcut(OutputHandler, debug);
+    _SetConsoleCommand("log",     OutputHandler::log    );
+    _SetConsoleCommand("error",   OutputHandler::error  );
+    _SetConsoleCommand("warning", OutputHandler::warning);
+    _SetConsoleCommand("info",    OutputHandler::info   );
+    _SetConsoleCommand("debug",   OutputHandler::debug  );
 
     Shell::Shell(const std::string& consoleName, bool bScrollable)

code/branches/consolecommands3/src/libraries/core/command/TclBind.cc

@@ -44 +44 @@
 namespace orxonox
 {
-    SetConsoleCommandShortcut(TclBind, tcl);
-    SetConsoleCommandShortcut(TclBind, bgerror);
+    _SetConsoleCommand("tcl", &TclBind::tcl);
+    _SetConsoleCommand("bgerror", &TclBind::bgerror);
 
     TclBind* TclBind::singletonPtr_s = 0;

code/branches/consolecommands3/src/libraries/core/command/TclThreadManager.cc

@@ -50 +50 @@
     const float TCLTHREADMANAGER_MAX_CPU_USAGE = 0.50f;
 
-    SetConsoleCommandShortcutAlias(TclThreadManager, execute, "tclexecute").argumentCompleter(0, autocompletion::tclthreads());
-    SetConsoleCommandShortcutAlias(TclThreadManager, query,   "tclquery"  ).argumentCompleter(0, autocompletion::tclthreads());
-    SetConsoleCommand(TclThreadManager, create,  false);
-    SetConsoleCommand(TclThreadManager, destroy, false).argumentCompleter(0, autocompletion::tclthreads());
-    SetConsoleCommand(TclThreadManager, execute, false).argumentCompleter(0, autocompletion::tclthreads());
-    SetConsoleCommand(TclThreadManager, query,   false).argumentCompleter(0, autocompletion::tclthreads());
-    SetConsoleCommand(TclThreadManager, source,  false).argumentCompleter(0, autocompletion::tclthreads());
+    _SetConsoleCommand("tclexecute", &TclThreadManager::execute).argumentCompleter(0, autocompletion::tclthreads());
+    _SetConsoleCommand("tclquery",   &TclThreadManager::query  ).argumentCompleter(0, autocompletion::tclthreads());
+    _SetConsoleCommand("TclThreadManager", "create",  &TclThreadManager::create);
+    _SetConsoleCommand("TclThreadManager", "destroy", &TclThreadManager::destroy).argumentCompleter(0, autocompletion::tclthreads());
+    _SetConsoleCommand("TclThreadManager", "execute", &TclThreadManager::execute).argumentCompleter(0, autocompletion::tclthreads());
+    _SetConsoleCommand("TclThreadManager", "query",   &TclThreadManager::query  ).argumentCompleter(0, autocompletion::tclthreads());
+    _SetConsoleCommand("TclThreadManager", "source",  &TclThreadManager::source ).argumentCompleter(0, autocompletion::tclthreads());
 
     /**