Changeset 10429 for trunk/FACT++/src/LocalControl.cc

Timestamp:

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

Author:

tbretz

Message:

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

File:

• trunk/FACT++/src/LocalControl.cc (modified) (1 diff)

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()+"> ";
 }