Changeset 7282 for code/branches/consolecommands3/src

Timestamp:

Aug 31, 2010, 2:26:53 AM (14 years ago)

Author:

landauf

Message:

ConsoleCommand::getCommand should return a const pointer

Location:

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

Files:

• CommandEvaluation.h (modified) (2 diffs)
• ConsoleCommand.cc (modified) (2 diffs)
• ConsoleCommand.h (modified) (1 diff)
• TclThreadManager.h (modified) (1 diff)

code/branches/consolecommands3/src/libraries/core/command/CommandEvaluation.h

@@ -61 +61 @@
                 { return (this->execCommand_ != 0); }
 
-            inline ConsoleCommand* getConsoleCommand() const
+            inline const ConsoleCommand* getConsoleCommand() const
                 { return this->execCommand_; }
 
@@ -90 +90 @@
             static std::string getCommonBegin(const ArgumentCompletionList& list);
 
-            ConsoleCommand* execCommand_;
-            ConsoleCommand* hintCommand_;
+            const ConsoleCommand* execCommand_;
+            const ConsoleCommand* hintCommand_;
             SubString tokens_;
             std::string string_;

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

@@ -415 +415 @@
     }
 
-    /* static */ ConsoleCommand* ConsoleCommand::getCommand(const std::string& group, const std::string& name, bool bPrintError)
+    /* static */ const ConsoleCommand* ConsoleCommand::getCommand(const std::string& group, const std::string& name, bool bPrintError)
     {
         std::map<std::string, std::map<std::string, ConsoleCommand*> >::const_iterator it_group = ConsoleCommand::getCommandMap().find(group);
@@ -436 +436 @@
     }
 
-    /* static */ ConsoleCommand* ConsoleCommand::getCommandLC(const std::string& group, const std::string& name, bool bPrintError)
+    /* static */ const ConsoleCommand* ConsoleCommand::getCommandLC(const std::string& group, const std::string& name, bool bPrintError)
     {
         std::string groupLC = getLowercase(group);

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

@@ -336 +336 @@
                 { return ConsoleCommand::getCommandMapLC(); }
 
-            static inline ConsoleCommand* getCommand(const std::string& name, bool bPrintError = false)
+            static inline const ConsoleCommand* getCommand(const std::string& name, bool bPrintError = false)
                 { return ConsoleCommand::getCommand("", name, bPrintError); }
-            static inline ConsoleCommand* getCommandLC(const std::string& name, bool bPrintError = false)
+            static inline const ConsoleCommand* getCommandLC(const std::string& name, bool bPrintError = false)
                 { return ConsoleCommand::getCommandLC("", name, bPrintError); }
 
-            static ConsoleCommand* getCommand(const std::string& group, const std::string& name, bool bPrintError = false);
-            static ConsoleCommand* getCommandLC(const std::string& group, const std::string& name, bool bPrintError = false);
+            static const ConsoleCommand* getCommand(const std::string& group, const std::string& name, bool bPrintError = false);
+            static const ConsoleCommand* getCommandLC(const std::string& group, const std::string& name, bool bPrintError = false);
 
             static void destroyAll();

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

@@ -38 +38 @@
 
 #include "util/Singleton.h"
-#include "core/OrxonoxClass.h"
 
 struct Tcl_Interp;