Ignore:
Timestamp:
Oct 15, 2008, 2:49:22 PM (16 years ago)
Author:
garnier
Message:

see history

Location:
trunk/source/interfaces
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/source/interfaces/History

    r862 r867  
    1 $Id: History,v 1.100 2008/10/07 00:46:19 lgarnier Exp $
     1$Id: History,v 1.101 2008/10/15 09:09:47 lgarnier Exp $
    22-------------------------------------------------------------------
    33
    … …  
    1818     ----------------------------------------------------------
    1919
     2015 October, Laurent Garnier
     21 - Fix a problem on some linux with QApplication. But this is NOT the good way to do it...
     22 - Fix a qt3 backward compatibility on G4UIQt.cc
     23
     24
    20257 October, Laurent Garnier
    2126 - Fix a G4cout possible problem cause by recursive G4cout call.

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

    r850 r867  
    2525//
    2626//
    27 // $Id: G4UIQt.hh,v 1.12 2008/03/10 17:03:16 lgarnier Exp $
    28 // GEANT4 tag $Name: HEAD $
     27// $Id: G4UIQt.hh,v 1.14 2008/10/15 09:09:47 lgarnier Exp $
     28// GEANT4 tag $Name: $
    2929//
    3030#ifndef G4UIQt_h
    … …  
    5858// Class description :
    5959//
    60 //  G4UIQt : class to handle a Motif interactive session.
    61 // G4UIQt is the Motif version of G4UIterminal.
     60//  G4UIQt : class to handle a Qt interactive session.
     61// G4UIQt is the Qt version of G4UIterminal.
    6262//
    6363//  A command box is at disposal for entering/recalling Geant4 commands.
    … …  
    8080
    8181public: // With description
    82   G4UIQt(int,char**);
     82  G4UIQt(int*,char**);
    8383  // (argv, argc) or (0, NULL) had to be given.
    8484  G4UIsession* SessionStart();

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

    r861 r867  
    2525//
    2626//
    27 // $Id: G4UIQt.cc,v 1.18 2008/10/02 08:50:39 lgarnier Exp $
     27// $Id: G4UIQt.cc,v 1.20 2008/10/15 09:09:47 lgarnier Exp $
    2828// GEANT4 tag $Name:  $
    2929//
    … …  
    7070#include <qlistview.h>
    7171#include <qpopupmenu.h>
     72#include <qwidgetlist.h>
    7273#endif
    7374
    … …  
    101102*/
    102103G4UIQt::G4UIQt (
    103  int argc
     104 int* argc
    104105,char** argv
    105106)
    106107  :fHelpDialog(NULL)
    107108{
    108 #ifdef GEANT4_QT_DEBUG
    109   printf("G4UIQt::Initialise %d %s\n",argc,argv[0]);
    110 #endif
    111109  G4Qt* interactorManager = G4Qt::getInstance (argc,argv,(char*)"Qt");
    112110  G4UImanager* UI = G4UImanager::GetUIpointer();

  • trunk/source/interfaces/common/include/G4Qt.hh

    r850 r867  
    2525//
    2626//
    27 // $Id: G4Qt.hh,v 1.2 2007/11/08 17:00:09 lgarnier Exp $
    28 // GEANT4 tag $Name: HEAD $
     27// $Id: G4Qt.hh,v 1.3 2008/10/15 09:09:47 lgarnier Exp $
     28// GEANT4 tag $Name: $
    2929//
    3030//  To unify Qt event treatment between
    … …  
    5151public:
    5252  static G4Qt* getInstance();
    53   static G4Qt* getInstance(int,char**,char*);
     53  static G4Qt* getInstance(int*,char**,char*);
    5454  G4bool Inited();
    5555  void* GetEvent();
    … …  
    5757  virtual ~G4Qt();                     
    5858private:
    59   G4Qt (int,char**,char*);                     
     59  G4Qt (int*,char**,char*);                     
    6060  static G4Qt* instance; // Pointer to single instance.
    6161};

  • trunk/source/interfaces/common/src/G4Qt.cc

    r856 r867  
    2525//
    2626//
    27 // $Id: G4Qt.cc,v 1.7 2007/11/15 18:24:28 lgarnier Exp $
    28 // GEANT4 tag $Name: HEAD $
     27// $Id: G4Qt.cc,v 1.9 2008/10/15 09:09:47 lgarnier Exp $
     28// GEANT4 tag $Name: $
    2929//
    3030// L. Garnier
    … …  
    4242
    4343
    44 #define NewString(str)  \
    45  ((str) != NULL ? (strcpy((char*)malloc((unsigned)strlen(str) + 1), str)) : NULL)
    46 
    47 //static void XWidgetIconify                 (Widget);
    48 //static void XWidgetUniconify               (Widget);
    49 //static void XDisplaySetWindowToNormalState (Display*,Window);
    50 
    5144G4Qt* G4Qt::instance    = NULL;
    5245
    5346static G4bool QtInited  = FALSE;
    54 //static int    argn      = 0;
    55 //static char** args      = NULL;
    56 // static QtAppContext appContext = NULL;
    57 //static QApplication app = NULL;
    5847
    5948/***************************************************************************/
    … …  
    6756/***************************************************************************/
    6857G4Qt* G4Qt::getInstance (
    69  int    a_argn
     58 int*    a_argn
    7059,char** a_args
    7160,char*  a_class
    … …  
    8170/***************************************************************************/
    8271G4Qt::G4Qt (
    83  int    a_argn
     72 int*    a_argn
    8473,char** a_args
    8574,char*  a_class
    … …  
    9988      SetMainInteractor (qApp);
    10089      //#endif
    101       SetArguments      (a_argn,a_args);
     90      SetArguments      (*a_argn,a_args);
    10291#ifdef GEANT4_QT_DEBUG
    10392      printf("G4Qt::G4Qt alredy inited in external \n");
    … …  
    11099#endif
    111100#if QT_VERSION < 0x040000
    112       qApp = new QApplication (a_argn, a_args);
     101      qApp = new QApplication (*a_argn, a_args);
    113102      //    QApplication qApp(a_argn, a_args);
    114103      //    if(&qApp == NULL) {
    115104#else
    116       new QApplication (a_argn, a_args);
     105      new QApplication (*a_argn, a_args);
    117106#endif
    118107      if(!qApp) {
    … …  
    126115        SetMainInteractor (qApp);
    127116        //#endif
    128         SetArguments      (a_argn,a_args);
     117        SetArguments      (*a_argn,a_args);
    129118#ifdef GEANT4_QT_DEBUG
    130119        printf("G4Qt::G4Qt inited Qt END\n");
Note: See TracChangeset for help on using the changeset viewer.