Changeset 595 for trunk/geant4/visualization/OpenGL

Timestamp:

Nov 9, 2007, 3:32:58 PM (18 years ago)

Author:

garnier

Message:

r629@mac-90108: laurentgarnier | 2007-11-09 15:34:57 +0100
mise a jour

Location:

trunk/geant4/visualization/OpenGL

Files:

• include/G4OpenGLImmediateQtViewer.hh (modified) (1 diff)
• include/G4OpenGLQtExportDialog.hh (modified) (1 diff)
• include/G4OpenGLQtViewer.hh (modified) (1 diff)
• include/G4OpenGLStoredQtViewer.hh (modified) (1 diff)
• src/G4OpenGLQtExportDialog.cc (modified) (1 diff)
• src/G4OpenGLQtViewer.cc (modified) (1 diff)
• src/G4OpenGLStoredQt.cc (modified) (1 diff)
• src/G4OpenGLStoredQtViewer.cc (modified) (1 diff)

trunk/geant4/visualization/OpenGL/include/G4OpenGLImmediateQtViewer.hh

@@ -41 +41 @@
 #include "G4OpenGLQtViewer.hh"
 
-#include <QtOpenGL/QGLWidget>
+#include <qgl.h> // include <qglwidget.h>
 
 #include "globals.hh"

trunk/geant4/visualization/OpenGL/include/G4OpenGLQtExportDialog.hh

@@ -35 +35 @@
 #define G4OPENGLQTEXPORTDIALOG_HH
 
-#include <QtGui/QDialog.h>
+#include <qdialog.h>
 
 class QButtonGroup;

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

@@ -42 +42 @@
 #include "G4OpenGLSceneHandler.hh"
 
-#include <QtCore/QObject>
-#include <QtCore/QPoint>
+#include <qobject.h>
+#include <qpoint.h>
 
 class QGLWidget;

trunk/geant4/visualization/OpenGL/include/G4OpenGLStoredQtViewer.hh

@@ -41 +41 @@
 #include "G4OpenGLQtViewer.hh"
 
-#include <QtOpenGL/QGLWidget>
+#include <qgl.h>  // include qglwidget
 
 class QMouseEvent;

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

@@ -34 +34 @@
 #include "G4OpenGLQtExportDialog.hh"
 
-#include <QtCore/QVariant.h>
-#include <QtGui/QPushButton.h>
-#include <QtGui/QCheckBox.h>
-#include <QtGui/QLabel.h>
-#include <QtGui/QComboBox.h>
-#include <QtGui/QSlider.h>
-#include <QtGui/QLayout.h>
-#include <QtGui/QGroupBox.h>
-#include <QtGui/QRadioButton.h>
-#include <QtGui/QImage.h>
-#include <QtGui/QLineEdit.h>
+#include <qvariant.h>
+#include <qpushbutton.h>
+#include <qcheckbox.h>
+#include <qlabel.h>
+#include <qcombobox.h>
+#include <qslider.h>
+#include <qlayout.h>
+#include <qgroupbox.h>
+#include <qradiobutton.h>
+#include <qimage.h>
+#include <qlineedit.h>
 
 G4OpenGLQtExportDialog::G4OpenGLQtExportDialog(

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

@@ -50 +50 @@
 #include "G4UIsession.hh"
 #include "G4UImanager.hh"
-#include <QtGui/QApplication.h>
-#include <QtGui/QBoxLayout.h>
-#include <QtGui/QDialog.h>
-#include <QtGui/QMenu.h>
-#include <QtGui/QImageWriter>
-#include <QtGui/QMessageBox>
-#include <QtGui/QFileDialog.h>
-#include <QtGui/QPrinter.h>
-#include <QtGui/QPainter.h>
-#include <QtOpenGL/QGLWidget>
-#include <QtGui/QDialog>
-#include <QtGui/QContextMenuEvent>
-#include <QtGui/QMenu>
-#include <QtGui/QImage>
+#include <qapplication.h>
+#include <qboxLayout.h>
+#include <qdialog.h>
+#include <qmenu.h>
+#include <qimagewriter.h>
+#include <qmessagebox.h>
+#include <qfiledialog.h>
+#include <qprinter.h>
+#include <qpainter.h>
+#include <qgl.h> // include <qglwidget.h>
+#include <qdialog.h>
+#include <qevent.h> //include <qcontextmenuevent.h>
+#include <qmenu.h>
+#include <qimage.h>
 
 

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

@@ -48 +48 @@
 {
   G4OpenGLViewerMessenger::GetInstance();
+  printf("G4OpenGLStoredQt::Create  \n");
 }
 

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

@@ -39 +39 @@
 #include "G4ios.hh"
 
-#include <QtGui/QMouseEvent>
-#include <QtGui/QContextMenuEvent>
+//#include <qmouseevent.h>
+#include <qevent.h> // include <qcontextmenuevent.h>
 
 G4OpenGLStoredQtViewer::G4OpenGLStoredQtViewer