Changeset 633 for trunk/geant4


Ignore:
Timestamp:
Dec 3, 2007, 6:16:19 PM (17 years ago)
Author:
garnier
Message:

debut de correction du ticket #98

Location:
trunk/geant4
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/geant4/config/sys/WIN32-VC.gmk

    r613 r633  
    3434  ifndef UI32LIBS
    3535    UI32LIBS  := gdi32.lib user32.lib
    36   endif
    37   ifndef QTHOME
    38     QTHOME  := /usr
    39   endif
    40   ifndef QTFLAGS
    41     QTFLAGS   := -I$(QTHOME)/include/Qt -I$(QTHOME)/include
    42     MOC       := $(QTHOME)/bin/moc
    43   endif
    44   ifndef QTLIBS
    45     QT3LIBS    := -L$(QTHOME)/lib -lqt-mt
    46     QT4LIBS    := -L$(QTHOME)/lib QtCore4.lib QtGui4.lib QtOpenGL4.lib QtSql4.lib QtXml4.lib
    47     QT4LIBS    += -lG4baryons -lG4biasing -lG4bosons -lG4brep -lG4csg -lG4cuts -lG4decay -lG4detector -lG4detutils -lG4digits -lG4emhighenergy -lG4emlowenergy -lG4empolar -lG4emstandard -lG4emutils -lG4error_propagation -lG4event -lG4geombias -lG4geomBoolean -lG4geomdivision -lG4geometrymng -lG4gflash -lG4globman -lG4graphics_reps -lG4hadronic_ablation -lG4hadronic_abrasion -lG4hadronic_bert_cascade -lG4hadronic_binary -lG4hadronic_body_ci -lG4hadronic_coherent_elastic -lG4hadronic_deex_evaporation -lG4hadronic_deex_fermi_breakup -lG4hadronic_deex_fission -lG4hadronic_deex_gem_evaporation -lG4hadronic_deex_handler -lG4hadronic_deex_management -lG4hadronic_deex_multifragmentation -lG4hadronic_deex_photon_evaporation -lG4hadronic_deex_util -lG4hadronic_em_dissociation -lG4hadronic_HE -lG4hadronic_hetcpp_evaporation -lG4hadronic_hetcpp_utils -lG4hadronic_interface_ci -lG4hadronic_iso -lG4hadronic_LE -lG4hadronic_leading_particle -lG4hadronic_mgt -lG4hadronic_proc -lG4hadronic_qgstring -lG4hadronic_radioactivedecay -lG4hadronic_stop -lG4hadronic_util -lG4hadronic_xsect -lG4had_im_r_matrix -lG4had_lll_fis -lG4had_mod_man -lG4had_mod_util -lG4had_muon_nuclear -lG4had_neu_hp -lG4had_preequ_exciton -lG4had_string_diff -lG4had_string_frag -lG4had_string_man -lG4had_theo_max -lG4hepnumerics -lG4hits -lG4intercoms -lG4ions -lG4leptons -lG4magneticfield -lG4materials -lG4mesons -lG4modeling -lG4muons -lG4navigation -lG4OpenGL -lG4optical -lG4parameterisation -lG4partman -lG4partutils -lG4persistency -lG4phys_builders -lG4phys_lists -lG4procman -lG4RayTracer -lG4readout -lG4run -lG4scoring -lG4shortlived -lG4specsolids -lG4track -lG4tracking -lG4transportation -lG4Tree -lG4UIbasic -lG4UIcommon -lG4UIGAG -lG4visHepRep -lG4visXXX -lG4vis_management -lG4volumes -lG4VRML -lG4xrays
    48 
    49     QTLIBS     := $(shell test -f $(QTHOME)/lib/Qt3Support4.lib && echo $(QT4LIBS) || echo $(QT3LIBS))
    5036  endif
    5137

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

    r632 r633  
    152152  void HelpTreeDoubleClicCallback( QListViewItem*);
    153153#else
    154   void HelpTreeDoubleClicCallback( QTreeWidgetItem*, int);
     154  void HelpTreeDoubleClicCallback( QTreeWidgetItem*);
    155155#endif
    156156  void ShowHelpCallback();

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

    r632 r633  
    3030// L. Garnier
    3131
    32 //#define DEBUG
     32//#define GEANT4_QT_DEBUG
    3333
    3434#ifdef G4UI_BUILD_QT_SESSION
    … …  
    547547    fHelpDialog = new QDialog(0,0,FALSE,Qt::WStyle_Title | Qt::WStyle_SysMenu | Qt::WStyle_MinMax );
    548548    QVBoxLayout *vLayout = new QVBoxLayout(fHelpDialog);
    549     QSplitter *splitter = new QSplitter(Qt::Horizontal,fHelpDialog);
    550549#else
    551550    QVBoxLayout *vLayout = new QVBoxLayout();
    552551    fHelpDialog = new QDialog(0,Qt::WindowTitleHint | Qt::WindowSystemMenuHint | Qt::WindowMinMaxButtonsHint);
    553     QSplitter *splitter = new QSplitter(Qt::Horizontal);
    554 #endif
     552#endif
     553    QSplitter *splitter = new QSplitter(Qt::Horizontal,fHelpDialog);
    555554    QPushButton *exitButton = new QPushButton("Exit",fHelpDialog);
    556555    connect(exitButton, SIGNAL(clicked()), fHelpDialog,SLOT(close()));
    … …  
    582581#endif
    583582
    584 #if QT_VERSION < 0x040000
    585583    fHelpArea = new QTextEdit(splitter);
    586 #else
    587     fHelpArea = new QTextEdit();
    588 #endif
    589584    fHelpArea->setReadOnly(true);
    590585
    … …  
    12551250#else
    12561251QTreeWidgetItem* item
    1257 ,int
    12581252#endif
    12591253)

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

    r632 r633  
    303303      93,   31,   31,   31, 0x08,
    304304     117,   31,   31,   31, 0x08,
    305      140,  189,   31,   31, 0x08,
    306      191,   31,   31,   31, 0x08,
    307      210,   31,   31,   31, 0x08,
     305     140,   31,   31,   31, 0x08,
     306     185,   31,   31,   31, 0x08,
     307     204,   31,   31,   31, 0x08,
    308308
    309309       0        // eod
    … …  
    315315    "CommandEnteredCallback()\0"
    316316    "ButtonCallback(QString)\0HelpTreeClicCallback()\0"
    317     "HelpTreeDoubleClicCallback(QTreeWidgetItem*,int)\0"
    318     ",\0ShowHelpCallback()\0CommandHistoryCallback()\0"
     317    "HelpTreeDoubleClicCallback(QTreeWidgetItem*)\0"
     318    "ShowHelpCallback()\0CommandHistoryCallback()\0"
    319319};
    320320
    … …  
    333333    if (!_clname) return 0;
    334334    if (!strcmp(_clname, qt_meta_stringdata_G4UIQt))
    335         return static_cast<void*>(const_cast<G4UIQt*>(this));
     335        return static_cast<void*>(const_cast< G4UIQt*>(this));
    336336    if (!strcmp(_clname, "G4VBasicShell"))
    337         return static_cast<G4VBasicShell*>(const_cast<G4UIQt*>(this));
     337        return static_cast< G4VBasicShell*>(const_cast< G4UIQt*>(this));
    338338    if (!strcmp(_clname, "G4VInteractiveSession"))
    339         return static_cast<G4VInteractiveSession*>(const_cast<G4UIQt*>(this));
     339        return static_cast< G4VInteractiveSession*>(const_cast< G4UIQt*>(this));
    340340    return QObject::qt_metacast(_clname);
    341341}
    … …  
    354354        case 4: ButtonCallback((*reinterpret_cast< const QString(*)>(_a[1]))); break;
    355355        case 5: HelpTreeClicCallback(); break;
    356         case 6: HelpTreeDoubleClicCallback((*reinterpret_cast< QTreeWidgetItem*(*)>(_a[1])),(*reinterpret_cast< int(*)>(_a[2]))); break;
     356        case 6: HelpTreeDoubleClicCallback((*reinterpret_cast< QTreeWidgetItem*(*)>(_a[1]))); break;
    357357        case 7: ShowHelpCallback(); break;
    358358        case 8: CommandHistoryCallback(); break;

  • trunk/geant4/specific-geant4-dev.sh

    r624 r633  
    2828  export G4LEDATA=$G4DATA/G4EMLOW3.0
    2929#  export QTHOME=/usr/local/Qt/3.3.8
    30 #  export QTHOME=/usr/local/Qt/4.2.2
    31   export QTHOME=/sw
    32   export QTLIBS="-L/sw/lib -lqt-mt"
     30  export QTHOME=/usr/local/Qt/4.2.2
     31#  export QTHOME=/sw
     32#  export QTLIBS="-L/sw/lib -lqt-mt"
     33  unset QTLIBS
    3334
    3435  #//////////////////////////////////////////////////////////

  • trunk/geant4/visualization/OpenGL/include/G4OpenGLQtExportDialog.hh

    r600 r633  
    8585    invert buttons and hide/unhide size
    8686*/
    87   void changeSizeBox(bool); 
     87  void changeSizeBox(); 
    8888
    8989  /** Called by changing value in height lineEdit. If ratio is keep, will also change the width

  • trunk/geant4/visualization/OpenGL/src/G4OpenGLQtExportDialog.cc

    r606 r633  
    3030//
    3131
     32#define GEANT4_QT_DEBUG
    3233#ifdef G4VIS_BUILD_OPENGLQT_DRIVER
    3334
    … …  
    4546#include <qimage.h>
    4647#include <qlineedit.h>
     48#include <qbuttongroup.h>
    4749
    4850G4OpenGLQtExportDialog::G4OpenGLQtExportDialog(
    … …  
    7072
    7173  // global layout
    72 #if QT_VERSION < 0x040000
    7374  QVBoxLayout* globalVLayout = new QVBoxLayout(this);
    74 #else
    75   QVBoxLayout* globalVLayout = new QVBoxLayout();
    76 #endif
    7775
    7876 
    … …  
    8078      nomFich.endsWith(".jepg")) {
    8179   
    82     QGroupBox *imageGroupBox = new QGroupBox(tr("Image quality"));
    83 #if QT_VERSION < 0x040000
     80    QGroupBox *imageGroupBox = new QGroupBox(tr("Image quality"),this);
    8481    QVBoxLayout *imageGroupBoxLayout = new QVBoxLayout(imageGroupBox);
    85 #else
    86     QVBoxLayout *imageGroupBoxLayout = new QVBoxLayout;
    87 #endif
    8882    QWidget *sliderBox = new QWidget;
    8983
    90 #if QT_VERSION < 0x040000
    9184    QHBoxLayout *hSlider = new QHBoxLayout(sliderBox);
    92 #else
    93     QHBoxLayout *hSlider = new QHBoxLayout;
    94 #endif
    9585
    9686    //    qualityLabel =  new QLabel( tr( "Image quality" ) );
    9787    //    imageGroupBoxLayout->addWidget(qualityLabel);
    98     qualitySlider= new QSlider(Qt::Horizontal,0);
     88    qualitySlider= new QSlider(Qt::Horizontal,this);
    9989#if QT_VERSION < 0x040000
    10090    qualitySlider->setMinValue(0);
    … …  
    10797#endif
    10898    qualitySlider->setValue(60);
    109     hSlider->addWidget(new QLabel("low",0));
     99    hSlider->addWidget(new QLabel("low",this));
    110100    hSlider->addWidget(qualitySlider);
    111     hSlider->addWidget(new QLabel("Maximum",0));
     101    hSlider->addWidget(new QLabel("Maximum",this));
    112102#if QT_VERSION >= 0x040000
    113103    sliderBox->setLayout(hSlider);
    … …  
    122112 
    123113  if(nomFich.endsWith(".eps")) {
    124     QGroupBox *EPSGroupBox = new QGroupBox(tr("EPS options"));
    125 
    126 #if QT_VERSION < 0x040000
    127     QVBoxLayout *EPSGroupBoxLayout = new QVBoxLayout(EPSGroupBox);
    128 #else
    129     QVBoxLayout *EPSGroupBoxLayout = new QVBoxLayout;
    130 #endif
    131114
    132115    //    transparencyEPS = new QCheckBox( "transparencyEPS" );
    … …  
    134117    //    transparencyEPS->setChecked( true );
    135118
    136     colorButton = new QRadioButton("Color",0);
    137     BWButton = new QRadioButton("Grayscale",0);
     119    colorButton = new QRadioButton("Color",this);
     120    BWButton = new QRadioButton("Grayscale",this);
     121
     122    QWidget * EPSWidgetGroupBox; // widget containing group button
     123    QButtonGroup * EPSButtonGroupBox; // group button
     124#if QT_VERSION < 0x040000
     125    EPSButtonGroupBox = new QButtonGroup( 2,Qt::Vertical, tr("EPS options"),this);
     126    EPSButtonGroupBox->insert(colorButton);
     127    EPSButtonGroupBox->insert(BWButton);
     128    EPSButtonGroupBox->setExclusive(true);
    138129    colorButton->setChecked( true );
    139     BWButton->setChecked( false );
    140 
    141 
    142     //    EPSGroupBoxLayout->addWidget(transparencyEPS);   
     130    EPSWidgetGroupBox = EPSButtonGroupBox;
     131
     132#else
     133    EPSWidgetGroupBox = new QGroupBox(tr("EPS options"));
     134    QVBoxLayout *EPSGroupBoxLayout = new QVBoxLayout(EPSWidgetGroupBox);
     135    EPSButtonGroupBox = new QButtonGroup();
     136    colorButton->setChecked( true );
     137    EPSButtonGroupBox->addButton(colorButton);
     138    EPSButtonGroupBox->addButton(BWButton);
     139    EPSButtonGroupBox->setExclusive(true);
     140
    143141    EPSGroupBoxLayout->addWidget(colorButton);   
    144142    EPSGroupBoxLayout->addWidget(BWButton);   
    145 #if QT_VERSION >= 0x040000
    146     EPSGroupBox->setLayout(EPSGroupBoxLayout);
    147 #endif
    148     globalVLayout->addWidget(EPSGroupBox);
     143    EPSWidgetGroupBox->setLayout(EPSGroupBoxLayout);
     144
     145#endif
     146
     147    //    EPSGroupBoxLayout->addWidget(transparencyEPS);   
     148    globalVLayout->addWidget(EPSWidgetGroupBox);
    149149
    150150  }
    … …  
    156156     nomFich.endsWith(".xpm")) {
    157157
    158     QGroupBox *transparencyGroupBox = new QGroupBox(tr("Transparency"));
    159 #if QT_VERSION < 0x040000
     158    QGroupBox *transparencyGroupBox = new QGroupBox(tr("Transparency"),this);
    160159    QVBoxLayout *transparencyGroupBoxLayout = new QVBoxLayout(transparencyGroupBox);
    161 #else
    162     QVBoxLayout *transparencyGroupBoxLayout = new QVBoxLayout;
    163 #endif
    164 
    165     boxTransparency = new QCheckBox("Save transparency",0);
     160
     161    boxTransparency = new QCheckBox("Save transparency",this);
    166162    boxTransparency->setChecked( false );
    167163    //    boxTransparency->setEnabled(false);
    … …  
    176172
    177173  // size box
    178   QGroupBox *sizeGroupBox = new QGroupBox(tr("Size"));
    179174  QWidget* modifyAndRatioWidget = new QWidget;
    180175
    181 #if QT_VERSION < 0x040000
    182176  QHBoxLayout *modifyAndRatioLayout = new QHBoxLayout(modifyAndRatioWidget);
    183   QVBoxLayout *sizeGroupBoxLayout = new QVBoxLayout(sizeGroupBox);
    184 #else
    185   QHBoxLayout *modifyAndRatioLayout = new QHBoxLayout;
    186   QVBoxLayout *sizeGroupBoxLayout = new QVBoxLayout;
    187 #endif
    188177
    189178  // original button
    190   original = new QRadioButton("Original",0);
     179  original = new QRadioButton("Original",this);
     180  // modify and ratio
     181  modify = new QRadioButton("Modify",this);
     182
     183  QWidget * sizeWidgetGroupBox; // widget containing group button
     184  QButtonGroup * sizeButtonGroupBox; // group button
     185  QLayout *sizeGroupBoxLayout;
     186#if QT_VERSION < 0x040000
     187  sizeButtonGroupBox = new QButtonGroup ( 2,Qt::Vertical, tr("Size"),this);
     188
     189  original = new QRadioButton("Original",sizeButtonGroupBox);
     190  modify = new QRadioButton("Modify",sizeButtonGroupBox);
     191
     192  sizeButtonGroupBox->insert(original);
     193  sizeButtonGroupBox->insert(modify);
     194  sizeButtonGroupBox->setExclusive(true);
    191195  original->setChecked( true );
    192   sizeGroupBoxLayout->addWidget(original);
    193 
    194   // modify and ratio
    195   modify = new QRadioButton("Modify",0);
    196   modify->setChecked( false );
    197 
    198   ratioCheckBox = new QCheckBox( "Keep ratio",0 );
     196  sizeWidgetGroupBox = sizeButtonGroupBox;
     197  sizeGroupBoxLayout = sizeWidgetGroupBox->layout();
     198
     199#else
     200 
     201  sizeWidgetGroupBox = new QGroupBox(tr("Size"));
     202  sizeGroupBoxLayout = new QVBoxLayout(sizeWidgetGroupBox);
     203  sizeButtonGroupBox = new QButtonGroup();
     204  original->setChecked( true );
     205
     206  original = new QRadioButton("Original");
     207  modify = new QRadioButton("Modify");
     208
     209  sizeButtonGroupBox->addButton(modify);
     210  sizeButtonGroupBox->addButton(original);
     211  sizeButtonGroupBox->setExclusive(true);
     212
     213  sizeGroupBoxLayout->addWidget(modify);   
     214  sizeGroupBoxLayout->addWidget(original);   
     215 
     216  sizeWidgetGroupBox->setLayout(sizeGroupBoxLayout);
     217#endif
     218
     219
     220  ratioCheckBox = new QCheckBox( "Keep ratio",modifyAndRatioWidget);
    199221  ratioCheckBox->setChecked( true );
    200222
    … …  
    204226  modifyAndRatioWidget->setLayout(modifyAndRatioLayout);
    205227#endif
     228#if QT_VERSION < 0x040000
     229  sizeGroupBoxLayout->add(modifyAndRatioWidget);
     230#else
    206231  sizeGroupBoxLayout->addWidget(modifyAndRatioWidget);
     232#endif
    207233  if (modify->isChecked()) {
    208234    ratioCheckBox->show();
    … …  
    211237  }
    212238
    213   connect( original, SIGNAL( clicked(bool) ), this, SLOT( changeSizeBox(true)) );
    214   connect( modify, SIGNAL( clicked(bool) ), this, SLOT( changeSizeBox(false) ) );
     239#if QT_VERSION < 0x040000
     240  connect( sizeButtonGroupBox, SIGNAL( clicked(int) ), this, SLOT( changeSizeBox()) );
     241#else
     242  connect( sizeButtonGroupBox, SIGNAL( buttonClicked(int) ), this, SLOT( changeSizeBox()) );
     243#endif
    215244
    216245  // height
    217246  heightWidget = new QWidget;
    218247
    219 #if QT_VERSION < 0x040000
    220248  QHBoxLayout *heightLineLayout = new QHBoxLayout(heightWidget);
    221 #else
    222   QHBoxLayout *heightLineLayout = new QHBoxLayout;
    223 #endif
    224249
    225250  QString tmp;
    226251 
    227   heightLineLayout->addWidget(new QLabel("Height",0));
    228   height = new QLineEdit(tmp.setNum(originalHeight),0);
     252  heightLineLayout->addWidget(new QLabel("Height",this));
     253  height = new QLineEdit(tmp.setNum(originalHeight),this);
    229254  height->setMaxLength(5);
     255#if QT_VERSION < 0x040000
     256  heightLineLayout->add(height);
     257#else
    230258  heightLineLayout->addWidget(height);
     259#endif
    231260#if QT_VERSION >= 0x040000
    232261  heightWidget->setLayout(heightLineLayout);
    233262#endif
     263#if QT_VERSION < 0x040000
     264  sizeGroupBoxLayout->add(heightWidget);
     265#else
    234266  sizeGroupBoxLayout->addWidget(heightWidget);
     267#endif
    235268  connect( height, SIGNAL( textChanged ( const QString& ) ), this, SLOT( textHeightChanged(const QString &) ) );
    236269
    … …  
    239272  widthWidget = new QWidget;
    240273
    241 #if QT_VERSION < 0x040000
    242274  QHBoxLayout *widthLineLayout = new QHBoxLayout(widthWidget);
    243 #else
    244   QHBoxLayout *widthLineLayout = new QHBoxLayout;
    245 #endif
    246 
    247   widthLineLayout->addWidget(new QLabel("Width ",0));
    248   width = new QLineEdit(tmp.setNum(originalWidth),0);
     275
     276#if QT_VERSION < 0x040000
     277  widthLineLayout->add(new QLabel("Width ",widthWidget));
     278#else
     279  widthLineLayout->addWidget(new QLabel("Width ",widthWidget));
     280#endif
     281  width = new QLineEdit(tmp.setNum(originalWidth),this);
    249282  width->setMaxLength(5);
     283#if QT_VERSION < 0x040000
     284  widthLineLayout->add(width);
     285#else
    250286  widthLineLayout->addWidget(width);
     287#endif
    251288#if QT_VERSION >= 0x040000
    252289  widthWidget->setLayout(widthLineLayout);
    253290#endif
     291#if QT_VERSION < 0x040000
     292  sizeGroupBoxLayout->add(widthWidget);
     293#else
    254294  sizeGroupBoxLayout->addWidget(widthWidget);
     295#endif
    255296  connect( width, SIGNAL( textChanged ( const QString& ) ), this, SLOT( textWidthChanged(const QString &) ) );
    256297
    257298#if QT_VERSION >= 0x040000
    258   sizeGroupBox->setLayout(sizeGroupBoxLayout);
    259 #endif
    260   globalVLayout->addWidget(sizeGroupBox);
     299  sizeWidgetGroupBox->setLayout(sizeGroupBoxLayout);
     300#endif
     301  globalVLayout->addWidget(sizeWidgetGroupBox);
    261302
    262303  heightWidget->hide();
    … …  
    265306  // button ok/cancel box
    266307
    267   QGroupBox *buttonGroupBox = new QGroupBox();
    268 
    269 #if QT_VERSION < 0x040000
     308  QGroupBox *buttonGroupBox = new QGroupBox(this);
     309
    270310  QHBoxLayout *buttonGroupBoxLayout = new QHBoxLayout(buttonGroupBox);
    271 #else
    272   QHBoxLayout *buttonGroupBoxLayout = new QHBoxLayout;
    273 #endif
    274 
    275   buttonOk = new QPushButton( tr( "&OK" ),0 );
     311
     312  buttonOk = new QPushButton( tr( "&OK" ),buttonGroupBox );
    276313  buttonOk->setAutoDefault( TRUE );
    277314  buttonOk->setDefault( TRUE );
    278315  buttonGroupBoxLayout->addWidget(buttonOk);
    279316
    280   buttonCancel = new QPushButton( tr( "&Cancel" ),0 );
     317  buttonCancel = new QPushButton( tr( "&Cancel" ),buttonGroupBox );
    281318  buttonCancel->setAutoDefault( TRUE );
    282319  buttonGroupBoxLayout->addWidget(buttonCancel);
    … …  
    333370
    334371
    335 void G4OpenGLQtExportDialog::changeSizeBox(bool aClick)
    336 {
    337   if (aClick) {
    338     modify->toggle();
    339   } else {
    340     original->toggle();
    341   }
     372void G4OpenGLQtExportDialog::changeSizeBox()
     373{
    342374  if ( original->isChecked()) {
    343375    heightWidget->hide();

  • trunk/geant4/visualization/OpenGL/src/G4OpenGLQtExportDialog_moc.cc

    r632 r633  
    206206** Meta object code from reading C++ file 'G4OpenGLQtExportDialog.hh'
    207207**
    208 ** Created: Fri Sep 28 12:35:41 2007
    209 **      by: The Qt Meta Object Compiler version 59 (Qt 4.2.2)
     208** Created: Mon Dec 3 16:30:26 2007
     209**      by: The Qt Meta Object Compiler version 59 (Qt 4.3.0)
    210210**
    211211** WARNING! All changes made in this file will be lost!
    212212*****************************************************************************/
    213 
    214 
    215213
    216214#include "../include/G4OpenGLQtExportDialog.hh"
    … …  
    218216#error "The header file 'G4OpenGLQtExportDialog.hh' doesn't include <QObject>."
    219217#elif Q_MOC_OUTPUT_REVISION != 59
    220 #error "This file was generated using the moc from 4.2.2. It"
     218#error "This file was generated using the moc from 4.3.0. It"
    221219#error "cannot be used with the include files from this version of Qt."
    222220#error "(The moc has changed too much.)"
    … …  
    234232
    235233 // slots: signature, parameters, type, tag, flags
    236       23,   43,   43,   43, 0x0a,
    237       44,   43,   43,   43, 0x0a,
    238       70,   43,   43,   43, 0x0a,
     234      23,   39,   39,   39, 0x0a,
     235      40,   39,   39,   39, 0x0a,
     236      66,   39,   39,   39, 0x0a,
    239237
    240238       0        // eod
    … …  
    242240
    243241static const char qt_meta_stringdata_G4OpenGLQtExportDialog[] = {
    244     "G4OpenGLQtExportDialog\0changeSizeBox(bool)\0"
     242    "G4OpenGLQtExportDialog\0changeSizeBox()\0"
    245243    "\0textWidthChanged(QString)\0"
    246244    "textHeightChanged(QString)\0"
    … …  
    261259    if (!_clname) return 0;
    262260    if (!strcmp(_clname, qt_meta_stringdata_G4OpenGLQtExportDialog))
    263         return static_cast<void*>(const_cast<G4OpenGLQtExportDialog*>(this));
     261        return static_cast<void*>(const_cast< G4OpenGLQtExportDialog*>(this));
    264262    return QDialog::qt_metacast(_clname);
    265263}
    … …  
    272270    if (_c == QMetaObject::InvokeMetaMethod) {
    273271        switch (_id) {
    274         case 0: changeSizeBox((*reinterpret_cast< bool(*)>(_a[1]))); break;
     272        case 0: changeSizeBox(); break;
    275273        case 1: textWidthChanged((*reinterpret_cast< const QString(*)>(_a[1]))); break;
    276274        case 2: textHeightChanged((*reinterpret_cast< const QString(*)>(_a[1]))); break;

  • trunk/geant4/visualization/OpenGL/src/G4OpenGLQtViewer.cc

    r632 r633  
    212212  }
    213213
    214 #if QT_VERSION < 0x040000
    215214  QHBoxLayout *mainLayout = new QHBoxLayout(GLWindow);
    216 #else
    217   QHBoxLayout *mainLayout = new QHBoxLayout;
    218 #endif
    219215
    220216  mainLayout->addWidget(fWindow);
Note: See TracChangeset for help on using the changeset viewer.