Import Geant4 9.5.0 source tree

source/interfaces/basic/include/G4UIArrayString.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4UIArrayString.hh,v 1.3 2006/06/29 19:09:27 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02 $
+// $Id: G4UIArrayString.hh,v 1.3 2006-06-29 19:09:27 gunter Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 
 #ifndef G4UIArrayString_h

source/interfaces/basic/include/G4UIExecutive.hh

@@ -23,8 +23,8 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: G4UIExecutive.hh,v 1.4 2009/11/20 22:10:31 kmura Exp $
-// GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4UIExecutive.hh,v 1.4 2009-11-20 22:10:31 kmura Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 // ====================================================================
 //   G4UIExecutive.hh

source/interfaces/basic/include/G4UIExecutive.icc

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4UIExecutive.icc,v 1.7 2010/05/28 08:12:27 kmura Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4UIExecutive.icc,v 1.7 2010-05-28 08:12:27 kmura Exp $
+// GEANT4 tag $Name: geant4-09-04-patch-02 $
 //
 // ====================================================================
 //   G4UIExecutive.icc
@@ -38,6 +38,9 @@
 #include "G4UIQt.hh"
 #include "G4Qt.hh"
 
+#elif defined(G4UI_USE_WT)
+#include "G4UIWt.hh"
+
 #elif defined(G4UI_USE_XM)
 #include "G4UIXm.hh"
 
@@ -56,6 +59,8 @@
 
 #define DISCARD_PARAMETER(p) (void)p
 
+
+
 /////////////////////////////////////////////////////
 G4UIExecutive::G4UIExecutive(G4int argc, char** argv)
   : session(0), shell(0),isGUI(false)
@@ -65,6 +70,10 @@ G4UIExecutive::G4UIExecutive(G4int argc, char** argv)
   session = new G4UIQt(argc, argv);
   isGUI = true;
 
+#elif defined(G4UI_USE_WT)
+  session = new G4UIWt(argc, argv);
+  isGUI = true;
+
 #elif defined(G4UI_USE_XM)
   session = new G4UIXm(argc, argv);
   isGUI = true;
@@ -132,6 +141,10 @@ inline void G4UIExecutive::SessionStart()
 /////////////////////////////////////////
 {
   session-> SessionStart();
+
+#if defined(G4UI_USE_WT)
+#else
   delete session;
+#endif
 }
 

source/interfaces/basic/include/G4UIQt.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4UIQt.hh,v 1.23 2010/06/10 15:37:13 lgarnier Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4UIQt.hh,v 1.23 2010-06-10 15:37:13 lgarnier Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 #ifndef G4UIQt_h
 #define G4UIQt_h 
@@ -45,14 +45,9 @@
 class QMainWindow;
 class QLineEdit;
 class G4UIsession;
-#if QT_VERSION < 0x040000
-class QListView;
-class QListViewItem;
-#else
 class QListWidget;
 class QTreeWidget;
 class QTreeWidgetItem;
-#endif
 class QTextEdit;
 class QLabel;
 class QResizeEvent;
@@ -115,6 +110,9 @@ public: // With description
   bool AddTabWidget(QWidget*,QString,int,int);
   // To add a tab for vis openGL Qt driver
   
+  QWidget* GetViewComponentsTBWidget();
+  // Get the viewComponent
+
   bool IsSplitterReleased();
 
 public:
@@ -133,13 +131,8 @@ private:
   void FillHelpTree();
   void ExitHelp();
 
-#if QT_VERSION < 0x040000
-  void CreateChildTree(QListViewItem*,G4UIcommandTree*);
-  QListViewItem* FindTreeItem(QListViewItem *,const QString&);
-#else
   void CreateChildTree(QTreeWidgetItem*,G4UIcommandTree*);
   QTreeWidgetItem* FindTreeItem(QTreeWidgetItem *,const QString&);
-#endif
 
   QString GetCommandList(const G4UIcommand*);
 
@@ -149,17 +142,12 @@ private:
   QMap<int,QString> LookForHelpStringInChildTree(G4UIcommandTree *,const QString&);
 
   void CreateVisParametersTBWidget();
-  void CreateViewComponentsTBWidget();
   void CreateHelpTBWidget();
   void CreateCoutTBWidget();
   void CreateHistoryTBWidget();
   void OpenHelpTreeOnCommand(const QString &);
   QString GetShortCommandPath(QString);
-#if QT_VERSION < 0x040000
-  QString GetLongCommandPath(QListViewItem*);
-#else
   QString GetLongCommandPath(QTreeWidgetItem*);
-#endif
 
 private:
 
@@ -176,13 +164,8 @@ private:
   QStringList fG4cout;
   QLineEdit * fCoutFilter;
 
-#if QT_VERSION < 0x040000
-  QListView *fHistoryTBTableList;
-  QListView *fHelpTreeWidget;
-#else
   QListWidget *fHistoryTBTableList;
   QTreeWidget *fHelpTreeWidget;
-#endif
   QWidget* fHelpTBWidget;
   QWidget* fHistoryTBWidget;
   QWidget* fCoutTBWidget;
@@ -197,7 +180,7 @@ private:
   int fLastQTabSizeX;
   int fLastQTabSizeY;
 
-private slots :
+private Q_SLOTS :
   void ExitSession();
   void ClearButtonCallback();
   void CommandEnteredCallback();

source/interfaces/basic/include/G4UIWin32.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4UIWin32.hh,v 1.14 2006/06/29 19:09:29 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02 $
+// $Id: G4UIWin32.hh,v 1.14 2006-06-29 19:09:29 gunter Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 #ifndef G4UIWin32_h
 #define G4UIWin32_h 

source/interfaces/basic/include/G4UIXaw.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4UIXaw.hh,v 1.6 2006/06/29 19:09:31 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02 $
+// $Id: G4UIXaw.hh,v 1.6 2006-06-29 19:09:31 gunter Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 #ifndef G4UIXaw_h
 #define G4UIXaw_h 

source/interfaces/basic/include/G4UIXm.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4UIXm.hh,v 1.14 2008/11/14 16:21:42 lgarnier Exp $
-// GEANT4 tag $Name: geant4-09-02 $
+// $Id: G4UIXm.hh,v 1.14 2008-11-14 16:21:42 lgarnier Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 #ifndef G4UIXm_h
 #define G4UIXm_h 

source/interfaces/basic/include/G4UIcsh.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4UIcsh.hh,v 1.4 2006/06/29 19:09:35 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02 $
+// $Id: G4UIcsh.hh,v 1.4 2006-06-29 19:09:35 gunter Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 
 #ifndef G4UIcsh_h

source/interfaces/basic/include/G4UItcsh.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4UItcsh.hh,v 1.8 2007/06/14 05:44:58 kmura Exp $
-// GEANT4 tag $Name: geant4-09-02 $
+// $Id: G4UItcsh.hh,v 1.8 2007-06-14 05:44:58 kmura Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 
 #ifndef G4UItcsh_h

source/interfaces/basic/include/G4UIterminal.hh

@@ -23,8 +23,8 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: G4UIterminal.hh,v 1.10 2007/05/22 01:51:05 kmura Exp $
-// GEANT4 tag $Name: geant4-09-02 $
+// $Id: G4UIterminal.hh,v 1.10 2007-05-22 01:51:05 kmura Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 // ====================================================================
 //   G4UIterminal.cc

source/interfaces/basic/include/G4VUIshell.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4VUIshell.hh,v 1.8 2009/05/13 09:01:36 kmura Exp $
-// GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4VUIshell.hh,v 1.8 2009-05-13 09:01:36 kmura Exp $
+// GEANT4 tag $Name: not supported by cvs2svn $
 //
 
 #ifndef G4VUIshell_h