Import Geant4 5.2.0 source tree

source/interfaces/common/include/G4VBasicShell.hh

@@ -22,7 +22,7 @@
 //
 //
 // $Id: G4VBasicShell.hh,v 1.6 2001/07/11 10:01:22 gunter Exp $
-// GEANT4 tag $Name: geant4-05-01 $
+// GEANT4 tag $Name: geant4-05-02 $
 //
 
 #ifndef G4VBasicShell_H

source/interfaces/common/include/G4VInteractiveSession.hh

@@ -25,7 +25,7 @@
 #ifndef G4VInteractiveSession_H
 #define G4VInteractiveSession_H 1
 
-#include "g4std/map"
+#include <map>
 
 #include "G4VInteractorManager.hh"
 
@@ -33,25 +33,26 @@ class G4UImessenger;
 
 // Class description :
 //
-//  G4VInteractiveSession : a base class to isolate common things
+// G4VInteractiveSession is a base class to isolate common things
 // to various graphical "basic" G4UI sessions ; AddMenu, AddButton,
 // a dictionnary for widgets.
-//  The word "interactor" is for "piece of user interface" or
-// "widget" (which means nothing).
-//
-// Class description - end :
+// The word "interactor" is for "piece of user interface" or "widget".
+
+class G4VInteractiveSession
+{
+  public:  //with description
+
+    G4VInteractiveSession();
+    virtual ~G4VInteractiveSession();
+    virtual void AddMenu (const char*,const char*);
+    virtual void AddButton (const char*,const char*,const char*);
+    void AddInteractor(G4String,G4Interactor);
+    G4Interactor GetInteractor(G4String);
+
+  private:
 
-class G4VInteractiveSession {
-public:
-  G4VInteractiveSession();
-  virtual ~G4VInteractiveSession();
-  virtual void AddMenu (const char*,const char*);
-  virtual void AddButton (const char*,const char*,const char*);
-  void AddInteractor(G4String,G4Interactor);
-  G4Interactor GetInteractor(G4String);
-private:
   G4UImessenger* messenger;
-  typedef G4std::map<G4String,G4Interactor, G4std::less<G4String> > G4interactor_map;
+  typedef std::map<G4String,G4Interactor, std::less<G4String> > G4interactor_map;
   G4interactor_map interactors;
 };
 

source/interfaces/common/include/G4VInteractorManager.hh

@@ -21,8 +21,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4VInteractorManager.hh,v 1.7 2001/07/11 10:01:22 gunter Exp $
-// GEANT4 tag $Name: geant4-05-01 $
+// $Id: G4VInteractorManager.hh,v 1.8 2003/06/16 16:56:06 gunter Exp $
+// GEANT4 tag $Name: geant4-05-02 $
 //
 // G.Barrand
 
@@ -30,7 +30,7 @@
 #define G4VINTERACTORMANAGER_HH
 
 #include "globals.hh"
-#include "g4std/vector"
+#include <vector>
 
 typedef void*  G4Interactor;
 typedef G4bool (*G4DispatchFunction)(void*);
@@ -82,10 +82,10 @@ private:
   int                    argc;
   char**                 argv;
   G4Interactor           mainInteractor;
-  G4std::vector<G4DispatchFunction> dispatchers;
-  G4std::vector<G4SecondaryLoopAction> preActions;
-  G4std::vector<G4SecondaryLoopAction> postActions;
-  G4std::vector<G4Interactor> shells;
+  std::vector<G4DispatchFunction> dispatchers;
+  std::vector<G4SecondaryLoopAction> preActions;
+  std::vector<G4SecondaryLoopAction> postActions;
+  std::vector<G4Interactor> shells;
   G4bool                 secondaryLoopEnabled;
   G4bool                 alreadyInSecondaryLoop;
   int                    exitSecondaryLoop;

source/interfaces/common/include/G4Win32.hh

@@ -22,7 +22,7 @@
 //
 //
 // $Id: G4Win32.hh,v 1.6 2001/07/11 10:01:22 gunter Exp $
-// GEANT4 tag $Name: geant4-05-01 $
+// GEANT4 tag $Name: geant4-05-02 $
 //
 //  To unify Windows message treatment between 
 // G4/interfaces Windows sessions and G4/visualizations Windows drivers.

source/interfaces/common/include/G4Xt.hh

@@ -22,7 +22,7 @@
 //
 //
 // $Id: G4Xt.hh,v 1.5 2001/07/11 10:01:22 gunter Exp $
-// GEANT4 tag $Name: geant4-05-01 $
+// GEANT4 tag $Name: geant4-05-02 $
 //
 //  To unify X11 event treatment between 
 // G4/interfaces Xt sessions and G4/visualizations Xt drivers.