Changeset 10496 for trunk

Timestamp:

04/29/11 13:06:49 (14 years ago)

Author:

tbretz

Message:

Removed usage of Tools::Form.

Location:

trunk/FACT++/src

Files:

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

trunk/FACT++/src/Console.cc

@@ -133 +133 @@
 {
     const string siz = fLogO.GetSizeStr();
-    return fContinous ?
-        Tools::Form("[%d]",    GetLine()) :
-        Tools::Form("[%d:%s]", GetLine(), siz.c_str());
+
+    string rc = "[";
+    rc += GetLine();
+    return fContinous ? rc+']' : rc+':'+siz+']';
 }
 

trunk/FACT++/src/Readline.cc

@@ -536 +536 @@
 string Readline::GetLinePrompt() const
 {
-    return Tools::Form("[%d]", fLine);
+    string rc = "[";
+    rc += fLine;
+    return rc+"]";
 }
 

trunk/FACT++/src/ReadlineWindow.cc

@@ -290 +290 @@
 
     // Compile a proper format string
-    const string fmt = Tools::Form("%%-%ds", max);
+    string fmt = "%-";
+    fmt += max;
+    fmt + 's';
 
     // loop over all entries and display them

trunk/FACT++/src/StateMachineImp.cc

@@ -712 +712 @@
 {
     const StateNames::const_iterator i = fStateNames.find(state);
-    return i==fStateNames.end() || i->second.first.empty() ? Tools::Form("%d", state) : i->second.first;
+
+    string rc;
+    rc += state;
+    return i==fStateNames.end() || i->second.first.empty() ? rc : i->second.first;
 }
 
@@ -748 +751 @@
 {
     const string &str = GetStateName(state);
-    if (str==Tools::Form("%d", state))
+
+    string s;
+    s += state;
+    if (str==s)
         return str;
-    return str.empty() ? Tools::Form("%d", state) : (str+Tools::Form("[%d]", state));
+
+    return str.empty() ? s : (str+'['+s+']');
 }
 

trunk/FACT++/src/WindowLog.cc

@@ -273 +273 @@
         u = 'M';
     }
-    return Tools::Form("%d%c", s, u);
+
+    string rc;
+    rc += s;
+    return rc + u;
 }