Import Geant4 10.7.0.beta source tree

source/visualization/OpenGL/include/G4OpenGLQtExportDialog.hh

@@ -100,17 +100,17 @@ class G4OpenGLQtExportDialog : public QDialog
 
  private:
   QString f_name, f_type, f_dir;
-  QLabel* qualityLabel;
-  bool expAll;
+//  QLabel* qualityLabel;
+//  bool expAll;
   QPushButton* buttonOk;
   QPushButton* buttonCancel;
 
   QGroupBox * sizeGroupBox;
 
-  QCheckBox* transparencyEPS,*boxTransparency,*vectorEPSCheckBox;
+  QCheckBox/** transparencyEPS,*boxTransparency,*/*vectorEPSCheckBox;
   QCheckBox* ratioCheckBox;
   QSlider * qualitySlider;
-  QLabel *formatLabel;
+//  QLabel *formatLabel;
   QRadioButton* colorButton,*BWButton;
   QRadioButton* original,* modify;
   QLineEdit* height,*width;

source/visualization/OpenGL/include/G4OpenGLQtViewer.hh

@@ -64,6 +64,7 @@ class QKeyEvent;
 class QWheelEvent;
 class QProcess;
 class QTime;
+class QElapsedTimer;
 class QVBoxLayout;
 class QPushButton;
 class QSlider;
@@ -308,7 +309,11 @@ private:
   G4OpenGLQtMovieDialog* fMovieParametersDialog;
   RECORDING_STEP fRecordingStep;
   QProcess *fProcess;
+#if QT_VERSION < 0x050e00
   QTime *fLastEventTime;
+#else
+  QElapsedTimer *fLastEventTime;
+#endif
   int fSpinningDelay;
   int fNbMaxFramesPerSec;
   float fNbMaxAnglePerSec;

source/visualization/OpenGL/include/G4OpenGLViewerMessenger.hh

@@ -49,23 +49,25 @@ public:
 private:
   G4OpenGLViewerMessenger();  // Private constructor.
   static G4OpenGLViewerMessenger* fpInstance;
+  
   G4UIdirectory* fpDirectory;
+  G4UIcommand*             fpCommandExport;
+  G4UIcommand*             fpCommandFlushAt;
   G4UIcmdWithoutParameter* fpCommandPrintEPS;
-  G4UIcommand* fpCommandPrintSize;
-  G4UIcommand* fpCommandPrintFilename;
-  G4UIcommand* fpCommandExport;
-  G4UIcommand* fpCommandExportFormat;
+
   G4UIdirectory* fpDirectorySet;
-  G4UIcommand* fpCommandDisplayHeadTime;
+  G4UIcommand*          fpCommandDisplayHeadTime;
+  G4UIcommand*          fpCommandDisplayLightFront;
   G4UIcmdWithAnInteger* fpCommandDisplayListLimit;
-  G4UIcommand* fpCommandDisplayLightFront;
-  G4UIcommand* fpCommandEndTime;
+  G4UIcommand*          fpCommandEndTime;
   G4UIcmdWithAnInteger* fpCommandEventsDrawInterval;
-  G4UIcmdWithADouble* fpCommandFade;
-  G4UIcommand* fpCommandFlushAt;
-  G4UIcmdWithAString* fpCommandPrintMode;
-  G4UIcommand* fpCommandStartTime;
-  G4UIcmdWithABool* fpCommandTransparency;
+  G4UIcommand*          fpCommandExportFormat;
+  G4UIcmdWithADouble*   fpCommandFade;
+  G4UIcommand*          fpCommandPrintFilename;
+  G4UIcmdWithAString*   fpCommandPrintMode;
+  G4UIcommand*          fpCommandPrintSize;
+  G4UIcommand*          fpCommandStartTime;
+  G4UIcmdWithABool*     fpCommandTransparency;
 };
 
 #endif