Changeset 5784 in orxonox.OLD for trunk/src/lib/shell/shell_input.cc

Timestamp:

Nov 26, 2005, 8:48:11 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: shell without tList now

File:

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

trunk/src/lib/shell/shell_input.cc

@@ -49 +49 @@
   this->inputLine = new char[1];
   this->inputLine[0] = '\0';
-  this->history = new tList<char>;
-  this->historyIT = this->history->getIterator();
+  this->historyIT = this->history.begin();
   this->setHistoryLength(50);
   this->historyScrolling = false;
@@ -75 +74 @@
   delete this->completion;
 
-  char* histEl = this->historyIT->firstElement();
-  while (histEl != NULL)
-  {
-    delete[] histEl;
-    histEl = this->historyIT->nextElement();
-  }
-  delete this->historyIT;
-  delete this->history;
+  while (!this->history.empty())
+  {
+    delete[] this->history.front();
+    this->history.pop_front();
+  }
 }
 
@@ -139 +135 @@
   if (this->historyScrolling)
   {
-    delete[] this->history->lastElement();
-    this->history->remove(this->history->lastElement());
+    delete[] this->history.back();
+    this->history.pop_back();
     this->historyScrolling = false;
   }
@@ -160 +156 @@
   if (this->historyScrolling)
   {
-    delete[] this->history->lastElement();
-    this->history->remove(this->history->lastElement());
+    delete[] this->history.back();
+    this->history.pop_back();
     this->historyScrolling = false;
   }
@@ -181 +177 @@
   if (this->historyScrolling)
   {
-    delete[] this->history->lastElement();
-    this->history->remove(this->history->lastElement());
+    delete[] this->history.back();
+    this->history.pop_back();
     this->historyScrolling = false;
   }
@@ -220 +216 @@
   if (this->historyScrolling)
   {
-    delete[] this->history->lastElement();
-    this->history->remove(this->history->lastElement());
+    delete[] this->history.back();
+    this->history.pop_back();
     this->historyScrolling = false;
   }
 
   // adding the new Command to the History
-  this->history->add(newCommand);
-  if (this->history->getSize() > this->historyLength)
-  {
-    delete[] this->history->firstElement();
-    this->history->remove(this->history->firstElement());
+  this->history.push_back(newCommand);
+  if (this->history.size() > this->historyLength)
+  {
+    delete[] this->history.front();
+    this->history.pop_front();
   }
 
@@ -248 +244 @@
     char* currentText = new char[strlen(this->inputLine)+1];
     strcpy(currentText, this->inputLine);
-    this->history->add(currentText);
+    this->history.push_back(currentText);
     this->historyScrolling = true;
-    this->historyIT->lastElement();
-  }
-
-  char* prevElem = this->historyIT->prevStep();
+    this->historyIT = this->history.end();
+  }
+
+  char* prevElem = *(this->historyIT--);
   if (prevElem == NULL)
     return;
@@ -270 +266 @@
   if (!this->historyScrolling)
     return;
-  char* nextElem = this->historyIT->nextStep();
+  char* nextElem = *(this->historyIT++);
   if (nextElem == NULL)
     return;