Changeset 7344 in orxonox.OLD for trunk/src/lib/shell/shell_completion.cc

Timestamp:

Apr 19, 2006, 4:33:55 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: c_str() removed

File:

• trunk/src/lib/shell/shell_completion.cc (modified) (8 diffs)

trunk/src/lib/shell/shell_completion.cc

@@ -48 +48 @@
 /**
  * @brief autocompletes the Shell's inputLine
+ * @param input the input to complete.
  * @returns true, if a result was found, false otherwise
  */
@@ -58 +59 @@
   bool emptyComplete = false;           //< if the completion input is empty string. e.g ""
   long completeType = SHELLC_NONE;      //< the Type we'd like to complete.
-  const char* completeString;           //< the string to complete.
+  std::string completeString;           //< the string to complete.
 
 
@@ -66 +67 @@
   // Check if we are in a input. eg. the supplied string "class " and now we complete either function or object
   if (input[input.size()-1] == ' ')
-  {
     emptyComplete = true;
-  }
 
   // CREATE INPUTS
-  SubString inputSplits(input, " \t\n,");
+  SubString inputSplits(input, SubString::WhiteSpacesWithComma);
 
   // What String will be completed
@@ -77 +76 @@
     completeString = "";
   else
-    completeString = inputSplits.getString(inputSplits.size()-1).c_str();
+    completeString = inputSplits.getString(inputSplits.size()-1);
 
   // CLASS COMPLETION
@@ -95 +94 @@
             (inputSplits.size() == 2 && emptyComplete == false))
   {
-    classID = ClassList::StringToID(inputSplits.getString(0).c_str()); //FIXME
+    classID = ClassList::StringToID(inputSplits.getString(0));
     objectList = ClassList::getList((ClassID)classID);
     if (classID != CL_NULL)
@@ -105 +104 @@
             (inputSplits.size() == 3 && emptyComplete == false))
   {
-    classID = ClassList::StringToID(inputSplits.getString(0) .c_str()); // FIXME
+    classID = ClassList::StringToID(inputSplits.getString(0));
     if (classID == CL_NULL)
       return false;
@@ -117 +116 @@
     this->objectComplete(completeString, classID);
   if (completeType & SHELLC_FUNCTION)
-    this->functionComplete(completeString, inputSplits.getString(0).c_str()); // FIXME
+    this->functionComplete(completeString, inputSplits.getString(0));
   if (completeType & SHELLC_ALIAS)
     this->aliasComplete(completeString);
@@ -199 +198 @@
 /**
  * @brief completes the inputline on grounds of an inputList
+ * @param input the Input to complete.
  * @param begin the String to search in the inputList, and to extend with it.
  * @param displayAs how to display the found value to the user, printf-style, !!with only one %s!! ex.: "::%s::"