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

Timestamp:

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

Author:

bensch

Message:

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

File:

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

trunk/src/lib/shell/shell.cc

@@ -74 +74 @@
   this->bufferDisplaySize = 10;
   this->bufferOffset = 0;
-  this->bufferIterator = ShellBuffer::getInstance()->getBuffer()->begin();
+  this->bufferIterator = ShellBuffer::getInstance()->getBuffer().begin();
 
   // INPUT LINE
@@ -130 +130 @@
   this->setRelCoorSoft2D(0, 0, 1, 5);
 
-  list<char*>::const_iterator textLine = --ShellBuffer::getInstance()->getBuffer()->end();
+  list<std::string>::const_iterator textLine = --ShellBuffer::getInstance()->getBuffer().end();
   bool top = false;
   for (int i = 0; i < this->bufferDisplaySize; i++)
@@ -138 +138 @@
     {
       this->bufferText[i]->setText((*textLine));
-    if (textLine != ShellBuffer::getInstance()->getBuffer()->begin())
+    if (textLine != ShellBuffer::getInstance()->getBuffer().begin())
       top = true;
       textLine--;
@@ -159 +159 @@
   this->setRelCoorSoft2D(0, -(int)this->shellHeight, 1, 5);
 
-  list<char*>::const_iterator textLine = --ShellBuffer::getInstance()->getBuffer()->end();
+  list<std::string>::const_iterator textLine = --ShellBuffer::getInstance()->getBuffer().end();
   for (int i = 0; i < this->bufferDisplaySize; i++)
   {
     this->bufferText[i]->setVisibility(false);
-    if (textLine != ShellBuffer::getInstance()->getBuffer()->begin())
+    if (textLine != ShellBuffer::getInstance()->getBuffer().begin())
     {
       this->bufferText[i]->setText((*textLine));
@@ -306 +306 @@
   }
 
-  list<char*>::const_iterator textLine = --ShellBuffer::getInstance()->getBuffer()->end();
+  list<std::string>::const_iterator textLine = --ShellBuffer::getInstance()->getBuffer().end();
   bufferText = new Text*[bufferDisplaySize];
   for (unsigned int i = 0; i < bufferDisplaySize; i++)
@@ -313 +313 @@
     bufferText[i]->setAlignment(TEXT_ALIGN_LEFT);
     bufferText[i]->setParent2D(this);
-    if(textLine != ShellBuffer::getInstance()->getBuffer()->begin())
+    if(textLine != ShellBuffer::getInstance()->getBuffer().begin())
     {
       bufferText[i]->setText(*textLine);
@@ -390 +390 @@
   if (this->bufferOffset == 0)
    {
-     this->bufferIterator = ShellBuffer::getInstance()->getBuffer()->end();
+     this->bufferIterator = ShellBuffer::getInstance()->getBuffer().end();
 //     for (unsigned int i = 0; i < this->bufferDisplaySize; i++)
 //       this->bufferIterator->prevStep();
@@ -396 +396 @@
 
   // boundraries
-  if (this->bufferOffset + lineCount > (int)ShellBuffer::getInstance()->getBuffer()->size())
-    lineCount = (int)ShellBuffer::getInstance()->getBuffer()->size()- this->bufferOffset;
+  if (this->bufferOffset + lineCount > (int)ShellBuffer::getInstance()->getBuffer().size())
+    lineCount = (int)ShellBuffer::getInstance()->getBuffer().size()- this->bufferOffset;
   else if (this->bufferOffset + lineCount < 0)
     lineCount = -bufferOffset;
@@ -418 +418 @@
   }
   // redisplay the buffers
-  list<char*>::const_iterator it = this->bufferIterator;
+  list<std::string>::const_iterator it = this->bufferIterator;
   for (unsigned int i = 0; i < this->bufferDisplaySize; i++)
   {