Changeset 490 for trunk/geant4/interfaces/basic/include

Timestamp:

Jun 8, 2007, 4:43:30 PM (17 years ago)

Author:

garnier

Message:

r583@mac-90108: laurentgarnier | 2007-06-07 12:23:33 +0200
ca compile avec les moc

File:

• trunk/geant4/interfaces/basic/include/G4UIQt.hh (modified) (4 diffs)

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

@@ -31 +31 @@
 #define G4UIQt_h 
 
-//#if defined(G4UI_BUILD_QT_SESSION) || defined(G4UI_USE_QT)
+#if defined(G4UI_BUILD_QT_SESSION) || defined(G4UI_USE_QT)
 
 #include <map>
@@ -42 +42 @@
 #include <QtGui/qtextedit.h>
 #include <QObject>
+
 class G4UIsession;
 
@@ -64 +65 @@
 // Class description - end :
 
-class G4UIQt : public G4VBasicShell, public G4VInteractiveSession {
+class G4UIQt : public QObject, public G4VBasicShell, public G4VInteractiveSession {
+  Q_OBJECT
 
 public: // With description
@@ -102 +104 @@
   G4bool fHelp;
   G4int fHelpChoice;
-  QMainWindow *fMainWindow;
-  UIQtCentralWidget *fCentralWidget;
-};
-
-class UIQtCentralWidget : public QWidget, public QObject {
-
-Q_OBJECT
-
-  QLineEdit *promptArea;
+  QMainWindow * mainWindow;
+  QLineEdit * promptArea;
   QTextEdit *textArea;
-
-private slots:
-  void clearButtonCallback();
+  //  static void ButtonCallback(Widget,XtPointer,XtPointer);
 
 };
 
-//#endif
+#endif
 
 #endif