Index: /trunk/FACT++/src/Console.cc =================================================================== --- /trunk/FACT++/src/Console.cc (revision 10428) +++ /trunk/FACT++/src/Console.cc (revision 10429) @@ -134,5 +134,6 @@ 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()); } Index: /trunk/FACT++/src/Description.cc =================================================================== --- /trunk/FACT++/src/Description.cc (revision 10428) +++ /trunk/FACT++/src/Description.cc (revision 10429) @@ -46,4 +46,5 @@ using namespace std; +using namespace Tools; // -------------------------------------------------------------------------- Index: /trunk/FACT++/src/DimServiceInfoList.cc =================================================================== --- /trunk/FACT++/src/DimServiceInfoList.cc (revision 10428) +++ /trunk/FACT++/src/DimServiceInfoList.cc (revision 10429) @@ -638,5 +638,5 @@ 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 Index: /trunk/FACT++/src/LocalControl.cc =================================================================== --- /trunk/FACT++/src/LocalControl.cc (revision 10428) +++ /trunk/FACT++/src/LocalControl.cc (revision 10429) @@ -1,29 +1,13 @@ #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 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()+"> "; } Index: /trunk/FACT++/src/MessageImp.cc =================================================================== --- /trunk/FACT++/src/MessageImp.cc (revision 10428) +++ /trunk/FACT++/src/MessageImp.cc (revision 10429) @@ -151,5 +151,5 @@ 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); Index: /trunk/FACT++/src/Readline.cc =================================================================== --- /trunk/FACT++/src/Readline.cc (revision 10428) +++ /trunk/FACT++/src/Readline.cc (revision 10429) @@ -536,5 +536,5 @@ string Readline::GetLinePrompt() const { - return Form("[%d]", fLine); + return Tools::Form("[%d]", fLine); } @@ -996,5 +996,5 @@ return false; - str = Trim(buf); + str = Tools::Trim(buf); free(buf); @@ -1024,5 +1024,6 @@ 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); Index: /trunk/FACT++/src/ReadlineWindow.cc =================================================================== --- /trunk/FACT++/src/ReadlineWindow.cc (revision 10428) +++ /trunk/FACT++/src/ReadlineWindow.cc (revision 10429) @@ -290,5 +290,5 @@ // 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 Index: /trunk/FACT++/src/RemoteControl.cc =================================================================== --- /trunk/FACT++/src/RemoteControl.cc (revision 10428) +++ /trunk/FACT++/src/RemoteControl.cc (revision 10429) @@ -46,5 +46,5 @@ // 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,10 +55,10 @@ 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 Index: /trunk/FACT++/src/RemoteControl.h =================================================================== --- /trunk/FACT++/src/RemoteControl.h (revision 10428) +++ /trunk/FACT++/src/RemoteControl.h (revision 10429) @@ -74,5 +74,5 @@ 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()) { Index: /trunk/FACT++/src/ServiceList.cc =================================================================== --- /trunk/FACT++/src/ServiceList.cc (revision 10428) +++ /trunk/FACT++/src/ServiceList.cc (revision 10429) @@ -697,5 +697,5 @@ out << kBold << " " << server << endl; - DimCurrentInfo info2(Form("%s/SERVICE_LIST", server.c_str()).c_str(), const_cast("")); + DimCurrentInfo info2((server+"/SERVICE_LIST").c_str(), const_cast("")); string buffer2; Index: /trunk/FACT++/src/State.cc =================================================================== --- /trunk/FACT++/src/State.cc (revision 10428) +++ /trunk/FACT++/src/State.cc (revision 10429) @@ -25,4 +25,5 @@ using namespace std; +using namespace Tools; // -------------------------------------------------------------------------- Index: /trunk/FACT++/src/StateMachineDim.cc =================================================================== --- /trunk/FACT++/src/StateMachineDim.cc (revision 10428) +++ /trunk/FACT++/src/StateMachineDim.cc (revision 10429) @@ -68,7 +68,7 @@ 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("")), - fSrvVersion(Form("%s/VERSION", name.c_str()).c_str(), const_cast(fVersion)), - fDescriptionStates(Form("%s/STATE_LIST", name.c_str()).c_str(), const_cast("")) + fSrvState((name+"/STATE").c_str(), const_cast("")), + fSrvVersion((name+"/VERSION").c_str(), const_cast(fVersion)), + fDescriptionStates((name+"/STATE_LIST").c_str(), const_cast("")) { // WARNING: This exit handler is GLOBAL! Index: /trunk/FACT++/src/StateMachineImp.cc =================================================================== --- /trunk/FACT++/src/StateMachineImp.cc (revision 10428) +++ /trunk/FACT++/src/StateMachineImp.cc (revision 10429) @@ -554,5 +554,6 @@ 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,5 +587,6 @@ 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,5 +703,5 @@ { 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,7 +739,7 @@ { 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)); } Index: /trunk/FACT++/src/WindowLog.cc =================================================================== --- /trunk/FACT++/src/WindowLog.cc (revision 10428) +++ /trunk/FACT++/src/WindowLog.cc (revision 10429) @@ -273,5 +273,5 @@ u = 'M'; } - return Form("%d%c", s, u); + return Tools::Form("%d%c", s, u); } Index: /trunk/FACT++/src/tools.cc =================================================================== --- /trunk/FACT++/src/tools.cc (revision 10428) +++ /trunk/FACT++/src/tools.cc (revision 10429) @@ -14,5 +14,5 @@ using namespace std; -string Format(const char *fmt, va_list &ap) +string Tools::Format(const char *fmt, va_list &ap) { int n=256; @@ -38,5 +38,5 @@ } -string Form(const char *fmt, ...) +string Tools::Form(const char *fmt, ...) { va_list ap; @@ -61,5 +61,5 @@ //! 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 Index: /trunk/FACT++/src/tools.h =================================================================== --- /trunk/FACT++/src/tools.h (revision 10428) +++ /trunk/FACT++/src/tools.h (revision 10429) @@ -1,5 +1,8 @@ #include -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); +}