Changeset 602 for trunk/geant4/interfaces/basic/src

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

File:

• trunk/geant4/interfaces/basic/src/G4UIQt.cc (modified) (7 diffs)

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
   }
 }