Changeset 14718 for trunk

Timestamp:

12/03/12 21:50:11 (12 years ago)

Author:

tbretz

Message:

The workaround with the empty text to change the state is outdated and has been removed.

Location:

trunk/FACT++/src

Files:

• StateMachineDimControl.cc (modified) (2 diffs)
• StateMachineDimControl.h (modified) (1 diff)

trunk/FACT++/src/StateMachineDimControl.cc

@@ -66 +66 @@
 }
 
-int StateMachineDimControl::Write(const Time &time, const std::string &txt, int qos)
-{
-    if (txt=="")
-    {
-        return ChangeState(qos, time, Readline::GetScriptDepth(), Readline::GetScript(), fScriptUser);
+int StateMachineDimControl::ChangeState(int state)
+{
+    return ChangeState(state, Time(), Readline::GetScriptDepth(), Readline::GetScript(), fScriptUser);
         /*
          === This might be necessary for thread safety,
@@ -84 +82 @@
         return PostEvent(evt);
         */
-    }
-
-    // if (qos<fVerbosity)
-    //     return 0;
-
-    return StateMachineDim::Write(time, txt, qos);
 }
 

trunk/FACT++/src/StateMachineDimControl.h

@@ -41 +41 @@
     static bool fIsServer;
 
-    int ChangeState(int qos, const Time &time=Time(), int scriptdepth=-1, std::string scriptfile="", std::string user="");
-    int Write(const Time &time, const std::string &txt, int qos=kMessage);
+    int ChangeState(int qos, const Time &time, int scriptdepth, std::string scriptfile, std::string user);
+    int ChangeState(int state);
 
     int StartScript(const EventImp &imp, const std::string &cmd);