Changeset 602 for trunk/geant4/visualization/OpenGL

Timestamp:

Nov 15, 2007, 11:55:45 AM (17 years ago)

Author:

garnier

Message:

r643@mac-90108: laurentgarnier | 2007-11-12 19:00:52 +0100
modif pour qt3

Location:

trunk/geant4/visualization/OpenGL/src

Files:

• G4OpenGLQtExportDialog_moc_030305.cc (modified) (2 diffs)
• G4OpenGLQtViewer.cc (modified) (4 diffs)
• G4OpenGLQtViewer_moc_030305.cc (modified) (2 diffs)

trunk/geant4/visualization/OpenGL/src/G4OpenGLQtExportDialog_moc_030305.cc

@@ -1 @@
-#if QT_VERSION < 0x040202
-
 /****************************************************************************
 ** G4OpenGLQtExportDialog meta object code from reading C++ file 'G4OpenGLQtExportDialog.hh'
@@ -14 +12 @@
 #include <qmetaobject.h>
 #include <qapplication.h>
+
+#if QT_VERSION < 0x040202
 
 #include <private/qucomextra_p.h>

trunk/geant4/visualization/OpenGL/src/G4OpenGLQtViewer.cc

@@ -60 +60 @@
 #include <qaction.h>
 #include <qwidgetlist.h>
-#include <qmenudata.h>
 #include <qpopupmenu.h>
 #include <qimage.h>
@@ -954 +953 @@
 #else
   nomFich += "."+selectedFilter->toLower();
-  printf("G4OpenGLQtViewer::name %s\n",nomFich.toAscii());
+  printf("G4OpenGLQtViewer::name %s\n",nomFich.toStdString().c_str());
 #endif
   G4OpenGLQtExportDialog* exportDialog= new G4OpenGLQtExportDialog(GLWindow,nomFich,fWindow->height(),fWindow->width());
@@ -1171 +1170 @@
   fp = fopen (aFilename.ascii(), "w");
 #else
-  fp = fopen (aFilename.toAscii(), "w");
+  fp = fopen (aFilename.toStdString().c_str(), "w");
 #endif
   if (fp == NULL) {
@@ -1181 +1180 @@
   fprintf (fp, "%%%%Title: %s\n", aFilename.ascii());
 #else
-  fprintf (fp, "%%%%Title: %s\n", aFilename.toAscii());
+  fprintf (fp, "%%%%Title: %s\n", aFilename.toStdString().c_str());
 #endif
   fprintf (fp, "%%%%Creator: OpenGL pixmap render output\n");

trunk/geant4/visualization/OpenGL/src/G4OpenGLQtViewer_moc_030305.cc

@@ -1 @@
-#if QT_VERSION < 0x040202
-
 /****************************************************************************
 ** G4OpenGLQtViewer meta object code from reading C++ file 'G4OpenGLQtViewer.hh'
@@ -14 +12 @@
 #include <qmetaobject.h>
 #include <qapplication.h>
+
+#if QT_VERSION < 0x040202
 
 #include <private/qucomextra_p.h>