Changeset 7389 in orxonox.OLD for trunk/src/lib/shell/shell_command_class.cc

Timestamp:

Apr 26, 2006, 11:39:51 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: new and improved ShellCommandAlias

File:

• trunk/src/lib/shell/shell_command_class.cc (modified) (4 diffs)

trunk/src/lib/shell/shell_command_class.cc

@@ -26 +26 @@
 namespace OrxShell
 {
-
   std::list<ShellCommandClass*>* ShellCommandClass::commandClassList = NULL;
-  std::list<ShellCommandAlias*>* ShellCommandClass::aliasList = NULL;
 
   /**
@@ -79 +77 @@
 
   /**
-   * collects the Aliases registered to the ShellCommands
-   * @param stringList a List to paste the Aliases into.
-   * @returns true on success, false otherwise
-   */
-  bool ShellCommandClass::getCommandListOfAlias(std::list<std::string>& stringList)
-  {
-    if (ShellCommandClass::aliasList == NULL)
-      return false;
-
-    std::list<ShellCommandAlias*>::iterator alias;
-    for (alias = ShellCommandClass::aliasList->begin(); alias != ShellCommandClass::aliasList->end(); alias++)
-      stringList.push_back((*alias)->getName());
-    return true;
-  }
-
-  /**
-   * unregisters all Commands that exist
+   * @brief unregisters all Commands that exist
    */
   void ShellCommandClass::unregisterAllCommands()
@@ -109 +91 @@
     }
 
-    // unregister all aliases (there should be nothing to do here :))
-    if (ShellCommandClass::aliasList != NULL)
-    {
-      std::list<ShellCommandAlias*>::iterator alias;
-      for (alias = ShellCommandClass::aliasList->begin(); alias != ShellCommandClass::aliasList->end(); alias++)
-        delete (*alias);
-      delete ShellCommandClass::aliasList;
-      ShellCommandClass::aliasList = NULL;
-    }
-  }
-
-  /**
-   * checks if a Class is already registered to the Commands' class-stack
+  }
+
+  /**
+   * @brief checks if a Class is already registered to the Commands' class-stack
    * @param className the Name of the Class to check for
    * @returns the CommandClass if found, NULL otherwise
@@ -222 +195 @@
   {
     std::vector<ShellCommand*>::iterator delC = std::find(this->commandList.begin(), this->commandList.end(), command);
-    this->commandList.erase(delC);
+    if (delC != this->commandList.end())
+      this->commandList.erase(delC);
   }