Changeset 602

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

Files:

• interfaces/basic/include/G4UIQt.hh (modified) (1 diff)
• interfaces/basic/src/G4UIQt.cc (modified) (7 diffs)
• interfaces/common/src/G4Qt.cc (modified) (1 diff)
• specific-geant4-dev.sh (modified) (1 diff)
• visualization/OpenGL/src/G4OpenGLQtExportDialog_moc_030305.cc (modified) (2 diffs)
• visualization/OpenGL/src/G4OpenGLQtViewer.cc (modified) (4 diffs)
• visualization/OpenGL/src/G4OpenGLQtViewer_moc_030305.cc (modified) (2 diffs)

trunk/geant4/interfaces/basic/include/G4UIQt.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4UIQt.hh,v 1.2 2007/11/08 17:00:09 lgarnier Exp $
+// $Id: G4UIQt.hh,v 1.3 2007/11/09 15:03:21 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //

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

@@ -25 +25 @@
 //
 //
-// $Id: G4UIQt.cc,v 1.3 2007/11/08 17:00:09 lgarnier Exp $
+// $Id: G4UIQt.cc,v 1.4 2007/11/09 15:03:21 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
@@ -50 +50 @@
 #include <qlineedit.h>
 #include <qwidget.h>
+#if QT_VERSION >= 0x040000
 #include <qmenu.h>
+#else
+#include <qpopupmenu.h>
+#endif
 #include <qmenubar.h>
-#include <qboxlayout.h>
+#include <qlayout.h>
 #include <qpushbutton.h>
 #include <qlabel.h>
@@ -717 +721 @@
         }
       } else if (e->key() == (Qt::Key_Tab)) {
+#if QT_VERSION < 0x040000
+        G4String ss = Complete(fCommandArea->text().ascii());
+#else
         G4String ss = Complete(fCommandArea->text().toStdString().c_str());
+#endif
         fCommandArea->setText((char*)(ss.data()));
 
@@ -762 +770 @@
 )
 {
+#if QT_VERSION < 0x040000
+  G4String command (fCommandArea->text().ascii());
+#else
   G4String command (fCommandArea->text().toStdString().c_str());
+#endif
   if (fCommandArea->text().trimmed() != "") {
     fCommandHistoryArea->addItem(fCommandArea->text());
@@ -793 +805 @@
 )
 {
+#if QT_VERSION < 0x040000
+  G4String ss = G4String(aCommand.ascii());
+#else
   G4String ss = G4String(aCommand.toStdString().c_str());
+#endif
   ApplyShellCommand(ss,exitSession,exitPause);
   if(exitSession==true) 
@@ -824 +840 @@
   if(UI==NULL) return;
   G4UIcommandTree * treeTop = UI->GetTree();
+#if QT_VERSION < 0x040000
+  G4UIcommand* command = treeTop->FindPath(item->text (1).ascii());
+#else
   G4UIcommand* command = treeTop->FindPath(item->text (1).toStdString().c_str());
+#endif
   if (command) {
     fHelpArea->setText(GetCommandList(command));
@@ -830 +850 @@
     // this is not a command, this is a sub directory
     // We display the Title
+#if QT_VERSION < 0x040000
+    fHelpArea->setText(item->text (1).ascii());
+#else
     fHelpArea->setText(item->text (1).toStdString().c_str());
+#endif
   }
 }

trunk/geant4/interfaces/common/src/G4Qt.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4Qt.cc,v 1.3 2007/11/08 17:00:09 lgarnier Exp $
+// $Id: G4Qt.cc,v 1.4 2007/11/09 15:03:21 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //

trunk/geant4/specific-geant4-dev.sh

@@ -27 +27 @@
   export G4RADIOACTIVEDATA=$G4DATA/RadiativeDecay
   export G4LEDATA=$G4DATA/G4EMLOW3.0
-#  export QTHOME=/usr/local/Qt/4.3.0
+  export QTHOME=/usr/local/Qt/4.3.0
   #//////////////////////////////////////////////////////////
   # GUI, Visualization :

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>