Import Geant4 11.0.0 source tree

2021-12-10 14:46:44 +01:00
parent 6399a014b6
commit 80e2389dd8
3932 changed files with 202519 additions and 246221 deletions
@@ -29,8 +29,6 @@
 #ifndef G4OPENINVENTORQT_HH
 #define G4OPENINVENTORQT_HH

-#if defined (G4VIS_BUILD_OIQT_DRIVER) || defined (G4VIS_USE_OIQT)
-
 #include "G4OpenInventor.hh"

 class G4OpenInventorQt: public G4OpenInventor {
@@ -45,5 +43,3 @@ private:
 };

 #endif
-
-#endif
@@ -30,9 +30,6 @@
 #ifndef G4OPENINVENTORQTEXAMINERVIEWER_HH
 #define G4OPENINVENTORQTEXAMINERVIEWER_HH

-#if defined (G4VIS_BUILD_OIQT_DRIVER) || defined (G4VIS_USE_OIQT)
-
-
 // Set up notification of event processing

 #include "G4VStateDependent.hh"
@@ -466,6 +463,4 @@ protected:

 };

-#endif
-
 #endif /* G4OPENINVENTORQTEXAMINERVIEWER_HH */
@@ -29,8 +29,6 @@
 #ifndef G4OPENINVENTORQTVIEWER_HH
 #define G4OPENINVENTORQTVIEWER_HH

-#if defined (G4VIS_BUILD_OIQT_DRIVER) || defined (G4VIS_USE_OIQT)
-
 // Inheritance :
 #include "G4OpenInventorViewer.hh"

@@ -117,5 +115,3 @@ protected:
 };

 #endif
-
-#endif
@@ -33,8 +33,6 @@
 #ifndef G4OPENINVENTORSCENEHANDLER_HH
 #define G4OPENINVENTORSCENEHANDLER_HH

-#if defined (G4VIS_BUILD_OI_DRIVER) || defined (G4VIS_USE_OI)
-
 // Inheritance :
 #include "G4VSceneHandler.hh"

@@ -99,5 +97,3 @@ private:
 };

 #endif
-
-#endif
@@ -33,8 +33,6 @@
 #ifndef G4OPENINVENTORTRANSFORM3D_HH
 #define G4OPENINVENTORTRANSFORM3D_HH

-#if defined (G4VIS_BUILD_OI_DRIVER) || defined (G4VIS_USE_OI)
-
 #include "G4Transform3D.hh"

 class SbMatrix;
@@ -48,5 +46,3 @@ private:
 };

 #endif
-
-#endif
@@ -28,8 +28,6 @@
 #ifndef G4OPENINVENTORVIEWER_HH
 #define G4OPENINVENTORVIEWER_HH

-#if defined (G4VIS_BUILD_OI_DRIVER) || defined (G4VIS_USE_OI)
-
 // Inheritance :
 #include "G4VViewer.hh"

@@ -104,5 +102,3 @@ protected:
 };

 #endif
-
-#endif
@@ -32,8 +32,6 @@
 #ifndef G4OPENINVENTORWINVIEWER_HH
 #define G4OPENINVENTORWINVIEWER_HH

-#if defined (G4VIS_BUILD_OI_DRIVER) || defined (G4VIS_USE_OI)
-
 // Inheritance :
 #include "G4OpenInventorViewer.hh"

@@ -62,5 +60,3 @@ private:
 };

 #endif
-
-#endif
@@ -23,8 +23,6 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************

-#if defined (G4VIS_BUILD_OIX_DRIVER) || defined (G4VIS_USE_OIX)
-
 #ifndef G4OPENINVENTORXTEXAMINERVIEWERMESSENGER_HH
 #define G4OPENINVENTORXTEXAMINERVIEWERMESSENGER_HH

@@ -50,5 +48,3 @@ private:
 };

 #endif
-
-#endif
@@ -32,8 +32,6 @@
 #ifndef G4OPENINVENTORXTEXTENDEDVIEWER_HH
 #define G4OPENINVENTORXTEXTENDEDVIEWER_HH

-#if defined (G4VIS_BUILD_OI_DRIVER) || defined (G4VIS_USE_OI)
-
 // Inheritance :
 #include "G4OpenInventorViewer.hh"

@@ -86,5 +84,3 @@ private:
 };

 #endif
-
-#endif
@@ -32,8 +32,6 @@
 #ifndef G4OPENINVENTORXTVIEWER_HH
 #define G4OPENINVENTORXTVIEWER_HH

-#if defined (G4VIS_BUILD_OI_DRIVER) || defined (G4VIS_USE_OI)
-
 // Inheritance :
 #include "G4OpenInventorViewer.hh"

@@ -79,5 +77,3 @@ protected:
 };

 #endif
-
-#endif
@@ -29,8 +29,6 @@
 #ifndef G4SOQT_HH
 #define G4SOQT_HH

-#if defined (G4VIS_BUILD_OIQT_DRIVER) || defined (G4VIS_USE_OIQT)
-
 #include "G4VInteractorManager.hh"

 class QWidget;
@@ -71,5 +69,3 @@ private:
 };

 #endif
-
-#endif
@@ -33,6 +33,8 @@
 // Needs setting based on choice of driver
 // Apple system for SoQt on Apple
 // Native otherwise (Apple Framework)
+// NOTE: This header is private to the OI category, and the OI lib can only be built in one mode
+// so rhis can be simplified....
 #if defined(__APPLE__) && (!defined(G4VIS_BUILD_OIX_DRIVER) || !defined(G4VIS_USE_OIX_DRIVER))
 #include <OpenGL/gl.h>
 #include <OpenGL/glu.h>