Changeset 1127 for trunk/source/visualization

Timestamp:

Oct 14, 2009, 12:21:27 PM (15 years ago)

Author:

garnier

Message:

pb quand on ne met pas la vis QT corrige

Location:

trunk/source/visualization/OpenGL

Files:

• include/G4OpenGLQtViewer.hh (modified) (1 diff)
• src/G4OpenGLSceneHandler.cc (modified) (1 diff)
• src/G4OpenGLXmWindowHandlingCallbacks.cc (modified) (4 diffs)

trunk/source/visualization/OpenGL/include/G4OpenGLQtViewer.hh

@@ -39 +39 @@
 #include "globals.hh"
 
+// FIXME : L.Garnier 22 Sept 09
+// This include should be the first, because we should include 
+// qobject.h first. I don't know why, but on macOSX 10.5.8, if
+// we do not, it says :
+// /Library/Frameworks/QtCore.framework/Headers/qglobal.h:1895: error: redefinition of ‘class QTypeInfo<char>’
+// /Library/Frameworks/QtCore.framework/Headers/qglobal.h:1894: error: previous definition of ‘class QTypeInfo<char>’
+
+#include <qobject.h>
 #include "G4OpenGLViewer.hh"
 
-#include <qobject.h>
 #include <qpoint.h>
 

trunk/source/visualization/OpenGL/src/G4OpenGLSceneHandler.cc

@@ -45 +45 @@
 
 
-// FIXME : L.Garnier 22 Sept 09
-// This include should be the first, because we should include 
-// qobject.h first. I don't know why, but on macOSX 10.5.8, if
-// we do not, it says :
-// /Library/Frameworks/QtCore.framework/Headers/qglobal.h:1895: error: redefinition of ‘class QTypeInfo<char>’
-// /Library/Frameworks/QtCore.framework/Headers/qglobal.h:1894: error: previous definition of ‘class QTypeInfo<char>’
-
-#include <qobject.h>
 #include "G4OpenGLQtViewer.hh"
 #include "G4OpenGLSceneHandler.hh"

trunk/source/visualization/OpenGL/src/G4OpenGLXmWindowHandlingCallbacks.cc

@@ -65 +65 @@
   while (XCheckWindowEvent(XtDisplay(w), data->window,
                            ResizeRedirectMask, &event)) {
-    printf("G4OpenGLXmViewer::resize_callback ------ next RESIZE ! %d\n");
+    printf("G4OpenGLXmViewer::resize_callback ------ next RESIZE !\n");
   }
 #endif
@@ -81 +81 @@
 
 
-void G4OpenGLXmViewer::activate_callback (Widget w, 
-                                      XtPointer clientData, 
-                                      XtPointer callData) 
+void G4OpenGLXmViewer::activate_callback (Widget, 
+                                      XtPointer, 
+                                      XtPointer) 
 {
 #ifdef G4DEBUG_VIS_OGL
@@ -125 +125 @@
     if (((XExposeEvent *) data->event)->count != 0) {
 #ifdef G4DEBUG_VIS_OGL
-      printf("G4OpenGLXmViewer::expose_callback NOOOOO %d %d type:%d number:%d send:%d x:%d y:%d w:%d h:%d c:%d\n",width,height,
+      printf("G4OpenGLXmViewer::expose_callback NOOOOO %d %d type:%d number:%d send:%lud x:%d y:%d w:%d h:%d c:%d\n",width,height,
            ((XExposeEvent *) data->event)->type,
            ((XExposeEvent *) data->event)->serial,
@@ -140 +140 @@
     }
 #ifdef G4DEBUG_VIS_OGL
-    printf("G4OpenGLXmViewer::expose_callback Should redraw %d %d type:%d number:%d send:%d x:%d y:%d w:%d h:%d c:%d\n",width,height,
+    printf("G4OpenGLXmViewer::expose_callback Should redraw %d %d type:%d number:%d send:%lud x:%d y:%d w:%d h:%d c:%d\n",width,height,
            ((XExposeEvent *) data->event)->type,
            ((XExposeEvent *) data->event)->serial,