Changeset 7386 in orxonox.OLD for trunk/src/lib

Timestamp:

Apr 26, 2006, 10:24:31 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: completions

Location:

trunk/src/lib

Files:

• shell/shell_command.h (modified) (1 diff)
• shell/shell_command_class.cc (modified) (3 diffs)
• shell/shell_command_class.h (modified) (1 diff)
• shell/shell_completion.cc (modified) (2 diffs)
• shell/shell_completion_plugin.h (modified) (1 diff)
• sound/sound_source.cc (modified) (1 diff)

trunk/src/lib/shell/shell_command.h

@@ -79 +79 @@
   protected:
     ShellCommand(const std::string& commandName, const std::string& className, const Executor& executor);
-    ~ShellCommand();
+    virtual ~ShellCommand();
 
     static bool isRegistered(const std::string& commandName, const std::string& className);

trunk/src/lib/shell/shell_command_class.cc

@@ -66 +66 @@
    * @returns true on success, false otherwise
    */
-  bool ShellCommandClass::getCommandListOfClass(const std::string& className, std::list<std::string>* stringList)
-  {
-    if (stringList == NULL)
-      return false;
-
+  bool ShellCommandClass::getCommandListOfClass(const std::string& className, std::list<std::string>& stringList)
+  {
     std::list<ShellCommandClass*>::iterator elem;
     for(elem = ShellCommandClass::commandClassList->begin(); elem != ShellCommandClass::commandClassList->end(); elem++)
@@ -78 +75 @@
         std::list<ShellCommand*>::iterator command;
         for(command = (*elem)->commandList.begin(); command != (*elem)->commandList.end(); command++)
-          stringList->push_back((*command)->getName());
+          stringList.push_back((*command)->getName());
       }
     }
@@ -89 +86 @@
    * @returns true on success, false otherwise
    */
-  bool ShellCommandClass::getCommandListOfAlias(std::list<std::string>* stringList)
-  {
-    if (stringList == NULL || ShellCommandClass::aliasList == NULL)
+  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());
+      stringList.push_back((*alias)->getName());
     return true;
   }

trunk/src/lib/shell/shell_command_class.h

@@ -25 +25 @@
     /** @returns the CommandClassList */
     static const std::list<ShellCommandClass*>* getCommandClassList() { return ShellCommandClass::commandClassList; };
-    static bool getCommandListOfClass(const std::string& className, std::list<std::string>* stringList);
-    static bool getCommandListOfAlias(std::list<std::string>* aliasList);
+
+    static bool getCommandListOfClass(const std::string& className, std::list<std::string>& stringList);
+    static bool getCommandListOfAlias(std::list<std::string>& aliasList);
 
     static ShellCommandClass* getCommandClass(const std::string& className);

trunk/src/lib/shell/shell_completion.cc

@@ -170 +170 @@
   {
     std::list<std::string> fktList;
-    ShellCommandClass::getCommandListOfClass(className, &fktList);
+    ShellCommandClass::getCommandListOfClass(className, fktList);
     //printf("%s\n", boList->firstElement()->getName());
     if (!this->addToCompleteList(fktList, functionBegin, FunctionCompletion))
@@ -185 +185 @@
   {
     std::list<std::string> aliasList;
-    ShellCommandClass::getCommandListOfAlias(&aliasList);
+    ShellCommandClass::getCommandListOfAlias(aliasList);
     //printf("%s\n", boList->firstElement()->getName());
     if (!this->addToCompleteList(aliasList, aliasBegin, AliasCompletion))

trunk/src/lib/shell/shell_completion_plugin.h

@@ -59 +59 @@
       std::string             _subDir;
       StartDirectory          _startDir;
-
   };
 

trunk/src/lib/sound/sound_source.cc

@@ -139 +139 @@
   if (!this->retrieveSource())
   {
-    PRINTF(2)("No more Free sources (You might consider raising the Source-Count).\n");
+    PRINTF(3)("No more Free sources (You might consider raising the Source-Count).\n");
     return;
   }