Changeset 7373 in orxonox.OLD for trunk/src

Timestamp:

Apr 26, 2006, 2:29:15 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: list to vector

Location:

trunk/src/lib/shell

Files:

• shell_completion.cc (modified) (2 diffs)
• shell_completion.h (modified) (4 diffs)

trunk/src/lib/shell/shell_completion.cc

@@ -23 +23 @@
 
 #include "substring.h"
-#include "base_object.h"
 #include "class_list.h"
 #include "debug.h"
-
-#include "stdlibincl.h"
 
 using namespace std;
@@ -221 +218 @@
 
   CompletionType changeType = NullCompletion;
-  list<CompletionElement>::iterator charIT;
+  std::vector<CompletionElement>::iterator charIT;
   for (charIT = completionList.begin(); charIT != completionList.end(); charIT++)
   {

trunk/src/lib/shell/shell_completion.h

@@ -10 +10 @@
 #define _SHELL_COMPLETION_H
 
+#include <vector>
 #include <list>
 #include <string>
@@ -21 +22 @@
 
 
-//! A class for ...
-class ShellCompletion {
+//! A class for Completing the an InputString.
+class ShellCompletion
+{
 
   //! an enumerator for different types the Shell can complete.
@@ -33 +35 @@
   } CompletionType;
 
-//! A struct for ShellElements (these are used as containers to identify an Input for what it is)
-  struct CompletionElement{
+  //! A struct for ShellElements (these are used as containers to identify an Input for what it is)
+  struct CompletionElement
+  {
     std::string     name;     //!< the Name of the Element to be completed.
     CompletionType type;     //!< the type of the Element
   };
 
- public:
+public:
   ShellCompletion();
   virtual ~ShellCompletion();
 
+
+  // Functions to produce the Complete Lists.
   bool autoComplete(std::string& input);
   bool classComplete(const std::string& classBegin);
-//  long classMatch(const char* input, unsigned int* length);
+  //  long classMatch(const char* input, unsigned int* length);
   bool objectComplete(const std::string& objectBegin, long classID);
-//  bool objectMatch(const char* objectBegin, long classID, unsigned int* length);
+  //  bool objectMatch(const char* objectBegin, long classID, unsigned int* length);
   bool functionComplete(const std::string& functionBegin, const std::string& className);
-//  bool functionMatch(const char* functionBegin, long classID, unsigned int* length);
+  //  bool functionMatch(const char* functionBegin, long classID, unsigned int* length);
   bool aliasComplete(const std::string& aliasBegin);
 
@@ -61 +66 @@
   void clearCompletionList();
 
+
+  // Helpers.
   static const std::string& ShellCompletion::typeToString(ShellCompletion::CompletionType type);
 
- private:
-   std::list<CompletionElement>    completionList;          //!< A list of completions, that are io.
+private:
+  std::vector<CompletionElement>  completionList;          //!< A list of completions, that are io.
 
-
-   static const std::string        typeNames[];             //!< A list of Completion-Type-Names.
+  static const std::string        typeNames[];             //!< A list of Completion-Type-Names.
 };