Changeset 5781 in orxonox.OLD for trunk/src/lib/shell/shell_buffer.cc

Timestamp:

Nov 26, 2005, 4:17:20 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: more stl::list

File:

• trunk/src/lib/shell/shell_buffer.cc (modified) (5 diffs)

trunk/src/lib/shell/shell_buffer.cc

@@ -38 +38 @@
   this->bufferArray[0] = '\0';
   this->keepBuffer = false;
-  this->buffer = new tList<char>;
 
   this->setBufferSize(100);
@@ -54 +53 @@
 
   this->flush();
-  delete buffer;
 
   ShellBuffer::singletonRef = NULL;
@@ -89 +87 @@
 {
   // delete all the Chars in the Buffers
-  tIterator<char>* bufferIterator = this->buffer->getIterator();
-  char* charElem = bufferIterator->firstElement();
-  while (charElem != NULL)
+  list<char*>::iterator bufferLine;
+  for (bufferLine = this->buffer.begin(); bufferLine != this->buffer.end(); bufferLine++)
   {
-    delete[] charElem;
-    charElem = bufferIterator->nextElement();
+    delete[] (*bufferLine);
   }
-  delete bufferIterator;
-  delete this->buffer;
-  this->buffer = new tList<char>;
+  this->buffer.erase(this->buffer.begin(), this->buffer.end());
 }
 
@@ -178 +172 @@
 
     this->lineCount++;
-    this->buffer->add(addLine);
+    this->buffer.push_back(addLine);
     if (likely (this->shell != NULL) && unlikely (this->shell->isActive()))
       this->shell->printToDisplayBuffer(addLine);
 
-    if (this->buffer->getSize() > this->bufferSize)
+    if (this->buffer.size() > this->bufferSize)
     {
-      delete[] this->buffer->firstElement();
-      this->buffer->remove(this->buffer->firstElement());
+      delete[] this->buffer.front();
+      this->buffer.pop_front();
     }
 
@@ -199 +193 @@
   PRINT(3)("Debugging output to console (not this shell)\n");
 
-  tIterator<char>* charIterator = this->buffer->getIterator();
-  char* tmpChar = charIterator->firstElement();
-  while(tmpChar != NULL)
-  {
-    printf(tmpChar);
-    tmpChar = charIterator->nextElement();
-  }
-  delete charIterator;
+  list<char*>::const_iterator bufferLine;
+  for (bufferLine = this->buffer.begin(); bufferLine != this->buffer.end(); bufferLine++)
+    printf(*bufferLine);
 }