Changeset 7225 in orxonox.OLD for trunk/src/lib/shell/shell_completion.h

Timestamp:

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

Author:

bensch

Message:

orxonox/trunk: more std::string

File:

• trunk/src/lib/shell/shell_completion.h (modified) (3 diffs)

trunk/src/lib/shell/shell_completion.h

@@ -11 +11 @@
 
 #include <list>
+#include <string>
 
 // FORWARD DECLARATION
@@ -30 +31 @@
 //! A struct for ShellElements (these are used as containers to identify an Input for what it is)
 struct ShellC_Element{
-  const char*     name;     //!< the Name of the Element to be completed.
+  std::string     name;     //!< the Name of the Element to be completed.
   SHELLC_TYPE     type;     //!< the type of the Element
 };
@@ -42 +43 @@
 
   bool autoComplete(ShellInput* input = NULL);
-  bool classComplete(const char* classBegin);
+  bool classComplete(const std::string& classBegin);
 //  long classMatch(const char* input, unsigned int* length);
-  bool objectComplete(const char* objectBegin, long classID);
+  bool objectComplete(const std::string& objectBegin, long classID);
 //  bool objectMatch(const char* objectBegin, long classID, unsigned int* length);
-  bool functionComplete(const char* functionBegin, const char* className);
+  bool functionComplete(const std::string& functionBegin, const std::string& className);
 //  bool functionMatch(const char* functionBegin, long classID, unsigned int* length);
-  bool aliasComplete(const char* aliasBegin);
+  bool aliasComplete(const std::string& aliasBegin);
 
-  bool generalComplete(const char* begin, const char* displayAs = "%s", const char* addBack = NULL, const char* addFront = NULL);
+  bool generalComplete(const std::string& begin, const std::string& displayAs = "%s",
+                       const std::string& addBack = "", const std::string& addFront = "");
 
-  bool addToCompleteList(const std::list<std::string>* inputList, const char* completionBegin, SHELLC_TYPE type);
-  bool addToCompleteList(const std::list<BaseObject*>* inputList, const char* completionBegin, SHELLC_TYPE type);
+  bool addToCompleteList(const std::list<std::string>* inputList, const std::string& completionBegin, SHELLC_TYPE type);
+  bool addToCompleteList(const std::list<BaseObject*>* inputList, const std::string& completionBegin, SHELLC_TYPE type);
   void emptyCompletionList();