Import Geant4 1.1.0 source tree

source/interfaces/GAG/include/G4UIGAG.hh

@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4UIGAG.hh,v 1.3.4.1 1999/12/07 20:49:05 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4UIGAG.hh,v 1.3.4.1.2.2 1999/12/14 07:07:55 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // G4UIGAG.hh
 // GAG(Geant4 adaptive GUI) interface class
@@ -20,8 +20,8 @@
 
 #include "G4UIsession.hh"
 #include "G4UImanager.hh"
-#include <fstream.h>
-#include <g4std/vector>
+#include "g4std/fstream"
+#include "g4std/vector"
 
 enum UImode { terminal_mode , java_mode, tcl_mode };
 enum ChangeOfTree  { notChanged=0, added, deleted, addedAndDeleted };

source/interfaces/GAG/src/G4UIGAG.cc

@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4UIGAG.cc,v 1.6.2.1.2.1 1999/12/07 20:49:05 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4UIGAG.cc,v 1.6.2.1.2.1.2.7 1999/12/17 12:04:58 johna Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // G4UIGAG.cc
 // 18.Feb.98 M.Nagamatu and T.Kodama created G4UIGAG from G4UIterminal
@@ -16,15 +16,11 @@
 #include "G4UIcommandTree.hh"
 #include "G4UIcommand.hh"
 #include "G4UIcommandStatus.hh"
-#ifdef WIN32
-#  include <Strstrea.h>
-#else
-#  include <strstream.h>
-#endif
+#include "g4std/strstream"
 
 G4UIGAG::G4UIGAG(): TVersion("T1.0a"), JVersion("J1.0a")
 {
-  //G4cout << "G4UIGAG: Apr15,98." << endl;
+  //G4cout << "G4UIGAG: Apr15,98." << G4endl;
   prefix = "/";
   UI = G4UImanager::GetUIpointer();
   UI->SetSession(this);
@@ -50,7 +46,7 @@ G4UIGAG::~G4UIGAG()
   {
      UI->SetSession(NULL);
      UI->SetCoutDestination(NULL);
-     //     G4cout << "GAG session deleted" << endl;
+     //     G4cout << "GAG session deleted" << G4endl;
   }
 }                                                 
 
@@ -72,7 +68,7 @@ G4UIsession * G4UIGAG::SessionStart()
 void G4UIGAG::PauseSessionStart(G4String msg)
 {
   promptCharacter = msg;
-  G4cout << "@@PROMPT \"" << promptCharacter << "\"" << endl;
+  G4cout << "@@PROMPT \"" << promptCharacter << "\"" << G4endl;
   iCont = true;
   G4String newCommand = GetCommand();
   while( iCont )
@@ -93,16 +89,16 @@ void G4UIGAG::ExecuteCommand(G4String aCommand)
     case fCommandSucceeded:
       break;
     case fCommandNotFound:
-      G4cerr << "command not found" << endl;
+      G4cerr << "command not found" << G4endl;
       break;
     case fIllegalApplicationState:
-      G4cerr << "illegal application state -- command refused" << endl;
+      G4cerr << "illegal application state -- command refused" << G4endl;
       break;
     case fParameterOutOfRange:
     case fParameterUnreadable:
     case fParameterOutOfCandidates:
     default:
-      G4cerr << "command refused (" << commandStatus << ")" << endl;
+      G4cerr << "command refused (" << commandStatus << ")" << G4endl;
     }
   }else{
     switch(commandStatus) {
@@ -121,22 +117,22 @@ void G4UIGAG::ExecuteCommand(G4String aCommand)
       }
       break;
     case fCommandNotFound:
-      G4cout << "@@ErrResult \"command not found.\"" << endl;
+      G4cout << "@@ErrResult \"command not found.\"" << G4endl;
       break;
     case fIllegalApplicationState:
-      G4cout << "@@ErrResult \"Illegal application state -- command refused\"" << endl;
+      G4cout << "@@ErrResult \"Illegal application state -- command refused\"" << G4endl;
       break;
     case fParameterOutOfRange:
-      G4cout << "@@ErrResult \"Parameter Out of Range.\"" << endl;
+      G4cout << "@@ErrResult \"Parameter Out of Range.\"" << G4endl;
       break;
     case fParameterUnreadable:
-      G4cout << "@@ErrResult \"Parameter Unreadable.\"" << endl;
+      G4cout << "@@ErrResult \"Parameter Unreadable.\"" << G4endl;
       break;
     case fParameterOutOfCandidates:
-      G4cout << "@@ErrResult \"Parameter Out of Candidates.\"" << endl;
+      G4cout << "@@ErrResult \"Parameter Out of Candidates.\"" << G4endl;
       break;
     default:
-      G4cout << "@@ErrResult \"command refused (" << commandStatus << ")\"" << endl;
+      G4cout << "@@ErrResult \"command refused (" << commandStatus << ")\"" << G4endl;
     }
   }
 }
@@ -144,13 +140,13 @@ void G4UIGAG::ExecuteCommand(G4String aCommand)
 
 G4int G4UIGAG::ReceiveG4cout(G4String coutString)
 {
-  cout << coutString << flush;
+  G4std::cout << coutString << G4std::flush;
   return 0;
 }
 
 G4int G4UIGAG::ReceiveG4cerr(G4String cerrString)
 {
-  cerr << cerrString << flush;
+  G4std::cerr << cerrString << G4std::flush;
   return 0;
 }                                                    
 
@@ -167,15 +163,15 @@ G4String G4UIGAG::GetCommand()
   {
     G4UIcommandTree* tree = UI->GetTree();
     if ( uiMode != terminal_mode ){
-      G4cout << "@@PROMPT \"" << promptCharacter << "\"" << endl;
+      G4cout << "@@PROMPT \"" << promptCharacter << "\"" << G4endl;
     }
     if ( uiMode != java_mode ){
-      G4cout << promptCharacter << "> " << flush;
+      G4cout << promptCharacter << "> " << G4std::flush;
     }else{
-      G4cout << "@@Ready" << endl;
+      G4cout << "@@Ready" << G4endl;
     }
-    newCommand.readLine( cin, FALSE );
-    if (!cin.good()) { cin.clear(); newCommand = nullString; iExit=false;break;}
+    newCommand.readLine( G4cin, FALSE );
+    if (!G4cin.good()) { G4cin.clear(); newCommand = nullString; iExit=false;break;}
 
     newCommand = newCommand.strip(G4String::leading);
     if( newCommand.length() < 1) { break; }
@@ -184,8 +180,8 @@ G4String G4UIGAG::GetCommand()
     {
       G4String newLine;
       newCommand.remove(newCommand.length()-1);
-      newLine.readLine( cin );
-      if (!cin.good()) { cin.clear(); newCommand = nullString; iExit=false;break;}
+      newLine.readLine( G4cin );
+      if (!G4cin.good()) { G4cin.clear(); newCommand = nullString; iExit=false;break;}
       newCommand.append(newLine);
     }
 
@@ -195,23 +191,23 @@ G4String G4UIGAG::GetCommand()
     // -------------------- nC.toUpper();
     if( nC == "@@GAGmodeJAVA" ) {
       uiMode = java_mode;
-      G4cout << endl << "@@Version " << JVersion << endl;
+      G4cout << G4endl << "@@Version " << JVersion << G4endl;
       SendCommandProperties(tree);
       NotifyStateChange();
     }
     else if( nC == "@@GAGmodeTcl" ) {
       uiMode = tcl_mode;
-      G4cout << endl << "@@Version " << TVersion << endl;
+      G4cout << G4endl << "@@Version " << TVersion << G4endl;
       SendCommandProperties(tree);
       NotifyStateChange();
     }
     else if( nC(0) == '#' )
-      { G4cout << nC << endl; }
+      { G4cout << nC << G4endl; }
 
     else if( nC == "ls"  || nC(0,3) == "ls " )
     { ListDirectory( nC ); }
     else if( nC == "pwd" )
-    { G4cout << "Current Working Directory : " << prefix << endl; }
+    { G4cout << "Current Working Directory : " << prefix << G4endl; }
     else if( nC(0,2) == "cd"  || nC(0,3) == "cd " )
     { ChangeDirectory( nC ); }
     else if(  nC == "help" || nC(0,5) == "help ")
@@ -222,36 +218,36 @@ G4String G4UIGAG::GetCommand()
     {
       G4int nh = UI->GetNumberOfHistory();
       for(int i=0;i<nh;i++)
-      { G4cout << i << ": " << UI->GetPreviousCommand(i) << endl; }
+      { G4cout << i << ": " << UI->GetPreviousCommand(i) << G4endl; }
     }
     else if( nC(0) == '!' )
     {
       G4String ss = nC(1,nC.length()-1);
       G4int vl;
       const char* tt = ss;
-      istrstream is((char*)tt);
+      G4std::istrstream is((char*)tt);
       is >> vl;
       G4int nh = UI->GetNumberOfHistory();
       if(vl>=0 && vl<nh)
       { 
         newCommand = UI->GetPreviousCommand(vl); 
-        G4cout << newCommand << endl;
+        G4cout << newCommand << G4endl;
         break;
       }
       else
-      { G4cerr << "history " << vl << " is not found." << endl; }
+      { G4cerr << "history " << vl << " is not found." << G4endl; }
     }
     else if( nC(0,4) == "exit" )
     { 
       if( iCont )
       { 
 	if ( uiMode == terminal_mode){
-	  G4cerr << "You are now processing RUN." << endl;
-	  G4cerr << "Please abrot it using \"/run/abort\" command first" << endl;
-	  G4cerr << " and use \"continue\" command until the application" << endl;
-	  G4cerr << " becomes to Idle." << endl;
+	  G4cerr << "You are now processing RUN." << G4endl;
+	  G4cerr << "Please abrot it using \"/run/abort\" command first" << G4endl;
+	  G4cerr << " and use \"continue\" command until the application" << G4endl;
+	  G4cerr << " becomes to Idle." << G4endl;
 	}else{
-	  G4cout << "@@ErrResult \"You are now processing RUN.\"" << endl;
+	  G4cout << "@@ErrResult \"You are now processing RUN.\"" << G4endl;
 	}
       }
       else
@@ -307,7 +303,7 @@ G4String G4UIGAG::GetFullPath( G4String aNewCommand )
 
 void G4UIGAG::SessionTerminate()
 {
-  G4cout << "***** Terminal session end *****" << endl;
+  G4cout << "***** Terminal session end *****" << G4endl;
 }
 
 void G4UIGAG::ShowCurrent( G4String newCommand )
@@ -316,14 +312,14 @@ void G4UIGAG::ShowCurrent( G4String newCommand )
   G4String curV = UI->GetCurrentValues(theCommand);
   if( ! (curV.isNull()||curV(0)=='\0' ) ) {
     if (uiMode == terminal_mode){
-      G4cout << "Current value(s) of the parameter(s) : " << curV << endl;
+      G4cout << "Current value(s) of the parameter(s) : " << curV << G4endl;
     }else{
-      G4cout << "@@CurrentValue " << curV << endl;
+      G4cout << "@@CurrentValue " << curV << G4endl;
     }
   } else if (uiMode == terminal_mode){
-      G4cout << "Current value is not available." << endl;
+      G4cout << "Current value is not available." << G4endl;
     } else {
-      G4cout << "@@ErrResult \"Current value is not available.\"" << endl;
+      G4cout << "@@ErrResult \"Current value is not available.\"" << G4endl;
     }
 }
 
@@ -349,7 +345,7 @@ void G4UIGAG::ChangeDirectory( G4String newCommand )
   { prefix += "/"; }
   if( FindDirPath( prefix ) == NULL )
   {
-    G4cout << "Directory <" << prefix << "> is not found." << endl;
+    G4cout << "Directory <" << prefix << "> is not found." << G4endl;
     prefix = savedPrefix;
   }
 }
@@ -377,7 +373,7 @@ void G4UIGAG::ListDirectory( G4String newCommand )
   { targetDir += "/"; }
   G4UIcommandTree * commandTree = FindDirPath( targetDir );
   if( commandTree == NULL )
-  { G4cout << "Directory <" << targetDir << "> is not found." << endl; }
+  { G4cout << "Directory <" << targetDir << "> is not found." << G4endl; }
   else
   { commandTree->ListCurrent(); }
 }
@@ -400,7 +396,7 @@ void G4UIGAG::TerminalHelp(G4String newCommand)
     }
     else
     {
-      G4cout << "Command <" << newValue << " is not found." << endl;
+      G4cout << "Command <" << newValue << " is not found." << G4endl;
       return;
     }
   }
@@ -420,12 +416,12 @@ void G4UIGAG::TerminalHelp(G4String newCommand)
   floor[iFloor]->ListCurrentWithNum();
   // 1998 Oct 2 non-number input
   while(1){
-    G4cout << endl << "Type the number ( 0:end, -n:n level back ) : "<<flush;
-    cin >> i;
-    if(!cin.good()){
-      cin.clear();
-      cin.ignore(30,'\n');
-      G4cout << endl << "Not a number, once more" << endl; continue;}
+    G4cout << G4endl << "Type the number ( 0:end, -n:n level back ) : "<<G4std::flush;
+    G4cin >> i;
+    if(!G4cin.good()){
+      G4cin.clear();
+      G4cin.ignore(30,'\n');
+      G4cout << G4endl << "Not a number, once more" << G4endl; continue;}
     else if( i < 0 ){
       iFloor += i;
       if( iFloor < 0 ) iFloor = 0;
@@ -450,11 +446,11 @@ void G4UIGAG::TerminalHelp(G4String newCommand)
     }
 
   }
-  G4cout << "Exit from HELP." << endl << endl;
-  G4cout << endl;
-  // cin.flush();
+  G4cout << "Exit from HELP." << G4endl << G4endl;
+  G4cout << G4endl;
+  // G4cin.flush();
   char temp[100];
-  cin.getline( temp, 100 );
+  G4cin.getline( temp, 100 );
 }
 
 
@@ -508,25 +504,25 @@ G4UIcommandTree * G4UIGAG::FindDirPath(G4String newCommand)
 void G4UIGAG::SendCommandProperties(G4UIcommandTree * tree)
 {
   if( tree == NULL ) { 
-    G4cerr << "GetTree() returnes null." << endl;
+    G4cerr << "GetTree() returnes null." << G4endl;
     return;
   }
   if (uiMode == java_mode){
-    G4cout << "@@JTreeBegin" << endl;
+    G4cout << "@@JTreeBegin" << G4endl;
     CodeGenJavaTree(tree, 0);  
-    G4cout << "@@JTreeEnd" << endl;
+    G4cout << "@@JTreeEnd" << G4endl;
     CodeGenJavaParams(tree, 0);
   }else{
-    G4cout << endl << "@@maketree_start" << endl;
+    G4cout << G4endl << "@@maketree_start" << G4endl;
     CodeGenTclTree(tree,0);  
-    G4cout << "@@maketree_end" << endl;
+    G4cout << "@@maketree_end" << G4endl;
     CodeGenTclParams(tree, 0);
   }
 }
 void G4UIGAG::SendParameterProperties(G4UIcommandTree * tree)
 {
   if( tree == NULL ) { 
-    G4cerr << "GetTree() returnes null." << endl;
+    G4cerr << "GetTree() returnes null." << G4endl;
     return;
   }
   if (uiMode == java_mode){
@@ -544,7 +540,7 @@ void G4UIGAG::CodeGenJavaTree(G4UIcommandTree * tree, int level)
 
   if(level!=0) {
     for(int i=0; i<commandEntry; i++){
-      G4cout << tree->GetCommand(i+1)->GetCommandPath() << endl;
+      G4cout << tree->GetCommand(i+1)->GetCommandPath() << G4endl;
     }
   }
   if(treeEntry == 0) return; //end recursion
@@ -570,9 +566,9 @@ void G4UIGAG::CodeGenJavaParams(G4UIcommandTree * tree, int level) //recursive
 
   for(i=0; i< treeEntry; i++) {
     treeLink = tree->GetTree(i+1);
-    G4cout << "@@JDirGuideBegin" << endl;
-    G4cout << treeLink->GetPathName() << endl << treeLink->GetTitle() << endl;
-    G4cout << "@@JDirGuideEnd" << endl;
+    G4cout << "@@JDirGuideBegin" << G4endl;
+    G4cout << treeLink->GetPathName() << G4endl << treeLink->GetTitle() << G4endl;
+    G4cout << "@@JDirGuideEnd" << G4endl;
     CodeGenJavaParams(treeLink, level+1); 
   }
 }
@@ -585,9 +581,9 @@ void G4UIGAG::SendAParamProperty(G4UIcommand * Comp)
   char c[2];
   guidanceEntry = Comp->GetGuidanceEntries();
   parameterEntry = Comp->GetParameterEntries();
-  G4cout << "@@JParamBegin" << endl;
-  G4cout << Comp->GetCommandPath() << endl;
-  G4cout << guidanceEntry << endl;
+  G4cout << "@@JParamBegin" << G4endl;
+  G4cout << Comp->GetCommandPath() << G4endl;
+  G4cout << guidanceEntry << G4endl;
   for (int j=0; j<guidanceEntry; j++){
     title = Comp->GetGuidanceLine(j);
     title2 = "";
@@ -601,21 +597,21 @@ void G4UIGAG::SendAParamProperty(G4UIcommand * Comp)
 	title2.append(c);
       }
     }
-    G4cout << title2 << endl;
+    G4cout << title2 << G4endl;
   }
-  G4cout << Comp->GetRange() << endl;
-  G4cout << parameterEntry << endl;
+  G4cout << Comp->GetRange() << G4endl;
+  G4cout << parameterEntry << G4endl;
   for( int par=0; par<parameterEntry; par++) {
     prp = (G4UIparameter *)Comp->GetParameter(par);
-    G4cout << prp->GetParameterName() << endl;
-    G4cout << prp->GetParameterGuidance() << endl;
-    G4cout << prp->GetParameterType() << endl;
-    G4cout << prp->IsOmittable() << endl;
-    G4cout << prp->GetDefaultValue() << endl;
-    G4cout << prp->GetParameterRange() << endl;
-    G4cout << prp->GetParameterCandidates() << endl;
+    G4cout << prp->GetParameterName() << G4endl;
+    G4cout << prp->GetParameterGuidance() << G4endl;
+    G4cout << prp->GetParameterType() << G4endl;
+    G4cout << prp->IsOmittable() << G4endl;
+    G4cout << prp->GetDefaultValue() << G4endl;
+    G4cout << prp->GetParameterRange() << G4endl;
+    G4cout << prp->GetParameterCandidates() << G4endl;
   }
-  G4cout << "@@JParamEnd" << endl;
+  G4cout << "@@JParamEnd" << G4endl;
 }
 
 void G4UIGAG::SendDisableList(G4UIcommandTree * tree, int level)
@@ -628,7 +624,7 @@ void G4UIGAG::SendDisableList(G4UIcommandTree * tree, int level)
   for(int com=0; com<commandEntry; com++) {
     Comp = tree->GetCommand(com+1);
     if( Comp->IsAvailable()==false ) {
-       G4cout << Comp->GetCommandPath()<<endl;
+       G4cout << Comp->GetCommandPath()<<G4endl;
     }
   }
   if( treeEntry == 0 ) return;     // end recursion
@@ -654,7 +650,7 @@ void G4UIGAG::CodeGenTclTree(G4UIcommandTree * tree, int level)
   for(int com=0; com<commandEntry; com++){
     Comp = tree->GetCommand(com+1);
     commandPath = Comp->GetCommandPath();
-    G4cout << commandPath << " @@command" << endl;
+    G4cout << commandPath << " @@command" << G4endl;
     guidanceEntry = Comp->GetGuidanceEntries();
     if (guidanceEntry == 0){
       title2 = "...Title not available...";
@@ -678,7 +674,7 @@ void G4UIGAG::CodeGenTclTree(G4UIcommandTree * tree, int level)
 	title2.append("\\n");
       }
     }
-    G4cout << commandPath << " @@title \""<< title2 <<"\""<< endl;
+    G4cout << commandPath << " @@title \""<< title2 <<"\""<< G4endl;
   }
 
   if(treeEntry == 0) return; //end recursion
@@ -696,9 +692,9 @@ void G4UIGAG::CodeGenTclTree(G4UIcommandTree * tree, int level)
 	title2.append("\\\""); // a Backslash and a double quote
       else title2.append(c);
     }
-    if(level==0) G4cout << pathName<< endl;
-    else G4cout << pathName<< "  @@cascade"<<endl;
-    G4cout << pathName << "  @@title \"" << title1  << "\""<<endl;
+    if(level==0) G4cout << pathName<< G4endl;
+    else G4cout << pathName<< "  @@cascade"<<G4endl;
+    G4cout << pathName << "  @@title \"" << title1  << "\""<<G4endl;
     CodeGenTclTree(t, level+1);
   }
 }
@@ -728,13 +724,13 @@ void G4UIGAG::SendATclParamProperty(G4UIcommand * Comp)
     int parameterEntry = Comp->GetParameterEntries();
     G4String commandPath = Comp->GetCommandPath();
     G4String commandRange = Comp->GetRange();
-    G4cout << "@@parameter_start" << endl;
-    G4cout << commandPath << " @@param " << parameterEntry << endl;
-    G4cout << "@@command_range \"" << commandRange << "\"" << endl;
+    G4cout << "@@parameter_start" << G4endl;
+    G4cout << commandPath << " @@param " << parameterEntry << G4endl;
+    G4cout << "@@command_range \"" << commandRange << "\"" << G4endl;
     for( int par=0; par<parameterEntry; par++) {
       prp = (G4UIparameter *)Comp->GetParameter(par);
       G4cout << "{" ;
-      G4cout << "@@param_name : \"" << prp->GetParameterName() <<"\""<<endl;
+      G4cout << "@@param_name : \"" << prp->GetParameterName() <<"\""<<G4endl;
       G4String  guide1,guide2;
       guide1 = prp->GetParameterGuidance();
       guide2 = "";
@@ -746,15 +742,15 @@ void G4UIGAG::SendATclParamProperty(G4UIcommand * Comp)
         guide2.append("\\\""); // a Backslash and a double quote
         else guide2.append(c);
       }
-      G4cout << " @@param_guide : \"" << guide2 << "\""<<endl; 
-      G4cout << " @@param_type : \"" << prp->GetParameterType()<<"\""<<endl;
-      G4cout << " @@param_omit : \"" << prp->IsOmittable()<<"\""<<endl;
-      G4cout << " @@param_default : \""<< prp->GetDefaultValue()<<"\""<<endl;
-      G4cout << " @@param_range : \""<< prp->GetParameterRange()<<"\""<<endl;
-      G4cout << " @@param_candidate : \"" << prp->GetParameterCandidates()<< "\""<<endl;
-      G4cout << "}" << endl;
+      G4cout << " @@param_guide : \"" << guide2 << "\""<<G4endl; 
+      G4cout << " @@param_type : \"" << prp->GetParameterType()<<"\""<<G4endl;
+      G4cout << " @@param_omit : \"" << prp->IsOmittable()<<"\""<<G4endl;
+      G4cout << " @@param_default : \""<< prp->GetDefaultValue()<<"\""<<G4endl;
+      G4cout << " @@param_range : \""<< prp->GetParameterRange()<<"\""<<G4endl;
+      G4cout << " @@param_candidate : \"" << prp->GetParameterCandidates()<< "\""<<G4endl;
+      G4cout << "}" << G4endl;
     }
-    G4cout << "@@parameter_end" << endl;
+    G4cout << "@@parameter_end" << G4endl;
 }
 
 void G4UIGAG::NotifyStateChange(void)
@@ -764,10 +760,10 @@ void G4UIGAG::NotifyStateChange(void)
    G4UIcommandTree * tree = UI->GetTree();
    stateString = statM->GetStateString(statM->GetCurrentState());
    if ( uiMode != terminal_mode ){
-     G4cout << "@@State \"" << stateString << "\"" << endl;
-     G4cout << "@@DisableListBegin"<<endl;
+     G4cout << "@@State \"" << stateString << "\"" << G4endl;
+     G4cout << "@@DisableListBegin"<<G4endl;
      SendDisableList(tree, 0);
-     G4cout << "@@DisableListEnd" <<endl;
+     G4cout << "@@DisableListEnd" <<G4endl;
    }
 }
 
@@ -811,7 +807,7 @@ int G4UIGAG::CommandUpdated(void)
       }
       if( j==nEntry ) { 
          deleted = 1;
-         //G4cout <<"deleted: "<< previousTreeCommands(i) << endl;
+         //G4cout <<"deleted: "<< previousTreeCommands(i) << G4endl;
       }
   }
   for( i=0; i<nEntry; i++) {      // check added command(s)
@@ -820,12 +816,12 @@ int G4UIGAG::CommandUpdated(void)
       }
       if( j==pEntry ) { 
          added = 1;
-      //   G4cout <<"added: "<< newTreeCommands(i) << endl;
+      //   G4cout <<"added: "<< newTreeCommands(i) << G4endl;
       }
   }
-  if( added    && deleted==0 ) {G4cout<<"c added"<<endl;return added;}
-  if( added==0 && deleted ) {G4cout<<"c deleted"<<endl;return deleted;}
-  if( added    && deleted ) {G4cout<<"c add/deleted"<<endl;return addedAndDeleted;}
+  if( added    && deleted==0 ) {G4cout<<"c added"<<G4endl;return added;}
+  if( added==0 && deleted ) {G4cout<<"c deleted"<<G4endl;return deleted;}
+  if( added    && deleted ) {G4cout<<"c add/deleted"<<G4endl;return addedAndDeleted;}
   return notChanged;
 }
 
@@ -870,7 +866,7 @@ void G4UIGAG::UpdateParamVal(void)
     if( previousTreeParams[i] != newTreeParams[i]){
        Comp = newTreePCP[i];
        G4cout << Comp->GetCommandPath()
-            << " command is updated." <<endl; 
+            << " command is updated." <<G4endl; 
        NotifyParameterUpdate(Comp);
     }
   }
@@ -890,7 +886,7 @@ void G4UIGAG::UpdateParamVal(void)
 //    }
 //    if( j==nEntry ) { 
 //       deleted = 1;
-//       //G4cout <<"para deleted: "<< previousTreeParams(i) << endl;
+//       //G4cout <<"para deleted: "<< previousTreeParams(i) << G4endl;
 //    }
 //  }
 //  for( i=0; i<nEntry; i++) {      // check added param(s)
@@ -899,12 +895,12 @@ void G4UIGAG::UpdateParamVal(void)
 //    }
 //    if( j==pEntry ) { 
 //       added = 1;
-//       //G4cout <<"para added: "<< newTreeParams(i) << endl;
+//       //G4cout <<"para added: "<< newTreeParams(i) << G4endl;
 //    }
 //  }
-//  if( added    && deleted==0 ) {G4cout<<"p added"<<endl;return added;}
-// if( added==0 && deleted )  {G4cout<<"p deleted"<<endl;return deleted;}
-//  if( added    && deleted )  {G4cout<<"p add/deleted"<<endl; return addedAndDeleted;}
+//  if( added    && deleted==0 ) {G4cout<<"p added"<<G4endl;return added;}
+// if( added==0 && deleted )  {G4cout<<"p deleted"<<G4endl;return deleted;}
+//  if( added    && deleted )  {G4cout<<"p add/deleted"<<G4endl; return addedAndDeleted;}
 //  return notChanged;
 //}
 

source/interfaces/OPACS/include/G4UIWo.hh

@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4UIWo.hh,v 1.2.8.1 1999/12/07 20:49:05 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4UIWo_h
 #define G4UIWo_h 

source/interfaces/OPACS/include/G4WoMessenger.hh

@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4WoMessenger.hh,v 1.2.8.1 1999/12/07 20:49:05 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4WoMessenger_h
 #define G4WoMessenger_h 1

source/interfaces/OPACS/include/G4oCommon.hh

@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4oCommon.hh,v 1.2.8.1 1999/12/07 20:49:06 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 /*
    Included by G4o.h.

source/interfaces/OPACS/include/G4oCommon.icc

@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4oCommon.icc,v 1.2.8.1 1999/12/07 20:49:06 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 /*
    Included by G4o.cc.

source/interfaces/OPACS/src/G4UIWo.cc

@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4UIWo.cc,v 1.2.8.1 1999/12/07 20:49:06 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4UIWo.cc,v 1.2.8.1.2.1 1999/12/08 17:34:02 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //G4UIWo.cc   -- copied from G4UIterminal.cc
 
@@ -202,7 +202,7 @@ void G4UIWo::PauseSessionStart (
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 {
 #ifdef DEBUG
-  G4cout << "debug : G4UIWo::PauseSessionStart : begin : " << a_state << endl;
+  G4cout << "debug : G4UIWo::PauseSessionStart : begin : " << a_state << G4endl;
 #endif
 
   if(a_state=="G4_pause> ")
@@ -229,7 +229,7 @@ void G4UIWo::PauseSessionStart (
     }
 
 #ifdef DEBUG
-  G4cout << "debug : G4UIWo::PauseSessionStart : end." << endl;
+  G4cout << "debug : G4UIWo::PauseSessionStart : end." << G4endl;
 #endif
 }
 /***************************************************************************/

source/interfaces/OPACS/src/G4WoMessenger.cc

@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4WoMessenger.cc,v 1.2.8.1 1999/12/07 20:49:06 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifdef G4UI_BUILD_WO_SESSION
 

source/interfaces/XVT/include/G4UIxvt.hh

@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4UIxvt.hh,v 1.2.8.1 1999/12/07 20:49:06 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4UIxvt.hh,v 1.2.8.1.2.2 1999/12/14 07:07:56 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 ////////////////////////////////////////////////////////////////////////
 //                     XVT driver class header                        //
@@ -70,7 +70,7 @@
 ////////////////////////////////////////////////////////////////////////
 
 #include "G4VStateDependent.hh"
-#include <fstream.h>
+#include "g4std/fstream"
 
 
 ////////////////////////////////////////////////////////////////////////

source/interfaces/XVT/include/G4UIxvtMessenger.hh

@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4UIxvtMessenger.hh,v 1.2.8.1 1999/12/07 20:49:06 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //////////////////////////////////////////////////////////////////////////////
 //                                                                          //

source/interfaces/XVT/src/G4UIxvt.cc

@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4UIxvt.cc,v 1.2.8.1 1999/12/07 20:49:06 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4UIxvt.cc,v 1.2.8.1.2.1 1999/12/08 17:34:03 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifdef G4UI_BUILD_XVT_SESSION
 
@@ -195,7 +195,7 @@ G4UIsession*  G4UIxvt::SessionStart(void)
 
   fillArrayEntries(comTree, 0);
 
-  G4cout << " --------- List of Array Entries ---------- " << endl;
+  G4cout << " --------- List of Array Entries ---------- " << G4endl;
 
   listCommandArray();
   briefListCommands();
@@ -326,7 +326,7 @@ void G4UIxvt::writeGeantToXvt(const G4String& theString)
   int write_check = write(fd_GeantToXvt, theString, number);
     
   if(write_check == -1)
-    G4cout << "ERROR WITH WRITE!!" << endl;
+    G4cout << "ERROR WITH WRITE!!" << G4endl;
 }
 
 
@@ -341,7 +341,7 @@ void G4UIxvt::writeGeantToXvt(const G4String& theString)
 ///////////////////////////////////////////////////////////////////////////////
 void G4UIxvt::errorHandler(const G4String& theError)
 {
-  G4cout << "Error with " << theError << endl;  
+  G4cout << "Error with " << theError << G4endl;  
 }
 
 
@@ -410,7 +410,7 @@ G4String G4UIxvt::GetCommand()
   }
 
   if( newCommand(0) != '/' )
-    G4cerr << "IT GOT THERE!!!!" << endl;
+    G4cerr << "IT GOT THERE!!!!" << G4endl;
     // If you ever see the error message in the output something has gone
     // wrong.
 
@@ -690,7 +690,7 @@ void G4UIxvt::fillArrayEntries(G4UIcommandTree * tree, int level)
     if(level==0) 
     {
       // --- This code shouldn't ever get executed --- //
-      G4cout << "Printing command Path" << commandPath << endl;
+      G4cout << "Printing command Path" << commandPath << G4endl;
     }
     else     
     {
@@ -772,11 +772,11 @@ void G4UIxvt::listCommandArray(void)
 {
   for(int i = 0; i < currentPosition; i++)
   {
-    G4cout << "CommandArray, Entry-> " << i << endl
-         << "Flag-> " << commandArray[i].flag << endl
-         << "Name-> " << commandArray[i].name << endl
-         << "Guidance-> " << commandArray[i].guidance << endl
-         << "Number of Parameters-> " << commandArray[i].numOfParameters << endl;
+    G4cout << "CommandArray, Entry-> " << i << G4endl
+         << "Flag-> " << commandArray[i].flag << G4endl
+         << "Name-> " << commandArray[i].name << G4endl
+         << "Guidance-> " << commandArray[i].guidance << G4endl
+         << "Number of Parameters-> " << commandArray[i].numOfParameters << G4endl;
          
          int numParam = commandArray[i].numOfParameters;
          
@@ -784,19 +784,19 @@ void G4UIxvt::listCommandArray(void)
          {
            for(int x = 0; x < numParam; x++)
            {
-             G4cout << "Parameters for this command: " << endl << endl
-                  << "Parameter Name-> "          << commandArray[i].parameters[x].name         << endl
-                  << "Parameter Guidance-> "      << commandArray[i].parameters[x].guidance     << endl
-                  << "Parameter Default Value-> " << commandArray[i].parameters[x].defaultValue << endl
-                  << "Parameter Range-> "         << commandArray[i].parameters[x].range        << endl
-                  << "Parameter Candidate-> "     << commandArray[i].parameters[x].candidate    << endl
-                  << "Parameter Type-> "          << commandArray[i].parameters[x].type         << endl
-                  << "Parameter Omittable-> "     << commandArray[i].parameters[x].omittable    << endl 
-                  << endl << endl;
+             G4cout << "Parameters for this command: " << G4endl << G4endl
+                  << "Parameter Name-> "          << commandArray[i].parameters[x].name         << G4endl
+                  << "Parameter Guidance-> "      << commandArray[i].parameters[x].guidance     << G4endl
+                  << "Parameter Default Value-> " << commandArray[i].parameters[x].defaultValue << G4endl
+                  << "Parameter Range-> "         << commandArray[i].parameters[x].range        << G4endl
+                  << "Parameter Candidate-> "     << commandArray[i].parameters[x].candidate    << G4endl
+                  << "Parameter Type-> "          << commandArray[i].parameters[x].type         << G4endl
+                  << "Parameter Omittable-> "     << commandArray[i].parameters[x].omittable    << G4endl 
+                  << G4endl << G4endl;
            }
          }
          
-         G4cout << "Number-> " << commandArray[i].commandNumber << endl << endl;
+         G4cout << "Number-> " << commandArray[i].commandNumber << G4endl << G4endl;
   }
 }
 

source/interfaces/XVT/src/G4UIxvtMessenger.cc

@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4UIxvtMessenger.cc,v 1.2.8.1 1999/12/07 20:49:07 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4UIxvtMessenger.cc,v 1.2.8.1.2.1 1999/12/08 17:34:03 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifdef G4UI_BUILD_XVT_SESSION
 
@@ -60,7 +60,7 @@ void G4UIxvtMessenger::SetNewValue(G4UIcommand * command,G4String newValue)
     if(newValue=="EndOfEvent") id=2;
     if(newValue=="endOfRun") id=3;
     if(id<0)
-    { G4cout << "Unknown break point <" << newValue << "> ignored." << endl; }
+    { G4cout << "Unknown break point <" << newValue << "> ignored." << G4endl; }
     else
     { xvtptr->set_breakPointAt(id,true); }
   }

source/interfaces/basic/include/G4UIWin32.hh

@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4UIWin32.hh,v 1.7.4.1 1999/12/07 20:49:08 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4UIWin32_h
 #define G4UIWin32_h 

source/interfaces/basic/include/G4UIXaw.hh

@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4UIXaw.hh,v 1.3.4.1 1999/12/07 20:49:08 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4UIXaw_h
 #define G4UIXaw_h 

source/interfaces/basic/include/G4UIXm.hh

@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4UIXm.hh,v 1.8.4.1 1999/12/07 20:49:08 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 #ifndef G4UIXm_h
 #define G4UIXm_h 

source/interfaces/basic/include/G4UIterminal.hh

@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4UIterminal.hh,v 1.3.4.1 1999/12/07 20:49:08 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4UIterminal.hh,v 1.3.4.1.2.2 1999/12/14 07:07:56 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef G4UIterminal_h
@@ -14,7 +14,7 @@
 
 #include "G4VBasicShell.hh"
 #include "G4UImanager.hh"
-#include <fstream.h>
+#include "g4std/fstream"
 
 // class description:
 //

source/interfaces/basic/src/G4UIWin32.cc

@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4UIWin32.cc,v 1.5.4.1 1999/12/07 20:49:08 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4UIWin32.cc,v 1.5.4.1.2.2 1999/12/14 07:07:56 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // G.Barrand
 
@@ -20,7 +20,7 @@
 #include <windowsx.h>
 #include <wingdi.h>
 
-#include <Strstrea.h>
+#include "g4std/strstream"
 
 #include "G4UImanager.hh"
 #include "G4StateManager.hh"

source/interfaces/basic/src/G4UIXaw.cc

@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4UIXaw.cc,v 1.2.8.1 1999/12/07 20:49:08 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // G.Barrand
 

source/interfaces/basic/src/G4UIXm.cc

@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4UIXm.cc,v 1.5.4.1 1999/12/07 20:49:08 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4UIXm.cc,v 1.5.4.1.2.4 1999/12/14 09:16:47 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // G.Barrand
 
@@ -14,11 +14,7 @@
 
 #ifdef G4UI_BUILD_XM_SESSION
 
-#ifdef WIN32
-#include <Strstrea.h>
-#else
-#include <strstream.h>
-#endif
+#include "g4std/strstream"
 
 #include <string.h>
 

source/interfaces/basic/src/G4UIterminal.cc

@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4UIterminal.cc,v 1.4.4.1.2.1 1999/12/07 20:49:09 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4UIterminal.cc,v 1.4.4.1.2.1.2.7 1999/12/14 09:16:47 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #include "G4UIterminal.hh"
@@ -15,11 +15,7 @@
 #include "G4UIcommand.hh"
 #include "G4UIcommandStatus.hh"
 #include "G4ios.hh"
-#ifdef WIN32
-#  include <Strstrea.h>
-#else
-#  include <strstream.h>
-#endif
+#include "g4std/strstream"
 
 G4UIterminal::G4UIterminal()
 {
@@ -39,7 +35,7 @@ G4UIterminal::~G4UIterminal()
   {
     UI->SetSession(NULL);
     UI->SetCoutDestination(NULL);
-    //    G4cout << "Terminal session deleted" << endl;
+    //    G4cout << "Terminal session deleted" << G4endl;
   }
 }
 
@@ -74,13 +70,13 @@ void G4UIterminal::PauseSessionStart(G4String msg)
 
 G4int G4UIterminal::ReceiveG4cout(G4String coutString)
 {
-  cout << coutString << flush;
+  G4std::cout << coutString << G4std::flush;
   return 0;
 }
 
 G4int G4UIterminal::ReceiveG4cerr(G4String cerrString)
 {
-  cerr << cerrString << flush;
+  G4std::cerr << cerrString << G4std::flush;
   return 0;
 }
 
@@ -95,19 +91,19 @@ void G4UIterminal::ExecuteCommand(G4String aCommand)
     case fCommandSucceeded:
       break;
     case fCommandNotFound:
-      G4cerr << "command <" << aCommand << "> not found" << endl;
+      G4cerr << "command <" << aCommand << "> not found" << G4endl;
        if ( aCommand.index("@@") != G4std::string::npos) {
-       G4cout << "@@G4UIterminal" << endl;
+       G4cout << "@@G4UIterminal" << G4endl;
        }
       break;
     case fIllegalApplicationState:
-      G4cerr << "illegal application state -- command refused" << endl;
+      G4cerr << "illegal application state -- command refused" << G4endl;
       break;
     case fParameterOutOfRange:
     case fParameterUnreadable:
     case fParameterOutOfCandidates:
     default:
-      G4cerr << "command refused (" << commandStatus << ")" << endl;
+      G4cerr << "command refused (" << commandStatus << ")" << G4endl;
   }
 }
 G4String G4UIterminal::GetCommand()
@@ -118,8 +114,8 @@ G4String G4UIterminal::GetCommand()
   {
     G4cout << promptCharacter;
     G4cout.flush();
-    newCommand.readLine( cin, FALSE );
-    if (!cin.good()) { cin.clear(); newCommand = nullString; iExit=false; break; }
+    newCommand.readLine( G4cin, FALSE );
+    if (!G4cin.good()) { G4cin.clear(); newCommand = nullString; iExit=false; break; }
     newCommand = newCommand.strip(G4String::leading);
     if( newCommand.length() < 1 ) { break; }
 
@@ -127,8 +123,8 @@ G4String G4UIterminal::GetCommand()
     {
       G4String newLine;
       newCommand.remove(newCommand.length()-1);
-      newLine.readLine( cin );
-      if (!cin.good()) { cin.clear(); newCommand = nullString; iExit=false; break; }
+      newLine.readLine( G4cin );
+      if (!G4cin.good()) { G4cin.clear(); newCommand = nullString; iExit=false; break; }
       newCommand.append(newLine);
     }
 
@@ -138,13 +134,13 @@ G4String G4UIterminal::GetCommand()
     // -------------------- nC.toUpper();
     if( nC.length() < 1 ){ break; }
     if( nC(0) == '#' )
-           { G4cout << nC << endl; }
+           { G4cout << nC << G4endl; }
     else if( nC == "ls" || nC(0,3) == "ls " )
            { ListDirectory( nC ); }
     else if( nC == "pwd" )
            { 
 	     G4cout << "Current Working Directory : " 
-		    << GetCurrentWorkingDirectory() << endl; 
+		    << GetCurrentWorkingDirectory() << G4endl; 
 	   }
     else if( nC == "cd" || nC(0,3) == "cd " )
            { ChangeDirectoryCommand( nC ); }
@@ -156,33 +152,33 @@ G4String G4UIterminal::GetCommand()
            {
 	     G4int nh = UI->GetNumberOfHistory();
 	     for(int i=0;i<nh;i++)
-	       { G4cout << i << ": " << UI->GetPreviousCommand(i) << endl; }
+	       { G4cout << i << ": " << UI->GetPreviousCommand(i) << G4endl; }
 	   }
     else if( nC(0) == '!' )
            {
 	     G4String ss = nC(1,nC.length()-1);
 	     G4int vl;
 	     const char* tt = ss;
-	     istrstream is((char*)tt);
+	     G4std::istrstream is((char*)tt);
 	     is >> vl;
 	     G4int nh = UI->GetNumberOfHistory();
 	     if(vl>=0 && vl<nh)
 	       { 
 		 newCommand = UI->GetPreviousCommand(vl); 
-		 G4cout << newCommand << endl;
+		 G4cout << newCommand << G4endl;
 		 break;
 	       }
 	     else
-	       { G4cerr << "history " << vl << " is not found." << endl; }
+	       { G4cerr << "history " << vl << " is not found." << G4endl; }
 	   }
     else if( nC == "exit" )
           { 
 	    if( iCont )
 	      { 
-		G4cout << "You are now processing RUN." << endl;
-		G4cout << "Please abort it using \"/run/abort\" command first" << endl;
-		G4cout << " and use \"continue\" command until the application" << endl;
-		G4cout << " becomes to Idle." << endl;
+		G4cout << "You are now processing RUN." << G4endl;
+		G4cout << "Please abort it using \"/run/abort\" command first" << G4endl;
+		G4cout << " and use \"continue\" command until the application" << G4endl;
+		G4cout << " becomes to Idle." << G4endl;
 	      }
 	    else
 	      {
@@ -204,18 +200,18 @@ G4String G4UIterminal::GetCommand()
 }
 
 G4bool G4UIterminal::GetHelpChoice(G4int& aInt){
-  cin >> aInt;
-  if(!cin.good()){
-    cin.clear();
-    cin.ignore(30,'\n');
+  G4cin >> aInt;
+  if(!G4cin.good()){
+    G4cin.clear();
+    G4cin.ignore(30,'\n');
     return false;
   } 
   return true;
 }
 void G4UIterminal::ExitHelp(){
-  // cin.flush();
+  // G4cin.flush();
   char temp[100];
-  cin.getline( temp, 100 );
+  G4cin.getline( temp, 100 );
 }
 
 

source/interfaces/common/include/G4VBasicShell.hh

@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VBasicShell.hh,v 1.4.4.1 1999/12/07 20:49:09 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #ifndef G4VBasicShell_H

source/interfaces/common/include/G4VInteractorManager.hh

@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4VInteractorManager.hh,v 1.5.4.1 1999/12/07 20:49:10 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // G.Barrand
 

source/interfaces/common/include/G4Win32.hh

@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Win32.hh,v 1.4.4.1 1999/12/07 20:49:10 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //  To unify Windows message treatment between 
 // G4/interfaces Windows sessions and G4/visualizations Windows drivers.

source/interfaces/common/include/G4Xt.hh

@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G4Xt.hh,v 1.3.4.1 1999/12/07 20:49:10 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 //  To unify X11 event treatment between 
 // G4/interfaces Xt sessions and G4/visualizations Xt drivers.

source/interfaces/common/src/G4VBasicShell.cc

@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VBasicShell.cc,v 1.5.4.1 1999/12/07 20:49:10 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VBasicShell.cc,v 1.5.4.1.2.5 1999/12/14 09:16:47 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 
 #include "g4std/vector"
@@ -17,11 +17,7 @@
 #include "G4UIcommand.hh"
 #include "G4UIcommandStatus.hh"
 #include "G4UImanager.hh"
-#ifdef WIN32
-#  include <Strstrea.h>
-#else
-#  include <strstream.h>
-#endif
+#include "g4std/strstream"
 
 G4VBasicShell::G4VBasicShell()
 :currentDirectory("/")
@@ -192,10 +188,10 @@ G4String G4VBasicShell::FindMatchingPath(
     if(n_commandEntry==1) {
       return (pathName + commands[0]->GetCommandName());
     } else if (n_commandEntry>=2) {
-      G4cout << "Matching commands :" << endl; 
+      G4cout << "Matching commands :" << G4endl; 
       for( int i_thCommand = 0; i_thCommand < n_commandEntry; i_thCommand++ ) {
 	G4UIcommand* cmd = commands[i_thCommand];
-	G4cout << cmd->GetCommandName() << endl; 
+	G4cout << cmd->GetCommandName() << G4endl; 
       }
       return empty;
     }
@@ -214,10 +210,10 @@ G4String G4VBasicShell::FindMatchingPath(
     if(n_treeEntry==1) {
       return trees[0]->GetPathName();
     } else if (n_treeEntry>=2) {
-      G4cout << "Matching directories :" << endl; 
+      G4cout << "Matching directories :" << G4endl; 
       for( int i_thTree = 0; i_thTree < n_treeEntry; i_thTree++ ) {
 	G4UIcommandTree* tree = trees[i_thTree];
-	G4cout << tree->GetPathName() << endl; 
+	G4cout << tree->GetPathName() << G4endl; 
       }
       return empty;
     } else {
@@ -256,16 +252,16 @@ void G4VBasicShell::ExecuteCommand (
   case fCommandSucceeded:
     break;
   case fCommandNotFound:
-    G4cerr << "command not found" << endl;
+    G4cerr << "command not found" << G4endl;
     break;
   case fIllegalApplicationState:
-    G4cerr << "illegal application state -- command refused" << endl;
+    G4cerr << "illegal application state -- command refused" << G4endl;
     break;
   case fParameterOutOfRange:
   case fParameterUnreadable:
   case fParameterOutOfCandidates:
   default:
-    G4cerr << "command refused (" << commandStatus << ")" << endl;
+    G4cerr << "command refused (" << commandStatus << ")" << G4endl;
   }
 }
 /***************************************************************************/
@@ -283,7 +279,7 @@ void G4VBasicShell::ApplyShellCommand (
   G4String command = a_string.strip(G4String::leading);
   if( command(0) == '#' ) { 
 
-    G4cout << command << endl; 
+    G4cout << command << G4endl; 
 
   } else if( command == "ls" || command(0,3) == "ls " ) {
 
@@ -292,7 +288,7 @@ void G4VBasicShell::ApplyShellCommand (
   } else if( command == "pwd" ) { 
 
     G4cout << "Current Working Directory : " 
-       << GetCurrentWorkingDirectory() << endl; 
+       << GetCurrentWorkingDirectory() << G4endl; 
 
   } else if( command(0,2) == "cd" ) { 
 
@@ -310,7 +306,7 @@ void G4VBasicShell::ApplyShellCommand (
 
     G4int nh = UI->GetNumberOfHistory();
     for(int i=0;i<nh;i++) { 
-      G4cout << i << ": " << UI->GetPreviousCommand(i) << endl; 
+      G4cout << i << ": " << UI->GetPreviousCommand(i) << G4endl; 
     }
 
   } else if( command(0) == '!' ) {
@@ -318,24 +314,24 @@ void G4VBasicShell::ApplyShellCommand (
     G4String ss = command(1,command.length()-1);
     G4int vl;
     const char* tt = ss;
-    istrstream is((char*)tt);
+    G4std::istrstream is((char*)tt);
     is >> vl;
     G4int nh = UI->GetNumberOfHistory();
     if(vl>=0 && vl<nh) { 
       G4String prev = UI->GetPreviousCommand(vl); 
-      G4cout << prev << endl;
+      G4cout << prev << G4endl;
       ExecuteCommand (ModifyToFullPathCommand(prev));
     } else { 
-      G4cerr << "history " << vl << " is not found." << endl; 
+      G4cerr << "history " << vl << " is not found." << G4endl; 
     }
 
   } else if( command(0,4) == "exit" ) { 
 
     if( exitPause == false) { //In a secondary loop.
-      G4cout << "You are now processing RUN." << endl;
-      G4cout << "Please abort it using \"/run/abort\" command first" << endl;
-      G4cout << " and use \"continue\" command until the application" << endl;
-      G4cout << " becomes to Idle." << endl;
+      G4cout << "You are now processing RUN." << G4endl;
+      G4cout << "Please abort it using \"/run/abort\" command first" << G4endl;
+      G4cout << " and use \"continue\" command until the application" << G4endl;
+      G4cout << " becomes to Idle." << G4endl;
     } else {
       exitSession = true;
     }
@@ -358,7 +354,7 @@ void G4VBasicShell::ShowCurrent(G4String newCommand)
   G4String theCommand = ModifyToFullPathCommand(comString);
   G4String curV = UI->GetCurrentValues(theCommand);
   if( ! curV.isNull() ) { 
-    G4cout << "Current value(s) of the parameter(s) : " << curV << endl; 
+    G4cout << "Current value(s) of the parameter(s) : " << curV << G4endl; 
   }
 }
 void G4VBasicShell::ChangeDirectoryCommand(G4String newCommand)
@@ -371,7 +367,7 @@ void G4VBasicShell::ChangeDirectoryCommand(G4String newCommand)
     prefix = aNewPrefix.strip(G4String::both);
   }
   if(!ChangeDirectory(prefix)) { 
-    G4cout << "directory <" << prefix << "> not found." << endl; 
+    G4cout << "directory <" << prefix << "> not found." << G4endl; 
   }
 }
 void G4VBasicShell::ListDirectory(G4String newCommand)
@@ -385,7 +381,7 @@ void G4VBasicShell::ListDirectory(G4String newCommand)
   }
   G4UIcommandTree* commandTree = FindDirectory( targetDir );
   if( commandTree == NULL ) { 
-    G4cout << "Directory <" << targetDir << "> is not found." << endl; 
+    G4cout << "Directory <" << targetDir << "> is not found." << G4endl; 
   } else { 
     commandTree->ListCurrent(); 
   }
@@ -409,7 +405,7 @@ void G4VBasicShell::TerminalHelp(G4String newCommand)
     }
     else
     {
-      G4cout << "Command <" << newValue << " is not found." << endl;
+      G4cout << "Command <" << newValue << " is not found." << G4endl;
       return;
     }
   }
@@ -430,11 +426,11 @@ void G4VBasicShell::TerminalHelp(G4String newCommand)
   floor[iFloor]->ListCurrentWithNum();
   // 1998 Oct 2 non-number input
   while(1){
-   //G4cout << endl << "Type the number ( 0:end, -n:n level back ) : "<<flush;
-    G4cout << endl << "Type the number ( 0:end, -n:n level back ) : "<<endl;
+   //G4cout << G4endl << "Type the number ( 0:end, -n:n level back ) : "<<G4std::flush;
+    G4cout << G4endl << "Type the number ( 0:end, -n:n level back ) : "<<G4endl;
     G4int i;
     if(!GetHelpChoice(i)){
-      G4cout << endl << "Not a number, once more" << endl; 
+      G4cout << G4endl << "Not a number, once more" << G4endl; 
       continue;
     } else if( i < 0 ){
       iFloor += i;
@@ -460,8 +456,8 @@ void G4VBasicShell::TerminalHelp(G4String newCommand)
       }
     }
   }
-  G4cout << "Exit from HELP." << endl << endl;
-  //G4cout << endl;
+  G4cout << "Exit from HELP." << G4endl << G4endl;
+  //G4cout << G4endl;
   ExitHelp();
 }
 

source/interfaces/common/src/G4VInteractorManager.cc

@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VInteractorManager.cc,v 1.7.4.1 1999/12/07 20:49:11 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4VInteractorManager.cc,v 1.7.4.1.2.3 1999/12/15 11:43:36 gcosmo Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // G.Barrand
 
@@ -221,9 +221,9 @@ void G4VInteractorManager::SecondaryLoop (
   if(secondaryLoopEnabled==FALSE) return;
   
   if (alreadyInSecondaryLoop==FALSE) {
-    G4cout << "------------------------------------------" << endl;
-    G4cout << "You have entered a viewer secondary X event loop." << endl;
-    G4cout << "Quit it with an 'Escape' viewer button" << endl;
+    G4cout << "------------------------------------------" << G4endl;
+    G4cout << "You have entered a viewer secondary X event loop." << G4endl;
+    G4cout << "Quit it with an 'Escape' viewer button" << G4endl;
     alreadyInSecondaryLoop   = TRUE;
     exitSecondaryLoop        = 0;
     SecondaryLoopPreActions  ();

source/interfaces/common/src/G4Win32.cc

@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Win32.cc,v 1.4.8.1 1999/12/07 20:49:11 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Win32.cc,v 1.4.8.1.2.1 1999/12/08 17:34:04 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // G.Barrand
 
@@ -73,7 +73,7 @@ G4Win32::G4Win32 (
     nCmdShow         = a_nCmdShow;
   
     if(hInstance==NULL) {
-      G4cout << "G4Win32::G4Win32 : NULL hInstance given." <<endl;
+      G4cout << "G4Win32::G4Win32 : NULL hInstance given." <<G4endl;
     }
 
     if(hPrevInstance==NULL) {
@@ -97,7 +97,7 @@ G4Win32::G4Win32 (
 				 NULL, NULL, hInstance, NULL);
     
     if(topWindow==NULL) {
-      G4cout << "G4Win32 : Unable to create Win32 window." << endl;
+      G4cout << "G4Win32 : Unable to create Win32 window." << G4endl;
     }
 
     Win32Inited = TRUE;

source/interfaces/common/src/G4Xt.cc

@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Xt.cc,v 1.4.6.1 1999/12/07 20:49:11 gunter Exp $
-// GEANT4 tag $Name: geant4-01-00 $
+// $Id: G4Xt.cc,v 1.4.6.1.2.1 1999/12/08 17:34:04 gunter Exp $
+// GEANT4 tag $Name: geant4-01-01 $
 //
 // G.Barrand
 
@@ -91,7 +91,7 @@ G4Xt::G4Xt (
 				    &argc,a_args,NULL,
 				    xargs,1);
     if(topWidget==NULL) {
-      G4cout        << "G4Xt : Unable to init Xt." << endl;
+      G4cout        << "G4Xt : Unable to init Xt." << G4endl;
     }
     // Restore a_args. XtAppInitialize corrupts the given ones !!!
     if( (a_argn!=0) && (args!=NULL)) {