Changeset 10429 for trunk/FACT++

Timestamp:

04/20/11 16:58:05 (13 years ago)

Author:

tbretz

Message:

Moved the tools function into their own namespace to get rid of problems whenlinking with root.

Location:

trunk/FACT++/src

Files:

• Console.cc (modified) (1 diff)
• Description.cc (modified) (1 diff)
• DimServiceInfoList.cc (modified) (1 diff)
• LocalControl.cc (modified) (1 diff)
• MessageImp.cc (modified) (1 diff)
• Readline.cc (modified) (3 diffs)
• ReadlineWindow.cc (modified) (1 diff)
• RemoteControl.cc (modified) (2 diffs)
• RemoteControl.h (modified) (1 diff)
• ServiceList.cc (modified) (1 diff)
• State.cc (modified) (1 diff)
• StateMachineDim.cc (modified) (1 diff)
• StateMachineImp.cc (modified) (4 diffs)
• WindowLog.cc (modified) (1 diff)
• tools.cc (modified) (3 diffs)
• tools.h (modified) (1 diff)

trunk/FACT++/src/Console.cc

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

trunk/FACT++/src/Description.cc

@@ -46 +46 @@
 
 using namespace std;
+using namespace Tools;
 
 // --------------------------------------------------------------------------

trunk/FACT++/src/DimServiceInfoList.cc

@@ -638 +638 @@
 void DimServiceInfoList::SendDimCommand(const string &server, string str, ostream &lout) const
 {
-    str = Trim(str);
+    str = Tools::Trim(str);
 
     // Find the delimiter between the command name and the data

trunk/FACT++/src/LocalControl.cc

@@ -1 +1 @@
 #include "LocalControl.h"
-
-#include "tools.h"
 
 string LocalConsole::GetUpdatePrompt() const
 {
-    // Compile a string like "server:state> "
-    const string end =
-        Form("\033[34m\033[1m%s\033[0m:\033[32m\033[1m%s\033[0m> ",
-             fName.c_str(), fStateMachine->GetStateName().c_str());
-
-    // If we are continously flushing the buffer omit the buffer size
-    // If we are buffering show the buffer size
-    return GetLinePrompt() + " " + end;
+    return GetLinePrompt()+" "
+        "\033[34m\033[1m"+fName+"\033[0m:"
+        "\033[32m\033[1m"+fStateMachine->GetStateName()+"\033[0m> ";
 }
-
-//#include <boost/regex.hpp>
 
 string LocalShell::GetUpdatePrompt() const
 {
-    //const string s = (beg[0]=='\n'?beg.substr(1):beg) + " " + end;
-    //return boost::regex_replace(s, boost::regex("\033[[0-9]+m"), "");
-
-    const string end =
-        Form("%s:%s> ", fName.c_str(),
-             fStateMachine->GetStateName().c_str());
-
-    return GetLinePrompt() + " " + end;
+    return GetLinePrompt()+' '+fName+':'+fStateMachine->GetStateName()+"> ";
 }

trunk/FACT++/src/MessageImp.cc

@@ -151 +151 @@
     va_list ap;
     va_start(ap, fmt);
-    string str = Format(fmt, ap);
+    string str = Tools::Format(fmt, ap);
     va_end(ap);
     return Update(str, severity);

trunk/FACT++/src/Readline.cc

@@ -536 +536 @@
 string Readline::GetLinePrompt() const
 {
-    return Form("[%d]", fLine);
+    return Tools::Form("[%d]", fLine);
 }
 
@@ -996 +996 @@
         return false;
 
-    str = Trim(buf);
+    str = Tools::Trim(buf);
 
     free(buf);
@@ -1024 +1024 @@
     Shutdown(buf ? buf : "");
 
-    const string str = !buf || (rl_done && rl_pending_input==4) ? ".q" : Trim(buf);
+    const string str = !buf || (rl_done && rl_pending_input==4)
+        ? ".q" : Tools::Trim(buf);
 
     free(buf);

trunk/FACT++/src/ReadlineWindow.cc

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

trunk/FACT++/src/RemoteControl.cc

@@ -46 +46 @@
     // If we are continously flushing the buffer omit the buffer size
     // If we are buffering show the buffer size
-    const string beg = "\n" + GetLinePrompt();
+    const string beg = '\n' + GetLinePrompt();
 
     // If we have not cd'ed to a server show only the line start
@@ -55 +55 @@
     const ClientList::const_iterator l = fClientList.find(fCurrentServer);
     if (l==fClientList.end())
-        return beg + "> ";//Form("\n[%d] \033[34m\033[1m%s\033[0m> ", GetLine(), fCurrentServer.c_str());
+        return beg + "> ";
 
     const State state = GetState(fCurrentServer, l->second->GetState());
 
     // The server
-    const string serv = Form("\033[34m\033[1m%s\033[0m", fCurrentServer.c_str());
+    const string serv = "\033[34m\033[1m"+fCurrentServer+"\033[0m";
 
     // If no match found or something wrong found just output the server

trunk/FACT++/src/RemoteControl.h

@@ -74 +74 @@
         const string b = string(T::GetBuffer());
         const string s = b.substr(0, start);
-        const string l = Trim(s.c_str());
+        const string l = Tools::Trim(s.c_str());
         if (l.empty())
         {

trunk/FACT++/src/ServiceList.cc

@@ -697 +697 @@
         out << kBold << " " << server << endl;
 
-        DimCurrentInfo info2(Form("%s/SERVICE_LIST", server.c_str()).c_str(), const_cast<char*>(""));
+        DimCurrentInfo info2((server+"/SERVICE_LIST").c_str(), const_cast<char*>(""));
 
         string buffer2;

trunk/FACT++/src/State.cc

@@ -25 +25 @@
 
 using namespace std;
+using namespace Tools;
 
 // --------------------------------------------------------------------------

trunk/FACT++/src/StateMachineDim.cc

@@ -68 +68 @@
 StateMachineDim::StateMachineDim(ostream &out, const std::string &name)
 : StateMachine(out, name), DimStart(name, *this), fLog(name, out),
-    fSrvState(Form("%s/STATE", name.c_str()).c_str(), const_cast<char*>("")),
-    fSrvVersion(Form("%s/VERSION", name.c_str()).c_str(), const_cast<int&>(fVersion)),
-    fDescriptionStates(Form("%s/STATE_LIST", name.c_str()).c_str(), const_cast<char*>(""))
+    fSrvState((name+"/STATE").c_str(), const_cast<char*>("")),
+    fSrvVersion((name+"/VERSION").c_str(), const_cast<int&>(fVersion)),
+    fDescriptionStates((name+"/STATE_LIST").c_str(), const_cast<char*>(""))
 {
     // WARNING: This exit handler is GLOBAL!

trunk/FACT++/src/StateMachineImp.cc

@@ -554 +554 @@
 EventImp &StateMachineImp::AddTransition(int targetstate, const char *name, int s1, int s2, int s3, int s4, int s5)
 {
-    return AddTransition(targetstate, name, Form("%d %d %d %d %d", s1, s2, s3, s4, s5).c_str(), "");
+    return AddTransition(targetstate, name,
+                         Tools::Form("%d %d %d %d %d", s1, s2, s3, s4, s5).c_str(), "");
 }
 
@@ -586 +587 @@
 EventImp &StateMachineImp::AddTransition(int targetstate, const char *name, const char *fmt, int s1, int s2, int s3, int s4, int s5)
 {
-    return AddTransition(targetstate, name, Form("%d %d %d %d %d", s1, s2, s3, s4, s5).c_str(), fmt);
+    return AddTransition(targetstate, name,
+                         Tools::Form("%d %d %d %d %d", s1, s2, s3, s4, s5).c_str(), fmt);
 }
 
@@ -701 +703 @@
 {
     const StateNames::const_iterator i = fStateNames.find(state);
-    return i==fStateNames.end() || i->second.first.empty() ? Form("%d", state) : i->second.first;
+    return i==fStateNames.end() || i->second.first.empty() ? Tools::Form("%d", state) : i->second.first;
 }
 
@@ -737 +739 @@
 {
     const string &str = GetStateName(state);
-    if (str==Form("%d", state))
+    if (str==Tools::Form("%d", state))
         return str;
-    return str.empty() ? Form("%d", state) : (str+Form("[%d]", state));
+    return str.empty() ? Tools::Form("%d", state) : (str+Tools::Form("[%d]", state));
 }
 

trunk/FACT++/src/WindowLog.cc

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

trunk/FACT++/src/tools.cc

@@ -14 +14 @@
 using namespace std;
 
-string Format(const char *fmt, va_list &ap)
+string Tools::Format(const char *fmt, va_list &ap)
 {
     int n=256;
@@ -38 +38 @@
 }
 
-string Form(const char *fmt, ...)
+string Tools::Form(const char *fmt, ...)
 {
     va_list ap;
@@ -61 +61 @@
 //!    a std::string with the whitespaces removed from buf
 //
-string Trim(const string &str)
+string Tools::Trim(const string &str)
 {
     // Trim Both leading and trailing spaces

trunk/FACT++/src/tools.h

@@ -1 +1 @@
 #include <string>
 
-std::string Format(const char *fmt, va_list &ap);
-std::string Form(const char *fmt, ...);
-std::string Trim(const std::string &str);
+namespace Tools
+{
+    std::string Format(const char *fmt, va_list &ap);
+    std::string Form(const char *fmt, ...);
+    std::string Trim(const std::string &str);
+}