Changeset 1325 for trunk

Timestamp:

Jun 29, 2010, 12:31:59 PM (14 years ago)

Author:

garnier

Message:

modif

Location:

trunk/source

Files:

• interfaces/History (modified) (2 diffs)
• interfaces/basic/src/G4UIQt.cc (modified) (1 diff)
• visualization/management/include/G4VisExecutive.hh (modified) (1 diff)
• visualization/management/include/G4VisExecutive.icc (modified) (6 diffs)

trunk/source/interfaces/History

@@ -1 @@
-$Id: History,v 1.148 2010/06/16 15:43:28 kmura Exp $
+$Id: History,v 1.153 2010/06/23 13:06:16 lgarnier Exp $
 -------------------------------------------------------------------
 
@@ -18 +18 @@
      ----------------------------------------------------------
 
+23, June L. Garnier
+- G4UIQt : Fix compilation warnings on Qt3 and Qt4
+
+22, June L. Garnier (interfaces-V09-03-11)
+- G4UIQt : Fix crash when open UI with no vis tab
+
+18, June L. Garnier
+- Fix Qt3 compilation bug (setVisible(...) unprotected
+
+17, June G. Cosmo (interfaces-V09-03-10)
+- Fixed compilation errors in G4UIQt for Qt3....
+
 17, June K. Murakami (interfaces-V09-03-09)
 - Tagged.

trunk/source/interfaces/basic/src/G4UIQt.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4UIQt.cc,v 1.48 2010/06/22 18:24:18 lgarnier Exp $
+// $Id: G4UIQt.cc,v 1.49 2010/06/23 13:06:16 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //

trunk/source/visualization/management/include/G4VisExecutive.hh

@@ -26 +26 @@
 //
 // $Id: G4VisExecutive.hh,v 1.10 2010/05/28 16:48:03 allison Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: vis-V09-03-08 $
 //
 // 

trunk/source/visualization/management/include/G4VisExecutive.icc

@@ -26 +26 @@
 //
 // $Id: G4VisExecutive.icc,v 1.26 2010/05/30 11:30:49 allison Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: vis-V09-03-08 $
 //
 // 
@@ -131 +131 @@
 #if defined(G4UI_USE_QT)
 #ifdef G4VIS_USE_OPENGLQT
-#ifdef G4VIS_BUILD_OPENGLQT_DRIVER
   ogl  = new G4OpenGLStoredQt;
   ogli = new G4OpenGLImmediateQt;
   ogls = new G4OpenGLStoredQt;
 #endif
-#endif
 #elif defined(G4UI_USE_XM)
 #ifdef G4VIS_USE_OPENGLXM
-#ifdef G4VIS_BUILD_OPENGLXM_DRIVER
   ogl  = new G4OpenGLStoredXm;
   ogli = new G4OpenGLImmediateXm;
   ogls = new G4OpenGLStoredXm;
 #endif
-#endif
 #elif defined(G4UI_USE_WIN32)
 #ifdef G4VIS_USE_OPENGLWIN32
-#ifdef G4VIS_BUILD_OPENGLWIN32_DRIVER
   ogl  = new G4OpenGLStoredWin32;
   ogli = new G4OpenGLImmediateWin32;
   ogls = new G4OpenGLStoredWin32;
 #endif
-#endif
 #elif defined(G4UI_USE_TCSH)
 #if defined (G4VIS_USE_OPENGLX)
-#ifdef G4VIS_BUILD_OPENGLX_DRIVER
   ogl  = new G4OpenGLStoredX;
   ogli = new G4OpenGLImmediateX;
   ogls = new G4OpenGLStoredX;
-#endif
 #elif defined (G4VIS_USE_OPENGLWIN32)
-#ifdef G4VIS_BUILD_OPENGWIN32_DRIVER
   ogl  = new G4OpenGLStoredWin32;
   ogli = new G4OpenGLImmediateWin32;
   ogls = new G4OpenGLStoredWin32;
 #endif
-#endif
 #else
 #if defined (G4VIS_USE_OPENGLX)
-#ifdef G4VIS_BUILD_OPENGLX_DRIVER
   ogl  = new G4OpenGLStoredX;
   ogli = new G4OpenGLImmediateX;
   ogls = new G4OpenGLStoredX;
-#endif
 #elif defined (G4VIS_USE_OPENGLWIN32)
-#ifdef G4VIS_BUILD_OPENGLWIN32_DRIVER
   ogl  = new G4OpenGLStoredWin32;
   ogli = new G4OpenGLImmediateWin32;
@@ -181 +168 @@
 #endif
 #endif
-#endif
   if (ogl) {
     ogl->SetNickName("OGL");
@@ -197 +183 @@
 
 #ifdef G4VIS_USE_OPENGLX
-#ifdef G4VIS_BUILD_OPENGLX_DRIVER
   RegisterGraphicsSystem (new G4OpenGLImmediateX);
   RegisterGraphicsSystem (new G4OpenGLStoredX);
 #endif
-#endif
 
 #ifdef G4VIS_USE_OPENGLWIN32
-#ifdef G4VIS_BUILD_OPENGLWIN32_DRIVER
   RegisterGraphicsSystem (new G4OpenGLImmediateWin32);
   RegisterGraphicsSystem (new G4OpenGLStoredWin32);
 #endif
-#endif
 
 #ifdef G4VIS_USE_OPENGLXM
-#ifdef G4VIS_BUILD_OPENGLXM_DRIVER
   RegisterGraphicsSystem (new G4OpenGLImmediateXm);
   RegisterGraphicsSystem (new G4OpenGLStoredXm);
 #endif
-#endif
 
 #ifdef G4VIS_USE_OPENGLQT
-#ifdef G4VIS_BUILD_OPENGLQT_DRIVER
   RegisterGraphicsSystem (new G4OpenGLImmediateQt);
   RegisterGraphicsSystem (new G4OpenGLStoredQt);
-#endif
 #endif
 
@@ -228 +206 @@
   G4VGraphicsSystem* oi  = 0;
 #ifdef G4VIS_USE_OIX
-#ifdef G4VIS_BUILD_OI_DRIVER
   oi = new G4OpenInventorX;
 #endif
-#endif
 #ifdef G4VIS_USE_OIWIN32
-#ifdef G4VIS_BUILD_OIWIN32_DRIVER
   oi = new G4OpenInventorWin32;
-#endif
 #endif
   if (oi) {
@@ -244 +218 @@
 
 #ifdef G4VIS_USE_OIX
-#ifdef G4VIS_BUILD_OIX_DRIVER
   RegisterGraphicsSystem (new G4OpenInventorX);
 #endif
-#endif
 
 #ifdef G4VIS_USE_OIWIN32
-#ifdef G4VIS_BUILD_OIWIN32_DRIVER
   RegisterGraphicsSystem (new G4OpenInventorWin32);
 #endif
-#endif
 
 #ifdef G4VIS_USE_RAYTRACERX
-#ifdef G4VIS_BUILD_RAYTRACERX_DRIVER
   RegisterGraphicsSystem (new G4RayTracerX);
 #endif
-#endif
 
 #ifdef G4VIS_USE_VRML
-#ifdef G4VIS_BUILD_VRML_DRIVER
   RegisterGraphicsSystem (new G4VRML1);
   RegisterGraphicsSystem (new G4VRML2);
-#endif
 #endif