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

Timestamp:

Sep 11, 2005, 11:21:56 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: cleaner outtakes of the ShellBuffer

File:

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

trunk/src/lib/shell/shell_buffer.cc

@@ -19 +19 @@
 #include "debug.h"
 #include "list.h"
+#include "shell.h"
 
 #include "stdlibincl.h"
@@ -31 +32 @@
 ShellBuffer::ShellBuffer ()
 {
+  ShellBuffer::singletonRef = this;
+
+  this->lineCount = 0;
   this->keepBufferArray[0] = '\0';
   this->keepBuffer = false;
   this->buffer = new tList<char>;
+  this->bufferIterator = this->buffer->getIterator();
 
   this->setBufferSize(10);
@@ -45 +50 @@
 ShellBuffer::~ShellBuffer ()
 {
+  if (Shell::isInstanciated())
+    delete Shell::getInstance();
 
+  this->flushBuffers();
+  delete bufferIterator;
   delete buffer;
 
@@ -57 +66 @@
 {
   // delete all the Chars in the Buffers
-  tIterator<char>* charIterator = this->buffer->getIterator();
-  char* charElem = charIterator->firstElement();
+  char* charElem = bufferIterator->firstElement();
   while (charElem != NULL)
   {
     delete charElem;
 
-    charElem = charIterator->nextElement();
+    charElem = bufferIterator->nextElement();
   }
-  delete charIterator;
+  delete this->bufferIterator;
   delete this->buffer;
   this->buffer = new tList<char>;
+  this->bufferIterator = this->buffer->getIterator();
 }
 
@@ -141 +150 @@
 
     this->buffer->add(addLine);
+    this->lineCount++;
 
     if (this->buffer->getSize() > this->bufferSize)