Changeset 867 for trunk/source/interfaces/common

Timestamp:

Oct 15, 2008, 2:49:22 PM (17 years ago)

Author:

garnier

Message:

see history

Location:

trunk/source/interfaces/common

Files:

• include/G4Qt.hh (modified) (3 diffs)
• src/G4Qt.cc (modified) (7 diffs)

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

@@ -25 +25 @@
 //
 //
-// $Id: G4Qt.hh,v 1.2 2007/11/08 17:00:09 lgarnier Exp $
-// GEANT4 tag $Name: HEAD $
+// $Id: G4Qt.hh,v 1.3 2008/10/15 09:09:47 lgarnier Exp $
+// GEANT4 tag $Name:  $
 //
 //  To unify Qt event treatment between 
@@ -51 +51 @@
 public:
   static G4Qt* getInstance();
-  static G4Qt* getInstance(int,char**,char*);
+  static G4Qt* getInstance(int*,char**,char*);
   G4bool Inited();
   void* GetEvent();
@@ -57 +57 @@
   virtual ~G4Qt();                     
 private:
-  G4Qt (int,char**,char*);                     
+  G4Qt (int*,char**,char*);                     
   static G4Qt* instance; // Pointer to single instance.
 };

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

@@ -25 +25 @@
 //
 //
-// $Id: G4Qt.cc,v 1.7 2007/11/15 18:24:28 lgarnier Exp $
-// GEANT4 tag $Name: HEAD $
+// $Id: G4Qt.cc,v 1.9 2008/10/15 09:09:47 lgarnier Exp $
+// GEANT4 tag $Name:  $
 //
 // L. Garnier
@@ -42 +42 @@
 
 
-#define NewString(str)  \
- ((str) != NULL ? (strcpy((char*)malloc((unsigned)strlen(str) + 1), str)) : NULL)
-
-//static void XWidgetIconify                 (Widget);
-//static void XWidgetUniconify               (Widget);
-//static void XDisplaySetWindowToNormalState (Display*,Window);
-
 G4Qt* G4Qt::instance    = NULL;
 
 static G4bool QtInited  = FALSE;
-//static int    argn      = 0;
-//static char** args      = NULL;
-// static QtAppContext appContext = NULL;
-//static QApplication app = NULL;
 
 /***************************************************************************/
@@ -67 +56 @@
 /***************************************************************************/
 G4Qt* G4Qt::getInstance (
- int    a_argn
+ int*    a_argn
 ,char** a_args
 ,char*  a_class
@@ -81 +70 @@
 /***************************************************************************/
 G4Qt::G4Qt (
- int    a_argn
+ int*    a_argn
 ,char** a_args
 ,char*  a_class
@@ -99 +88 @@
       SetMainInteractor (qApp);
       //#endif
-      SetArguments      (a_argn,a_args);
+      SetArguments      (*a_argn,a_args);
 #ifdef GEANT4_QT_DEBUG
       printf("G4Qt::G4Qt alredy inited in external \n");
@@ -110 +99 @@
 #endif
 #if QT_VERSION < 0x040000
-      qApp = new QApplication (a_argn, a_args);
+      qApp = new QApplication (*a_argn, a_args);
       //    QApplication qApp(a_argn, a_args);
       //    if(&qApp == NULL) {
 #else
-      new QApplication (a_argn, a_args);
+      new QApplication (*a_argn, a_args);
 #endif
       if(!qApp) {
@@ -126 +115 @@
         SetMainInteractor (qApp);
         //#endif
-        SetArguments      (a_argn,a_args);
+        SetArguments      (*a_argn,a_args);
 #ifdef GEANT4_QT_DEBUG
         printf("G4Qt::G4Qt inited Qt END\n");