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

Timestamp:

Apr 17, 2006, 1:32:25 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: more std::string style in the Shell

File:

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

trunk/src/lib/shell/shell_buffer.cc

@@ -90 +90 @@
 void ShellBuffer::flush()
 {
-  // delete all the Chars in the Buffers
-  list<char*>::iterator bufferLine;
-  for (bufferLine = this->buffer.begin(); bufferLine != this->buffer.end(); bufferLine++)
-  {
-    delete[] (*bufferLine);
-  }
   this->buffer.clear();
 }
@@ -176 +170 @@
     }
 
-    char* addLine = new char[strlen(newLineBegin)+1];
-    strcpy(addLine, newLineBegin);
-
     this->lineCount++;
-    this->buffer.push_back(addLine);
+    this->buffer.push_back(newLineBegin);
     if (likely (this->shell != NULL) && unlikely (this->shell->isActive()))
-      this->shell->printToDisplayBuffer(addLine);
+      this->shell->printToDisplayBuffer(newLineBegin);
 
     if (this->buffer.size() > this->bufferSize)
-    {
-      delete[] this->buffer.front();
       this->buffer.pop_front();
-    }
 
     newLineBegin = newLineEnd+1;
@@ -201 +189 @@
   PRINT(3)("Debugging output to console (not this shell)\n");
 
-  list<char*>::const_iterator bufferLine;
+  list<std::string>::const_iterator bufferLine;
   for (bufferLine = this->buffer.begin(); bufferLine != this->buffer.end(); bufferLine++)
-    printf(*bufferLine);
+    printf((*bufferLine).c_str());
 }