Changeset 7319 in orxonox.OLD for trunk/src/lib/shell

Timestamp:

Apr 17, 2006, 1:00:09 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: MUCH more comprehensive SubString

Location:

trunk/src/lib/shell

Files:

• shell_command.cc (modified) (5 diffs)
• shell_completion.cc (modified) (3 diffs)

trunk/src/lib/shell/shell_command.cc

@@ -165 +165 @@
   SubString inputSplits(executionString, " \t\n,");
 
-  if (inputSplits.getCount() == 0)
+  if (inputSplits.size() == 0)
     return false;
-  if (inputSplits.getCount() >= 1)
+  if (inputSplits.size() >= 1)
   {
     // CHECK FOR ALIAS
@@ -181 +181 @@
           if (objectList != NULL)
           {
-            if (inputSplits.getCount() > 1)
+            if (inputSplits.size() > 1)
             {
 
@@ -210 +210 @@
     }
 
-    if (commandClass != NULL && inputSplits.getCount() >= 2)
+    if (commandClass != NULL && inputSplits.size() >= 2)
     {
       if (objectList != NULL)
@@ -231 +231 @@
       }
       // match a function.
-      if (commandClass != NULL && (fktPos == 1 || (fktPos == 2 && inputSplits.getCount() >= 3)))
+      if (commandClass != NULL && (fktPos == 1 || (fktPos == 2 && inputSplits.size() >= 3)))
       {
         list<ShellCommand*>::iterator cmdIT;
@@ -240 +240 @@
             if (objectPointer == NULL && (*cmdIT)->executor->getType() & Executor_Objective)
               return false;
-            if (inputSplits.getCount() > fktPos+1)
+            if (inputSplits.size() > fktPos+1)
               (*cmdIT)->executor->execute(objectPointer, executionString.substr(inputSplits.getOffset(fktPos +1))); /// TODO CHECK IF OK
             else

trunk/src/lib/shell/shell_completion.cc

@@ -88 +88 @@
     completeString = "";
   else
-    completeString = inputSplits.getString(inputSplits.getCount()-1).c_str();
+    completeString = inputSplits.getString(inputSplits.size()-1).c_str();
 
   // CLASS COMPLETION
-  if (inputSplits.getCount() == 0)
+  if (inputSplits.size() == 0)
   {
     completeType |= SHELLC_CLASS;
     completeType |= SHELLC_ALIAS;
   }
-  else if (inputSplits.getCount() == 1 && emptyComplete == false)
+  else if (inputSplits.size() == 1 && emptyComplete == false)
   {
     completeType |= SHELLC_CLASS;
@@ -103 +103 @@
 
   // OBJECT/FUNCTION COMPLETIONS
-  else if ((inputSplits.getCount() == 1 && emptyComplete == true) ||
-            (inputSplits.getCount() == 2 && emptyComplete == false))
+  else if ((inputSplits.size() == 1 && emptyComplete == true) ||
+            (inputSplits.size() == 2 && emptyComplete == false))
   {
     classID = ClassList::StringToID(inputSplits.getString(0).c_str()); //FIXME
@@ -113 +113 @@
       completeType |= SHELLC_FUNCTION;
   }
-  else if ((inputSplits.getCount() == 2 && emptyComplete == true) ||
-            (inputSplits.getCount() == 3 && emptyComplete == false))
+  else if ((inputSplits.size() == 2 && emptyComplete == true) ||
+            (inputSplits.size() == 3 && emptyComplete == false))
   {
     classID = ClassList::StringToID(inputSplits.getString(0) .c_str()); // FIXME