Changeset 7225 in orxonox.OLD for trunk/src/lib/shell/shell_command.cc

Timestamp:

Mar 18, 2006, 12:04:39 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: more std::string

File:

• trunk/src/lib/shell/shell_command.cc (modified) (7 diffs)

trunk/src/lib/shell/shell_command.cc

@@ -36 +36 @@
  * @param paramCount the count of parameters this command takes
  */
-ShellCommand::ShellCommand(const char* commandName, const char* className, const Executor& executor)
+ShellCommand::ShellCommand(const std::string& commandName, const std::string& className, const Executor& executor)
 {
   this->setClassID(CL_SHELL_COMMAND, "ShellCommand");
@@ -66 +66 @@
  * registers a new ShellCommand
  */
-ShellCommand* ShellCommand::registerCommand(const char* commandName, const char* className, const Executor& executor)
+ShellCommand* ShellCommand::registerCommand(const std::string& commandName, const std::string& className, const Executor& executor)
 {
   if (ShellCommand::isRegistered(commandName, className))
@@ -80 +80 @@
  * @param commandName the name of the command itself
  */
-void ShellCommand::unregisterCommand(const char* commandName, const char* className)
+void ShellCommand::unregisterCommand(const std::string& commandName, const std::string& className)
 {
   /// FIXME
@@ -118 +118 @@
  * This is checked in the registerCommand-function.
  */
-bool ShellCommand::isRegistered(const char* commandName, const char* className)
+bool ShellCommand::isRegistered(const std::string& commandName, const std::string& className)
 {
   if (ShellCommandClass::commandClassList == NULL)
@@ -132 +132 @@
     for (elem = checkClass->commandList.begin(); elem != checkClass->commandList.end(); elem++)
     {
-      if (!strcmp(commandName, (*elem)->getName()))
-      {
-        PRINTF(2)("Command '%s::%s' already registered\n", className, commandName);
+      if (commandName == (*elem)->getName())
+      {
+        PRINTF(2)("Command '%s::%s' already registered\n", className.c_str(), commandName.c_str());
         return true;
       }
@@ -272 +272 @@
  * @returns itself
  */
-ShellCommand* ShellCommand::setAlias(const char* alias)
+ShellCommand* ShellCommand::setAlias(const std::string& alias)
 {
   if (this == NULL)
@@ -352 +352 @@
 {
   return MultiType::MultiTypeToString((MT_Type)parameter);
-// FIXME
-  /*  switch (parameter)
-  {
-    case ParameterBool:
-      return "BOOL";
-      break;
-    case ParameterChar:
-      return "CHAR";
-      break;
-    case ParameterString:
-      return "STRING";
-      break;
-    case ParameterInt:
-      return "INT";
-      break;
-    case ParameterUInt:
-      return "UINT";
-      break;
-    case ParameterFloat:
-      return "FLOAT";
-      break;
-    case ParameterLong:
-      return "LONG";
-      break;
-    default:
-      return "NULL";
-      break;
-  }*/
-}
+}