Import Geant4 10.6.0 source tree

source/visualization/OpenGL/include/G4OpenGLQtViewer.hh

@@ -73,7 +73,9 @@ class QColor;
 class G4OpenGLSceneHandler;
 class G4OpenGLQtMovieDialog;
 class QLineEdit;
+#if QT_VERSION < 0x050600
 class QSignalMapper;
+#endif
 class G4UIQt;
 class QTableWidget;
 class QTableWidgetItem;
@@ -184,7 +186,6 @@ protected:
 
 protected:
   QWidget* fGLWidget;
-  bool hasPendingEvents();
   void savePPMToTemp();
   int fRecordFrameNumber;
 
@@ -355,10 +356,11 @@ private:
   int fNumber;
   int fMaxPOindexInserted;
   G4UIQt* fUiQt;
+#if QT_VERSION < 0x050600
   QSignalMapper *fSignalMapperMouse;
   QSignalMapper *fSignalMapperSurface;
   QSignalMapper *fSignalMapperPicking;
-
+#endif
   // quick map index to find next item
   std::map <int, QTreeWidgetItem*>::const_iterator fLastSceneTreeWidgetAskForIterator;
   std::map <int, QTreeWidgetItem*>::const_iterator fLastSceneTreeWidgetAskForIteratorEnd;

source/visualization/OpenGL/include/G4OpenGLSceneHandler.hh

@@ -78,6 +78,7 @@ public:
   void AddSolid (const G4Polyhedra&);
   void AddSolid (const G4Orb&);
   void AddSolid (const G4Ellipsoid&);
+  void AddSolid (const G4TessellatedSolid&);
   void AddSolid (const G4VSolid&);
   void AddCompound (const G4VTrajectory&);
   void AddCompound (const G4VHit&);

source/visualization/OpenGL/include/G4OpenGLSceneHandler.icc

@@ -76,6 +76,10 @@ inline void G4OpenGLSceneHandler::AddSolid (const G4Ellipsoid& ellipsoid) {
   G4VSceneHandler::AddSolid (ellipsoid);
 }
 
+inline void G4OpenGLSceneHandler::AddSolid (const G4TessellatedSolid& tess) {
+  G4VSceneHandler::AddSolid (tess);
+}
+
 inline void G4OpenGLSceneHandler::AddSolid (const G4VSolid& vsolid) {
   G4VSceneHandler::AddSolid (vsolid);
 }