Changeset 606 for trunk/geant4/interfaces

Timestamp:

Nov 15, 2007, 11:56:03 AM (17 years ago)

Author:

garnier

Message:

r647@mac-90108: laurentgarnier | 2007-11-15 11:32:46 +0100
Ok en Qt 4.3.0

Location:

trunk/geant4/interfaces

Files:

• .gdb_history (modified) (1 diff)
• basic/include/G4UIQt.hh (modified) (2 diffs)
• basic/src/G4UIQt.cc (deleted)
• basic/src/G4UIQt_moc.cc (modified) (3 diffs)
• common/src/G4Qt.cc (modified) (2 diffs)

trunk/geant4/interfaces/.gdb_history

@@ -1 +1 @@
 run
 where
-exit
 quit

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

@@ -25 +25 @@
 //
 //
-// $Id: G4UIQt.hh,v 1.3 2007/11/09 15:03:21 lgarnier Exp $
+// $Id: G4UIQt.hh,v 1.4 2007/11/13 17:48:51 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
@@ -148 +148 @@
   void ButtonCallback(const QString&);
   void HelpTreeClicCallback();
+#if QT_VERSION < 0x040000
+  void HelpTreeDoubleClicCallback( QListViewItem*, int);
+#else
   void HelpTreeDoubleClicCallback( QTreeWidgetItem*, int);
+#endif
   void ShowHelpCallback();
   void CommandHistoryCallback();

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

@@ +1 @@
+/****************************************************************************
+** G4UIQt meta object code from reading C++ file 'G4UIQt.hh'
+**
+** Created: Tue Nov 13 18:13:09 2007
+**      by: The Qt MOC ($Id: G4UIQt_moc.cc,v 1.6 2007/11/14 10:38:49 lgarnier Exp $)
+**
+** WARNING! All changes made in this file will be lost!
+*****************************************************************************/
+
+#ifdef G4UI_BUILD_QT_SESSION
+
+#undef QT_NO_COMPAT
+#include "../include/G4UIQt.hh"
+#include <qmetaobject.h>
+#include <qapplication.h>
+
+#if QT_VERSION < 0x040000
+
+#include <private/qucomextra_p.h>
+#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26)
+#error "This file was generated using the moc from 3.3.5. It"
+#error "cannot be used with the include files from this version of Qt."
+#error "(The moc has changed too much.)"
+#endif
+
+const char *G4UIQt::className() const
+{
+    return "G4UIQt";
+}
+
+QMetaObject *G4UIQt::metaObj = 0;
+static QMetaObjectCleanUp cleanUp_G4UIQt( "G4UIQt", &G4UIQt::staticMetaObject );
+
+#ifndef QT_NO_TRANSLATION
+QString G4UIQt::tr( const char *s, const char *c )
+{
+    if ( qApp )
+        return qApp->translate( "G4UIQt", s, c, QApplication::DefaultCodec );
+    else
+        return QString::fromLatin1( s );
+}
+#ifndef QT_NO_TRANSLATION_UTF8
+QString G4UIQt::trUtf8( const char *s, const char *c )
+{
+    if ( qApp )
+        return qApp->translate( "G4UIQt", s, c, QApplication::UnicodeUTF8 );
+    else
+        return QString::fromUtf8( s );
+}
+#endif // QT_NO_TRANSLATION_UTF8
+
+#endif // QT_NO_TRANSLATION
+
+QMetaObject* G4UIQt::staticMetaObject()
+{
+    if ( metaObj )
+        return metaObj;
+    QMetaObject* parentObject = QObject::staticMetaObject();
+    static const QUMethod slot_0 = {"ClearButtonCallback", 0, 0 };
+    static const QUMethod slot_1 = {"CommandEnteredCallback", 0, 0 };
+    static const QUParameter param_slot_2[] = {
+        { 0, &static_QUType_QString, 0, QUParameter::In }
+    };
+    static const QUMethod slot_2 = {"ButtonCallback", 1, param_slot_2 };
+    static const QUMethod slot_3 = {"HelpTreeClicCallback", 0, 0 };
+    static const QUParameter param_slot_4[] = {
+        { 0, &static_QUType_ptr, "QTreeWidgetItem", QUParameter::In },
+        { 0, &static_QUType_int, 0, QUParameter::In }
+    };
+    static const QUMethod slot_4 = {"HelpTreeDoubleClicCallback", 2, param_slot_4 };
+    static const QUMethod slot_5 = {"ShowHelpCallback", 0, 0 };
+    static const QUMethod slot_6 = {"CommandHistoryCallback", 0, 0 };
+    static const QMetaData slot_tbl[] = {
+        { "ClearButtonCallback()", &slot_0, QMetaData::Private },
+        { "CommandEnteredCallback()", &slot_1, QMetaData::Private },
+        { "ButtonCallback(const QString&)", &slot_2, QMetaData::Private },
+        { "HelpTreeClicCallback()", &slot_3, QMetaData::Private },
+        { "HelpTreeDoubleClicCallback(QTreeWidgetItem*,int)", &slot_4, QMetaData::Private },
+        { "ShowHelpCallback()", &slot_5, QMetaData::Private },
+        { "CommandHistoryCallback()", &slot_6, QMetaData::Private }
+    };
+    static const QUParameter param_signal_0[] = {
+        { "text", &static_QUType_QString, 0, QUParameter::In }
+    };
+    static const QUMethod signal_0 = {"myClicked", 1, param_signal_0 };
+    static const QMetaData signal_tbl[] = {
+        { "myClicked(const QString&)", &signal_0, QMetaData::Private }
+    };
+    metaObj = QMetaObject::new_metaobject(
+        "G4UIQt", parentObject,
+        slot_tbl, 7,
+        signal_tbl, 1,
+#ifndef QT_NO_PROPERTIES
+        0, 0,
+        0, 0,
+#endif // QT_NO_PROPERTIES
+        0, 0 );
+    cleanUp_G4UIQt.setMetaObject( metaObj );
+    return metaObj;
+}
+
+void* G4UIQt::qt_cast( const char* clname )
+{
+    if ( !qstrcmp( clname, "G4UIQt" ) )
+        return this;
+    if ( !qstrcmp( clname, "G4VBasicShell" ) )
+        return (G4VBasicShell*)this;
+    if ( !qstrcmp( clname, "G4VInteractiveSession" ) )
+        return (G4VInteractiveSession*)this;
+    return QObject::qt_cast( clname );
+}
+
+// SIGNAL myClicked
+void G4UIQt::myClicked( const QString& t0 )
+{
+    activate_signal( staticMetaObject()->signalOffset() + 0, t0 );
+}
+
+bool G4UIQt::qt_invoke( int _id, QUObject* _o )
+{
+    switch ( _id - staticMetaObject()->slotOffset() ) {
+    case 0: ClearButtonCallback(); break;
+    case 1: CommandEnteredCallback(); break;
+    case 2: ButtonCallback((const QString&)static_QUType_QString.get(_o+1)); break;
+    case 3: HelpTreeClicCallback(); break;
+#if QT_VERSION < 0x040000
+    case 4: HelpTreeDoubleClicCallback((QListViewItem*)static_QUType_ptr.get(_o+1),(int)static_QUType_int.get(_o+2)); break;
+#else
+    case 4: HelpTreeDoubleClicCallback((QTreeWidgetItem*)static_QUType_ptr.get(_o+1),(int)static_QUType_int.get(_o+2)); break;
+#endif
+    case 5: ShowHelpCallback(); break;
+    case 6: CommandHistoryCallback(); break;
+    default:
+        return QObject::qt_invoke( _id, _o );
+    }
+    return TRUE;
+}
+
+bool G4UIQt::qt_emit( int _id, QUObject* _o )
+{
+    switch ( _id - staticMetaObject()->signalOffset() ) {
+    case 0: myClicked((const QString&)static_QUType_QString.get(_o+1)); break;
+    default:
+        return QObject::qt_emit(_id,_o);
+    }
+    return TRUE;
+}
+#ifndef QT_NO_PROPERTIES
+
+bool G4UIQt::qt_property( int id, int f, QVariant* v)
+{
+    return QObject::qt_property( id, f, v);
+}
+
+bool G4UIQt::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; }
+#endif // QT_NO_PROPERTIES
+
+#endif
+#endif
+
+
 /****************************************************************************
 ** Meta object code from reading C++ file 'G4UIQt.hh'
@@ -7 +168 @@
 ** WARNING! All changes made in this file will be lost!
 *****************************************************************************/
+
+#if QT_VERSION >= 0x040000
 
 #ifdef G4UI_BUILD_QT_SESSION
@@ -103 +266 @@
 
 #endif
+
+#endif

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

@@ -25 +25 @@
 //
 //
-// $Id: G4Qt.cc,v 1.4 2007/11/09 15:03:21 lgarnier Exp $
+// $Id: G4Qt.cc,v 1.5 2007/11/15 10:10:02 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
@@ -91 +91 @@
   if(QtInited==FALSE) {  //Qt should be Inited once !
     printf("G4Qt::G4Qt inited Qt\n");
-
+#if QT_VERSION < 0x040000
+    qApp = new QApplication (a_argn, a_args);
+    //    QApplication qApp(a_argn, a_args);
+#else
     new QApplication (a_argn, a_args);
+#endif
 
     if(qApp==NULL) {
       G4cout        << "G4Qt : Unable to init Qt." << G4endl;
+    } else {
+      QtInited  = TRUE;
+      SetMainInteractor (qApp);
+      SetArguments      (a_argn,a_args);
+      printf("G4Qt::G4Qt inited Qt END\n");
     }
-    QtInited  = TRUE;
-    SetMainInteractor (qApp);
   }
-  SetArguments      (a_argn,a_args);
+  if (qApp)
+    printf("G4Qt::qApp exist\n");
+  else
+    printf("G4Qt::qApp not exist\n");
   //  AddDispatcher     ((G4DispatchFunction)XtDispatchEvent);
 }