Changeset 9331

Timestamp:

Jul 22, 2012, 9:35:54 PM (12 years ago)

Author:

landauf

Message:

removed const_cast and some const qualifiers from ConsoleCommand and -Manipulator

Location:

code/branches/presentation2012merge/src/libraries/core/command

Files:

• ConsoleCommand.cc (modified) (2 diffs)
• ConsoleCommand.h (modified) (3 diffs)

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

@@ -594 +594 @@
         @param bPrintError If true, an error is printed if the command doesn't exist
     */
-    /* static */ const ConsoleCommand* ConsoleCommand::getCommand(const std::string& group, const std::string& name, bool bPrintError)
+    /* static */ ConsoleCommand* ConsoleCommand::getCommand(const std::string& group, const std::string& name, bool bPrintError)
     {
         // find the group
@@ -624 +624 @@
         @param bPrintError If true, an error is printed if the command doesn't exist
     */
-    /* static */ const ConsoleCommand* ConsoleCommand::getCommandLC(const std::string& group, const std::string& name, bool bPrintError)
+    /* static */ ConsoleCommand* ConsoleCommand::getCommandLC(const std::string& group, const std::string& name, bool bPrintError)
     {
         std::string groupLC = getLowercase(group);

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

@@ -382 +382 @@
                 public:
                     /// Constructor: Creates a manipulator for a given ConsoleCommand.
-                    ConsoleCommandManipulator(const ConsoleCommand* command) : command_(const_cast<ConsoleCommand*>(command)) {}
+                    ConsoleCommandManipulator(ConsoleCommand* command) : command_(command) {}
 
                     /// Changes the current function of the command. @param function The new function-pointer @param bForce If true, the new function-pointer is always assigned, even if the headers don't match
@@ -619 +619 @@
 
             /// Returns a manipulator for this command.
-            inline ConsoleCommandManipulator getManipulator() const
+            inline ConsoleCommandManipulator getManipulator()
                 { return this; }
 
@@ -667 +667 @@
 
             /// Returns a command (shortcut) with given name. @param name The name of the command shortcut @param bPrintError If true, an error is printed if the command doesn't exist
-            static inline const ConsoleCommand* getCommand(const std::string& name, bool bPrintError = false)
+            static inline ConsoleCommand* getCommand(const std::string& name, bool bPrintError = false)
                 { return ConsoleCommand::getCommand("", name, bPrintError); }
             /// Returns a command (shortcut) with given name in lowercase. @param name The lowercase name of the command shortcut @param bPrintError If true, an error is printed if the command doesn't exist
-            static inline const ConsoleCommand* getCommandLC(const std::string& name, bool bPrintError = false)
+            static inline ConsoleCommand* getCommandLC(const std::string& name, bool bPrintError = false)
                 { return ConsoleCommand::getCommandLC("", name, bPrintError); }
 
-            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 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 void destroyAll();