Changeset 14543 for trunk/FACT++/src/RemoteControl.cc

Timestamp:

10/30/12 12:53:53 (12 years ago)

Author:

tbretz

Message:

Adapted to the use of a State instance.

File:

• trunk/FACT++/src/RemoteControl.cc (modified) (3 diffs)

trunk/FACT++/src/RemoteControl.cc

@@ -53 +53 @@
 
     // Check if we have cd'ed to a valid server
-    const pair<int32_t, string> state = fImp->GetServerState(fCurrentServer);
-    if (state.first==-256)
+    const State state = fImp->GetServerState(fCurrentServer);
+    if (state.index==-256)
         return beg + "> ";
 
@@ -61 +61 @@
 
     // If no match found or something wrong found just output the server
-    if (state.first<-1)
+    if (state.index<-1)
         return beg + " " + serv + "> ";
 
     // If everything found add the state to the server
-    return beg + " " + serv + ":\033[32m\033[1m" + state.second + "\033[0m> ";
+    return beg + " " + serv + ":\033[32m\033[1m" + state.name + "\033[0m> ";
 }
 
@@ -78 +78 @@
         return beg + "> ";
 
-    const pair<int32_t, string> state = fImp->GetServerState(fCurrentServer);
-    if (state.first==-256)
+    const State state = fImp->GetServerState(fCurrentServer);
+    if (state.index==-256)
         return beg + "> ";//Form("\n[%d] \033[34m\033[1m%s\033[0m> ", GetLine(), fCurrentServer.c_str());
 
     // If no match found or something wrong found just output the server
-    if (state.first<-1)
+    if (state.index<-1)
         return beg + " " + fCurrentServer + "> ";
 
     // If everything found add the state to the server
-    return beg + " " + fCurrentServer + ":" + state.second + "> ";
+    return beg + " " + fCurrentServer + ":" + state.name + "> ";
 }