Changeset 867 for trunk/source/interfaces/common/src
- Timestamp:
- Oct 15, 2008, 2:49:22 PM (16 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/source/interfaces/common/src/G4Qt.cc
r856 r867 25 25 // 26 26 // 27 // $Id: G4Qt.cc,v 1. 7 2007/11/15 18:24:28lgarnier 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: $ 29 29 // 30 30 // L. Garnier … … 42 42 43 43 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 51 44 G4Qt* G4Qt::instance = NULL; 52 45 53 46 static G4bool QtInited = FALSE; 54 //static int argn = 0;55 //static char** args = NULL;56 // static QtAppContext appContext = NULL;57 //static QApplication app = NULL;58 47 59 48 /***************************************************************************/ … … 67 56 /***************************************************************************/ 68 57 G4Qt* G4Qt::getInstance ( 69 int a_argn58 int* a_argn 70 59 ,char** a_args 71 60 ,char* a_class … … 81 70 /***************************************************************************/ 82 71 G4Qt::G4Qt ( 83 int a_argn72 int* a_argn 84 73 ,char** a_args 85 74 ,char* a_class … … 99 88 SetMainInteractor (qApp); 100 89 //#endif 101 SetArguments ( a_argn,a_args);90 SetArguments (*a_argn,a_args); 102 91 #ifdef GEANT4_QT_DEBUG 103 92 printf("G4Qt::G4Qt alredy inited in external \n"); … … 110 99 #endif 111 100 #if QT_VERSION < 0x040000 112 qApp = new QApplication ( a_argn, a_args);101 qApp = new QApplication (*a_argn, a_args); 113 102 // QApplication qApp(a_argn, a_args); 114 103 // if(&qApp == NULL) { 115 104 #else 116 new QApplication ( a_argn, a_args);105 new QApplication (*a_argn, a_args); 117 106 #endif 118 107 if(!qApp) { … … 126 115 SetMainInteractor (qApp); 127 116 //#endif 128 SetArguments ( a_argn,a_args);117 SetArguments (*a_argn,a_args); 129 118 #ifdef GEANT4_QT_DEBUG 130 119 printf("G4Qt::G4Qt inited Qt END\n");
Note: See TracChangeset
for help on using the changeset viewer.