X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=kernel%2Fsrc%2FbbtkQt.cxx;h=9cef8126411fadfeb849f982d9e394fcea3ab17f;hb=16993e9f411c62e9a73d13c40f3748bdd232ce09;hp=e12409e86997b99154d8e8d6321cb29b11ec0822;hpb=038dbbd7dd8b34107ec932a34170a4625368eb25;p=bbtk.git

diff --git a/kernel/src/bbtkQt.cxx b/kernel/src/bbtkQt.cxx
index e12409e..9cef812 100644
--- a/kernel/src/bbtkQt.cxx
+++ b/kernel/src/bbtkQt.cxx
@@ -1,32 +1,39 @@
-/*=========================================================================                                                                               
+/*
+ # ---------------------------------------------------------------------
+ #
+ # Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+ #                        pour la SantÈ)
+ # Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+ # Previous Authors : Laurent Guigues, Jean-Pierre Roux
+ # CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+ #
+ #  This software is governed by the CeCILL-B license under French law and
+ #  abiding by the rules of distribution of free software. You can  use,
+ #  modify and/ or redistribute the software under the terms of the CeCILL-B
+ #  license as circulated by CEA, CNRS and INRIA at the following URL
+ #  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+ #  or in the file LICENSE.txt.
+ #
+ #  As a counterpart to the access to the source code and  rights to copy,
+ #  modify and redistribute granted by the license, users are provided only
+ #  with a limited warranty  and the software's author,  the holder of the
+ #  economic rights,  and the successive licensors  have only  limited
+ #  liability.
+ #
+ #  The fact that you are presently reading this means that you have had
+ #  knowledge of the CeCILL-B license and that you accept its terms.
+ # ------------------------------------------------------------------------ */
+
+
+/*=========================================================================
   Program:   bbtk
   Module:    $RCSfile: bbtkQt.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/04/08 07:56:11 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2012/11/16 08:49:01 $
+  Version:   $Revision: 1.4 $
 =========================================================================*/
 
-/* ---------------------------------------------------------------------
-
-* Copyright (c) CREATIS-LRMN (Centre de Recherche en Imagerie Medicale)
-* Authors : Eduardo Davila, Laurent Guigues, Jean-Pierre Roux
-*
-*  This software is governed by the CeCILL-B license under French law and 
-*  abiding by the rules of distribution of free software. You can  use, 
-*  modify and/ or redistribute the software under the terms of the CeCILL-B 
-*  license as circulated by CEA, CNRS and INRIA at the following URL 
-*  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html 
-*  or in the file LICENSE.txt.
-*
-*  As a counterpart to the access to the source code and  rights to copy,
-*  modify and redistribute granted by the license, users are provided only
-*  with a limited warranty  and the software's author,  the holder of the
-*  economic rights,  and the successive licensors  have only  limited
-*  liability. 
-*
-*  The fact that you are presently reading this means that you have had
-*  knowledge of the CeCILL-B license and that you accept its terms.
-* ------------------------------------------------------------------------ */                                                                         
+
 #include "bbtkQt.h"
 #include "bbtkMessageManager.h"
 
@@ -82,32 +89,34 @@ namespace bbtk
   //=========================================================================
 
   int argc = 1;
-  char* argv = "QApp";
+  const char* argv = "QApp";
 
   //=========================================================================
   void Qt::CreateQtAppIfNeeded()
   {
     
-    if (QApplication::instance()==0)
+
+  if (QApplication::instance()==0)
       {
+
 	if (mgQtApp != 0) 
 	  {
 	    bbtkGlobalError("Qt::CreateQtAppIfNeeded() : INTERNAL ERROR ! (QCoreApplication::instance()==0) && (mgQtApp != 0)");
 	  }
-	bbtkDebugMessage("qt",1,"  --> Creating bbtk QApplication"<<std::endl);
-	mgQtApp = new QApplication(argc,&argv);
+	bbtkDebugMessage("widget",1,"  --> Creating bbtk QApplication"<<std::endl);
+	char* aargv = const_cast<char*>(argv);
+	mgQtApp = new QApplication(argc,&aargv);
 
-	//	std::cout << ">>>> mgQtApp.exec()"<<std::endl;
-	
-	//	mgQtApp->exec();
 
-	//	std::cout << "<<<< mgQtApp.exec()"<<std::endl;
-	// 	wxApp::SetInstance(mgQtApp);
+	bbtkDebugMessage("widget",9,"  --> QApplication::instance = "<<QApplication::instance()<<std::endl);
 
-	//int argc = 0;
-	//wxEntry(argc,0);
+	/*
+	std::cout << ">>>> mgQtApp.exec()"<<std::endl;
+	
+	mgQtApp->exec();
 
-	//	wxInitialize();
+	std::cout << "<<<< mgQtApp.exec()"<<std::endl;
+	*/
       }
     
   }