Changeset 633 for trunk/geant4/interfaces

Timestamp:

Dec 3, 2007, 6:16:19 PM (17 years ago)

Author:

garnier

Message:

debut de correction du ticket #98

Location:

trunk/geant4/interfaces/basic

Files:

• include/G4UIQt.hh (modified) (1 diff)
• src/G4UIQt.cc (modified) (4 diffs)
• src/G4UIQt_moc.cc (modified) (4 diffs)

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

@@ -152 +152 @@
   void HelpTreeDoubleClicCallback( QListViewItem*);
 #else
-  void HelpTreeDoubleClicCallback( QTreeWidgetItem*, int);
+  void HelpTreeDoubleClicCallback( QTreeWidgetItem*);
 #endif
   void ShowHelpCallback();

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

@@ -30 +30 @@
 // L. Garnier
 
-//#define DEBUG
+//#define GEANT4_QT_DEBUG
 
 #ifdef G4UI_BUILD_QT_SESSION
@@ -547 +547 @@
     fHelpDialog = new QDialog(0,0,FALSE,Qt::WStyle_Title | Qt::WStyle_SysMenu | Qt::WStyle_MinMax );
     QVBoxLayout *vLayout = new QVBoxLayout(fHelpDialog);
-    QSplitter *splitter = new QSplitter(Qt::Horizontal,fHelpDialog);
 #else
     QVBoxLayout *vLayout = new QVBoxLayout();
     fHelpDialog = new QDialog(0,Qt::WindowTitleHint | Qt::WindowSystemMenuHint | Qt::WindowMinMaxButtonsHint);
-    QSplitter *splitter = new QSplitter(Qt::Horizontal);
-#endif
+#endif
+    QSplitter *splitter = new QSplitter(Qt::Horizontal,fHelpDialog);
     QPushButton *exitButton = new QPushButton("Exit",fHelpDialog);
     connect(exitButton, SIGNAL(clicked()), fHelpDialog,SLOT(close()));
@@ -582 +581 @@
 #endif
 
-#if QT_VERSION < 0x040000
     fHelpArea = new QTextEdit(splitter);
-#else
-    fHelpArea = new QTextEdit();
-#endif
     fHelpArea->setReadOnly(true);
 
@@ -1255 +1250 @@
 #else
 QTreeWidgetItem* item
-,int
 #endif
 )

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

@@ -303 +303 @@
       93,   31,   31,   31, 0x08,
      117,   31,   31,   31, 0x08,
-     140,  189,   31,   31, 0x08,
-     191,   31,   31,   31, 0x08,
-     210,   31,   31,   31, 0x08,
+     140,   31,   31,   31, 0x08,
+     185,   31,   31,   31, 0x08,
+     204,   31,   31,   31, 0x08,
 
        0        // eod
@@ -315 +315 @@
     "CommandEnteredCallback()\0"
     "ButtonCallback(QString)\0HelpTreeClicCallback()\0"
-    "HelpTreeDoubleClicCallback(QTreeWidgetItem*,int)\0"
-    ",\0ShowHelpCallback()\0CommandHistoryCallback()\0"
+    "HelpTreeDoubleClicCallback(QTreeWidgetItem*)\0"
+    "ShowHelpCallback()\0CommandHistoryCallback()\0"
 };
 
@@ -333 +333 @@
     if (!_clname) return 0;
     if (!strcmp(_clname, qt_meta_stringdata_G4UIQt))
-        return static_cast<void*>(const_cast<G4UIQt*>(this));
+        return static_cast<void*>(const_cast< G4UIQt*>(this));
     if (!strcmp(_clname, "G4VBasicShell"))
-        return static_cast<G4VBasicShell*>(const_cast<G4UIQt*>(this));
+        return static_cast< G4VBasicShell*>(const_cast< G4UIQt*>(this));
     if (!strcmp(_clname, "G4VInteractiveSession"))
-        return static_cast<G4VInteractiveSession*>(const_cast<G4UIQt*>(this));
+        return static_cast< G4VInteractiveSession*>(const_cast< G4UIQt*>(this));
     return QObject::qt_metacast(_clname);
 }
@@ -354 +354 @@
         case 4: ButtonCallback((*reinterpret_cast< const QString(*)>(_a[1]))); break;
         case 5: HelpTreeClicCallback(); break;
-        case 6: HelpTreeDoubleClicCallback((*reinterpret_cast< QTreeWidgetItem*(*)>(_a[1])),(*reinterpret_cast< int(*)>(_a[2]))); break;
+        case 6: HelpTreeDoubleClicCallback((*reinterpret_cast< QTreeWidgetItem*(*)>(_a[1]))); break;
         case 7: ShowHelpCallback(); break;
         case 8: CommandHistoryCallback(); break;