Changeset 10498 for trunk/FACT++/src

Timestamp:

04/29/11 13:25:45 (14 years ago)

Author:

tbretz

Message:

Use stringstreams to replace Form not strings and +=

Location:

trunk/FACT++/src

Files:

• Console.cc (modified) (2 diffs)
• Readline.cc (modified) (2 diffs)
• ReadlineWindow.cc (modified) (3 diffs)
• StateMachineImp.cc (modified) (2 diffs)
• WindowLog.cc (modified) (2 diffs)

trunk/FACT++/src/Console.cc

@@ -13 +13 @@
 #include "Console.h"
 
+#include <sstream>
 #include <iostream>
 
@@ -134 +135 @@
     const string siz = fLogO.GetSizeStr();
 
-    string rc = "[";
-    rc += GetLine();
-    return fContinous ? rc+']' : rc+':'+siz+']';
+    ostringstream str;
+    str << '[' << GetLine();
+    return fContinous ? str.str()+']' : str.str()+':'+siz+']';
 }
 

trunk/FACT++/src/Readline.cc

@@ -55 +55 @@
 #include "Readline.h"
 
+#include <sstream>
 #include <fstream>
 #include <iostream>
@@ -536 +537 @@
 string Readline::GetLinePrompt() const
 {
-    string rc = "[";
-    rc += fLine;
-    return rc+"]";
+    ostringstream str;
+    str << '[' << fLine << ']';
+    return str.str();
 }
 

trunk/FACT++/src/ReadlineWindow.cc

@@ -37 +37 @@
 #include "Shell.h"
 
+#include <sstream>
 #include <iostream>
 #include <string.h> // strlen
@@ -290 +291 @@
 
     // Compile a proper format string
-    string fmt = "%-";
-    fmt += max;
-    fmt + 's';
+    ostringstream fmt;
+    fmt << "%-" << max << 's';
 
     // loop over all entries and display them
@@ -307 +307 @@
 
         // Display an entry
-        wprintw(fWindow, fmt.c_str(), matches[i+1]);
+        wprintw(fWindow, fmt.str().c_str(), matches[i+1]);
     }
 

trunk/FACT++/src/StateMachineImp.cc

@@ -715 +715 @@
     const StateNames::const_iterator i = fStateNames.find(state);
 
-    string rc;
-    rc += state;
-    return i==fStateNames.end() || i->second.first.empty() ? rc : i->second.first;
+    ostringstream s;
+    s << state;
+    return i==fStateNames.end() || i->second.first.empty() ? s.str() : i->second.first;
 }
 
@@ -754 +754 @@
     const string &str = GetStateName(state);
 
-    string s;
-    s += state;
-    if (str==s)
+    ostringstream s;
+    s << state;
+    if (str==s.str())
         return str;
 
-    return str.empty() ? s : (str+'['+s+']');
+    return str.empty() ? s.str() : (str+'['+s.str()+']');
 }
 

trunk/FACT++/src/WindowLog.cc

@@ -16 +16 @@
 #include "WindowLog.h"
 
+#include <sstream>
 #include <iostream>
 #include <algorithm>
@@ -274 +275 @@
     }
 
-    string rc;
-    rc += s;
-    return rc + u;
+    ostringstream str;
+    str << s << u;
+    return str.str();
 }