port on debian sarge, first step

diff --git a/bin/orbmodule.py b/bin/orbmodule.py
index 627a909871cf824177d886647c4b2763a878e37c..4ad7b094725276b74ce7c7d4dc10bc980b79feab 100755 (executable)
--- a/bin/orbmodule.py
+++ b/bin/orbmodule.py
@@ -47,7 +47,7 @@ class client:
       try:
           self.rootContext = obj._narrow(CosNaming.NamingContext)
           return
-      except CORBA.COMM_FAILURE:
+      except (CORBA.TRANSIENT,CORBA.OBJECT_NOT_EXIST,CORBA.COMM_FAILURE):
           self.rootContext = None
           print "Lancement du Naming Service",
           
@@ -62,7 +62,7 @@ class client:
               obj = self.orb.resolve_initial_references("NameService")
               self.rootContext = obj._narrow(CosNaming.NamingContext)
               break
-          except (CORBA.COMM_FAILURE,CORBA.OBJECT_NOT_EXIST):
+          except (CORBA.TRANSIENT,CORBA.OBJECT_NOT_EXIST,CORBA.COMM_FAILURE):
               self.rootContext = None
               sys.stdout.write('+')
               sys.stdout.flush()
@@ -112,7 +112,7 @@ class client:
           obj = None
       except CosNaming.NamingContext.CannotProceed, ex:
           obj = None
-      except CORBA.COMM_FAILURE, ex:
+      except (CORBA.TRANSIENT,CORBA.OBJECT_NOT_EXIST,CORBA.COMM_FAILURE):
           obj = None
       return obj
 
@@ -155,7 +155,7 @@ class client:
           obj = None
       except CosNaming.NamingContext.CannotProceed, ex:
           obj = None
-      except CORBA.COMM_FAILURE, ex:
+      except (CORBA.TRANSIENT,CORBA.OBJECT_NOT_EXIST,CORBA.COMM_FAILURE):
           obj = None
       return obj
    

diff --git a/bin/runSalome.py b/bin/runSalome.py
index e423d97bace04f6dc0413e9bb8f2f24260d70477..efaab237076f1095fa21c7510f8499db0b241a79 100755 (executable)
--- a/bin/runSalome.py
+++ b/bin/runSalome.py
@@ -222,7 +222,7 @@ def kill_salome(args):
        
 # -----------------------------------------------------------------------------
 #
-# Définition des classes d'objets pour le lancement des Server CORBA
+# Definition des classes d'objets pour le lancement des Server CORBA
 #
 
 class Server:
@@ -473,7 +473,7 @@ def startSalome(args, modules_list, modules_root_dir):
 
     #
     # Lancement Registry Server,
-    # attente de la disponibilité du Registry dans le Naming Service
+    # attente de la disponibilite du Registry dans le Naming Service
     #
 
     if 'registry' not in args['embedded']:
@@ -483,7 +483,7 @@ def startSalome(args, modules_list, modules_root_dir):
 
     #
     # Lancement Catalog Server,
-    # attente de la disponibilité du Catalog Server dans le Naming Service
+    # attente de la disponibilite du Catalog Server dans le Naming Service
     #
     
 
@@ -496,7 +496,7 @@ def startSalome(args, modules_list, modules_root_dir):
 
     #
     # Lancement SalomeDS Server,
-    # attente de la disponibilité du SalomeDS dans le Naming Service
+    # attente de la disponibilite du SalomeDS dans le Naming Service
     #
 
     os.environ["CSF_PluginDefaults"] \
@@ -532,11 +532,11 @@ def startSalome(args, modules_list, modules_root_dir):
     #macomm2=['ddd']
     #pid = os.spawnvp(os.P_NOWAIT, macomm2[0], macomm2)
     #
-    # Attente de la disponibilité du Session Server dans le Naming Service
+    # Attente de la disponibilite du Session Server dans le Naming Service
     #
 
     import SALOME
-    session=clt.waitNS("/Kernel/Session",SALOME.Session)
+    #session=clt.waitNS("/Kernel/Session",SALOME.Session)
 
     from Utils_Identity import getShortHostName
     
@@ -550,7 +550,7 @@ def startSalome(args, modules_list, modules_root_dir):
     
     #
     # Lancement Container C++ local,
-    # attente de la disponibilité du Container C++ local dans le Naming Service
+    # attente de la disponibilite du Container C++ local dans le Naming Service
     #
 
     if 'cppContainer' in args['standalone']:
@@ -560,7 +560,7 @@ def startSalome(args, modules_list, modules_root_dir):
 
     #
     # Lancement Container Python local,
-    # attente de la disponibilité du Container Python local
+    # attente de la disponibilite du Container Python local
     # dans le Naming Service
     #
 
@@ -571,7 +571,7 @@ def startSalome(args, modules_list, modules_root_dir):
 
     #
     # Lancement Container Supervision local,
-    # attente de la disponibilité du Container Supervision local
+    # attente de la disponibilite du Container Supervision local
     # dans le Naming Service
     #
 

diff --git a/bin/salomeConsole.py b/bin/salomeConsole.py
index 03c0a5e51be09f744ed96f4f59523d5595c623f8..5ce7cec640e869be3cb0c3df648a2baae2adbc12 100755 (executable)
--- a/bin/salomeConsole.py
+++ b/bin/salomeConsole.py
@@ -66,7 +66,7 @@ class client(orbmodule.client):
       try:
           self.rootContext = obj._narrow(CosNaming.NamingContext)
           return
-      except CORBA.COMM_FAILURE:
+      except (CORBA.TRANSIENT,CORBA.OBJECT_NOT_EXIST,CORBA.COMM_FAILURE):
           print "It's not a valid naming service"
           self.rootContext = None
           raise

diff --git a/salome_adm/unix/config_files/check_pyqt.m4 b/salome_adm/unix/config_files/check_pyqt.m4
index cb99775f81b4482d491e14cbe65d13fe126f0069..b1d608adfcd10e8b1a0626b3165f55adbe7cb70c 100644 (file)
--- a/salome_adm/unix/config_files/check_pyqt.m4
+++ b/salome_adm/unix/config_files/check_pyqt.m4
@@ -56,17 +56,17 @@ fi
   
 AC_CHECK_FILE("$PYUIC",pyqt_ok=yes,pyqt_ok=no)
 
-if test "x$pyqt_ok" = xyes ; then
-  AC_CHECK_FILES("$PYQTLIB/qt.py",pyqt_ok=yes,pyqt_ok=no)
-fi
+#if test "x$pyqt_ok" = xyes ; then
+#  AC_CHECK_FILES("$PYQTLIB/qt.py",pyqt_ok=yes,pyqt_ok=no)
+#fi
 
-if test "x$pyqt_ok" = xno ; then
-  AC_CHECK_FILES("$PYQTLIB/qt/qt.py",pyqt_ok=yes,pyqt_ok=no)
-fi
+#if test "x$pyqt_ok" = xno ; then
+#  AC_CHECK_FILES("$PYQTLIB/qt/qt.py",pyqt_ok=yes,pyqt_ok=no)
+#fi
 
-if test "x$pyqt_ok" = xyes ; then
-  AC_CHECK_FILE("$PYQTLIB/libqtcmodule.so",pyqt_ok=yes,pyqt_ok=no)
-fi
+#if test "x$pyqt_ok" = xyes ; then
+#  AC_CHECK_FILE("$PYQTLIB/libqtcmodule.so",pyqt_ok=yes,pyqt_ok=no)
+#fi
 
 if test "x$pyqt_ok" = xyes ; then
   AC_CHECK_FILES("$PYQT_SIPS/qtmod.sip",pyqt_ok=yes,pyqt_ok=no)

diff --git a/salome_adm/unix/config_files/check_qt.m4 b/salome_adm/unix/config_files/check_qt.m4
index b27de2779cb4cb176f9f0472407ec1e4f14fcc3a..305a4335fb2e5db7a2ef639c996e670ff6b77dfd 100644 (file)
--- a/salome_adm/unix/config_files/check_qt.m4
+++ b/salome_adm/unix/config_files/check_qt.m4
@@ -90,14 +90,31 @@ then
 
   AC_MSG_CHECKING(include of qt headers)
 
-  if  test "x$qt_ok" = "xno"
+  if  test "x$qt_ok" = "xyes"
   then
-    AC_MSG_RESULT(qt headers not found, or too old qt version, in $QTDIR/include)
-    AC_MSG_RESULT(QTDIR environment variable may be wrong)
-  else
     AC_MSG_RESULT(yes)
     QT_INCLUDES="-I${QT_ROOT}/include -DQT_THREAD_SUPPORT"
     QT_MT_INCLUDES="-I${QT_ROOT}/include -DQT_THREAD_SUPPORT"
+  else
+    CPPFLAGS_old=$CPPFLAGS
+    CPPFLAGS="$CPPFLAGS -I$QTDIR/include/qt3"
+
+    AC_LANG_CPLUSPLUS
+    AC_CHECK_HEADER(qapp.h,qt_ok=yes ,qt_ok=no)
+
+    CPPFLAGS=$CPPFLAGS_old
+
+    AC_MSG_CHECKING(include of qt headers)
+
+    if  test "x$qt_ok" = "xno"
+    then
+      AC_MSG_RESULT(qt headers not found, or too old qt version, in $QTDIR/include)
+      AC_MSG_RESULT(QTDIR environment variable may be wrong)
+    else
+      AC_MSG_RESULT(yes)
+      QT_INCLUDES="-I${QT_ROOT}/include/qt3 -DQT_THREAD_SUPPORT"
+      QT_MT_INCLUDES="-I${QT_ROOT}/include/qt3 -DQT_THREAD_SUPPORT"
+    fi
   fi
 fi
 
@@ -108,7 +125,7 @@ then
   LIBS="$LIBS -L$QTDIR/lib -lqt-mt $OGL_LIBS"
 
   CXXFLAGS_old=$CXXFLAGS
-  CXXFLAGS="$CXXFLAGS -I$QTDIR/include"
+  CXXFLAGS="$CXXFLAGS $QT_MT_INCLUDES"
 
   AC_CACHE_VAL(salome_cv_lib_qt,[
     AC_TRY_LINK(

diff --git a/salome_adm/unix/config_files/check_qwt.m4 b/salome_adm/unix/config_files/check_qwt.m4
index 4e541d70d80dd9b65e2231cd70e638c283457b59..21b15fa3a5dac7c0fe2d3b7f35ea61316db817ac 100644 (file)
--- a/salome_adm/unix/config_files/check_qwt.m4
+++ b/salome_adm/unix/config_files/check_qwt.m4
@@ -22,18 +22,24 @@ AC_ARG_WITH(qwt_inc,
     ])
 
 if test -z $QWTHOME; then
+  AC_MSG_RESULT(QWTHOME not defined)
   exits_ok=no  
   AC_CHECK_FILE("/usr/local/lib/libqwt.so",exits_ok=yes,exits_ok=no)
   if test "x$exits_ok" = "xyes"; then
      QWTHOME="/usr/local/lib"    
+     AC_MSG_RESULT(libqwt.so detected in /usr/local/lib)
      if test -z $QWT_INCLUDES; then
         QWT_INCLUDES="/usr/local/include/qwt"
      fi
   else
-     QWTHOME="/usr/lib"   
-     if test -z $QWT_INCLUDES; then
-        QWT_INCLUDES="/usr/include/qwt"
-     fi
+     AC_CHECK_FILE("/usr/lib/libqwt.so",exits_ok=yes,exits_ok=no)
+     if test "x$exits_ok" = "xyes"; then
+       QWTHOME="/usr/lib"   
+       AC_MSG_RESULT(libqwt.so detected in /usr/lib)
+         if test -z $QWT_INCLUDES; then
+           QWT_INCLUDES="/usr/include/qwt"
+         fi
+       fi
   fi   
 else
   if test -z $QWT_INCLUDES; then
@@ -50,7 +56,8 @@ else
    AC_LANG_CPLUSPLUS
    CPPFLAGS_old=$CPPFLAGS
    CPPFLAGS="$CPPFLAGS -I$QWT_INCLUDES"
-   CPPFLAGS="$CPPFLAGS -I$QTDIR/include"
+   CPPFLAGS="$CPPFLAGS $QT_INCLUDES"
+#   CPPFLAGS="$CPPFLAGS -I$QTDIR/include"
 
    AC_CHECK_HEADER(qwt.h,qwt_ok=yes,qwt_ok=no) 
 
@@ -70,7 +77,8 @@ then
   LIBS="$LIBS -L$QTDIR/lib -lqt-mt -L$QWTHOME/lib -lqwt"
 
   CXXFLAGS_old=$CXXFLAGS
-  CXXFLAGS="$CXXFLAGS -I$QTDIR/include -I$QWT_INCLUDES"
+  CXXFLAGS="$CXXFLAGS $QT_INCLUDES -I$QWT_INCLUDES"
+#  CXXFLAGS="$CXXFLAGS -I$QTDIR/include -I$QWT_INCLUDES"
 
   AC_CACHE_VAL(salome_cv_lib_qwt,[
     AC_TRY_LINK(

diff --git a/salome_adm/unix/config_files/check_sip.m4 b/salome_adm/unix/config_files/check_sip.m4
index 84c2beaf73829cdb40eff8f552fb44e7bd698962..0a551209b30d617af377b6b46712a2c661f220a8 100644 (file)
--- a/salome_adm/unix/config_files/check_sip.m4
+++ b/salome_adm/unix/config_files/check_sip.m4
@@ -38,6 +38,8 @@ else
            SIP_VERS=new ;;
          3.10*)
            SIP_VERS=new2 ;;
+         4.1*)
+           SIP_VERS=new3 ;;
          *)
            AC_MSG_RESULT(sip version $version not supported)
            SIP_VERS=no ;;
@@ -83,6 +85,17 @@ else
         AC_CHECK_FILE($PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages/libsip.so,sip_ok=$sip_ok,sip_ok=no)
        SIP_LIBS="-L${PYTHON_PREFIX}/lib/python${PYTHON_VERSION}/site-packages -lsip"
     fi
+
+    if test "x$SIP_VERS" = "xnew3"
+        then
+        dnl new3 install : includes and libs are in python install 
+        AC_MSG_RESULT(new3 install detected)
+       sip_ok=yes
+        AC_CHECK_FILE($PYTHON_PREFIX/include/python$PYTHON_VERSION/sip.h,sip_ok=$sip_ok,sip_ok=no)
+       SIP_INCLUDES="${PYTHON_INCLUDES}"
+        AC_CHECK_FILE($PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages/sip.so,sip_ok=$sip_ok,sip_ok=no)
+       SIP_LIBS="-L${PYTHON_PREFIX}/lib/python${PYTHON_VERSION}/site-packages -lsip"
+    fi
 fi
 
 AC_SUBST(SIP)

diff --git a/src/Container/SALOME_Container.cxx b/src/Container/SALOME_Container.cxx
index dfd501e9ff11bc86d1c7747f82808b5c728d1a76..be08e2197749ff6d00b93969235935be0ef3b774 100644 (file)
--- a/src/Container/SALOME_Container.cxx
+++ b/src/Container/SALOME_Container.cxx
@@ -112,8 +112,8 @@ int main(int argc, char* argv[])
          theObj = orb->resolve_initial_references("NameService");
        if (!CORBA::is_nil(theObj))
          inc = CosNaming::NamingContext::_narrow(theObj);
-      }catch(CORBA::COMM_FAILURE&){
-       MESSAGE( "Container: CORBA::COMM_FAILURE: Unable to contact the Naming Service" );
+      }catch(CORBA::SystemException&){
+       MESSAGE( "Container: CORBA::SystemException: Unable to contact the Naming Service" );
       }
       if(!CORBA::is_nil(inc)){
        MESSAGE( "Container: Naming Service was found" );

diff --git a/src/DataTypeCatalog/SALOME_DataTypeCatalog_Server.cxx b/src/DataTypeCatalog/SALOME_DataTypeCatalog_Server.cxx
index d7982916387bc649f68447b8d3df53512fb0f717..ff21513617622e80f47ae1bbb7a17727db34498d 100644 (file)
--- a/src/DataTypeCatalog/SALOME_DataTypeCatalog_Server.cxx
+++ b/src/DataTypeCatalog/SALOME_DataTypeCatalog_Server.cxx
@@ -83,9 +83,9 @@ int main(int argc,char **argv)
                theObj = orb->resolve_initial_references("NameService");
              if (!CORBA::is_nil(theObj))
                inc = CosNaming::NamingContext::_narrow(theObj);}
-         catch( CORBA::COMM_FAILURE& )
+         catch( CORBA::SystemException& )
            {
-             MESSAGE( "Data Type Catalog: CORBA::COMM_FAILURE: Unable to contact the Naming Service" );
+             MESSAGE( "Data Type Catalog: CORBA::SystemException: Unable to contact the Naming Service" );
            }
          if(!CORBA::is_nil(inc))
            {

diff --git a/src/LifeCycleCORBA/TestLifeCycleCORBA.cxx b/src/LifeCycleCORBA/TestLifeCycleCORBA.cxx
index 49e3b28b07e46be03eedeefb80b7573e1ff38ddc..312cbd21147c333f3edeb1c188e1b696ab1a1804 100644 (file)
--- a/src/LifeCycleCORBA/TestLifeCycleCORBA.cxx
+++ b/src/LifeCycleCORBA/TestLifeCycleCORBA.cxx
@@ -111,7 +111,7 @@ int main (int argc, char * argv[])
       cout << m4->instanceName() << endl;
 
     }
-  catch(CORBA::COMM_FAILURE& ex)
+  catch(CORBA::SystemException& ex)
     {
       INFOS("Caught system exception COMM_FAILURE -- unable to contact the object.");
     }

diff --git a/src/Loader/InquireServersQThread.cxx b/src/Loader/InquireServersQThread.cxx
index a293e4766d0c6dd504eae9a4f697f13432d4d13c..a26a1dea24228959671c8101b0137ded2bccae45 100644 (file)
--- a/src/Loader/InquireServersQThread.cxx
+++ b/src/Loader/InquireServersQThread.cxx
@@ -312,9 +312,9 @@ bool InquireServersQThread::AskServer(int iteration, QString ** errMessage)
                IsPassed = true;
              break;
            }
-         catch(CORBA::COMM_FAILURE&)
+         catch(CORBA::SystemException&)
            {
-             MESSAGE("CORBA::COMM_FAILURE: unable to contact the naming service");
+             MESSAGE("CORBA::SystemException: unable to contact the naming service");
            }
          catch(...)
            {
@@ -399,7 +399,7 @@ bool InquireServersQThread::pingServer(int iteration, QString& errMessage)
              break;
            case 4:
              {
-               CORBA::Object_var obj = NS.Resolve("Kernel/ModulCatalog");
+               CORBA::Object_var obj = NS.Resolve("/Kernel/ModulCatalog");
                SALOME_ModuleCatalog::ModuleCatalog_var catalog = SALOME_ModuleCatalog::ModuleCatalog::_narrow(obj) ;
                if (!CORBA::is_nil(catalog))
                  {
@@ -413,7 +413,7 @@ bool InquireServersQThread::pingServer(int iteration, QString& errMessage)
              break;
            case 5:
              {
-               CORBA::Object_var obj = NS.Resolve("Kernel/Session");
+               CORBA::Object_var obj = NS.Resolve("/Kernel/Session");
                SALOME::Session_var session = SALOME::Session::_narrow(obj) ;
                if (!CORBA::is_nil(session))
                  {

diff --git a/src/Logger/SALOME_Trace.cxx b/src/Logger/SALOME_Trace.cxx
index 1a33333eb5fe8745887482c3b3695dff4aa6c9b8..705f066bdb1eae055bf46ab0953b06670e552cb4 100644 (file)
--- a/src/Logger/SALOME_Trace.cxx
+++ b/src/Logger/SALOME_Trace.cxx
@@ -62,7 +62,7 @@ int SALOME_Trace::Initialize(CORBA::ORB_ptr theOrb) {
       if (!CORBA::is_nil(theObj))
        inc = CosNaming::NamingContext::_narrow(theObj);
       if (!CORBA::is_nil(inc)) break;
-    } catch( CORBA::COMM_FAILURE& ) {
+    } catch( CORBA::SystemException& ) {
     } catch (...) {
     }
   }

diff --git a/src/Logger/SALOME_Trace.py b/src/Logger/SALOME_Trace.py
index fd507c7c744e69ecad69862f1571d2a5862af930..2b88171d694d3047da0dd0a23f4cbc8904bd8add 100644 (file)
--- a/src/Logger/SALOME_Trace.py
+++ b/src/Logger/SALOME_Trace.py
@@ -41,7 +41,7 @@ class SALOME_Trace :
 
               except CosNaming.NamingContext.NotFound, e :
                     if steps == 1: print "Caught exception: Naming Service can't found Logger"
-              except CORBA.COMM_FAILURE, e:
+              except (CORBA.TRANSIENT,CORBA.OBJECT_NOT_EXIST,CORBA.COMM_FAILURE):
                     if steps == 1: print "Caught CORBA::SystemException CommFailure"
               except CORBA.SystemException, e:
                     if steps == 1: print "Caught CORBA::SystemException."

diff --git a/src/MPILifeCycleCORBA/SALOME_MPILifeCycleCORBA.cxx b/src/MPILifeCycleCORBA/SALOME_MPILifeCycleCORBA.cxx
index 9d342ca3238c001bd083d7e64111a56e0980ab2a..5dfe13fcbcb67f558a4a6885ccc9617d198d670a 100644 (file)
--- a/src/MPILifeCycleCORBA/SALOME_MPILifeCycleCORBA.cxx
+++ b/src/MPILifeCycleCORBA/SALOME_MPILifeCycleCORBA.cxx
@@ -337,7 +337,7 @@ Engines::Component_var SALOME_MPILifeCycleCORBA::FindOrLoad_MPIComponent
          {
            string instanceName = compo->instanceName(); 
          }
-       catch (CORBA::COMM_FAILURE&)
+       catch (CORBA::SystemException&)
          {
            INFOS("Caught CORBA::SystemException CommFailure. Engine "
                  << path << "does not respond" );

diff --git a/src/ModuleCatalog/SALOME_ModuleCatalog_Server.cxx b/src/ModuleCatalog/SALOME_ModuleCatalog_Server.cxx
index ad8cdd43dee065c66351dfab412b57f61f41c811..f2176aa1288a8a7f8791529f3717d3722147227e 100644 (file)
--- a/src/ModuleCatalog/SALOME_ModuleCatalog_Server.cxx
+++ b/src/ModuleCatalog/SALOME_ModuleCatalog_Server.cxx
@@ -85,9 +85,9 @@ int main(int argc,char **argv)
              if(!CORBA::is_nil(orb)) 
                theObj = orb->resolve_initial_references("NameService"); 
            }
-         catch( CORBA::COMM_FAILURE& )
+         catch( CORBA::SystemException& )
            {
-             INFOS( "Module Catalog Server: CORBA::COMM_FAILURE: Unable to contact the Naming Service" );
+             INFOS( "Module Catalog Server: CORBA::SystemException: Unable to contact the Naming Service" );
            }
          if (!CORBA::is_nil(theObj))
            {

diff --git a/src/NamingService/NamingService_WaitForServerReadiness.cxx b/src/NamingService/NamingService_WaitForServerReadiness.cxx
index 7cb1a6bce9dafd1f889274d554bb8fcd2c985548..fcdf75f135f3c1246a39f144eb395dfb3b7953a1 100644 (file)
--- a/src/NamingService/NamingService_WaitForServerReadiness.cxx
+++ b/src/NamingService/NamingService_WaitForServerReadiness.cxx
@@ -66,7 +66,8 @@ void NamingService_WaitForServerReadiness(SALOME_NamingService* NS,
        {
          if (serverName.length() == 0)
            {
-             string curdir = NS->Current_Directory(); // to wait for naming service
+             //string curdir = NS->Current_Directory(); // to wait for naming service
+             string dummyadr = NS->getIORaddr(); // to wait for naming service
              found = 1;
              break; // naming service found
            }

diff --git a/src/NamingService/SALOME_NamingService.cxx b/src/NamingService/SALOME_NamingService.cxx
index e939d53418a1be1bff596f676c1f5d4aea076a68..4beb6d4e3606c5d5463cdfee7f501900dc6ee2c3 100644 (file)
--- a/src/NamingService/SALOME_NamingService.cxx
+++ b/src/NamingService/SALOME_NamingService.cxx
@@ -151,9 +151,9 @@ void SALOME_NamingService::Register(CORBA::Object_ptr ObjRef,
        {
          INFOS("!!!Register() : CosNaming::NamingContext::CannotProceed");
        }
-      catch(CORBA::COMM_FAILURE&)
+      catch(CORBA::SystemException&)
        {
-         INFOS("!!!Register() : CORBA::COMM_FAILURE : unable to contact"
+         INFOS("!!!Register() : CORBA::SystemException : unable to contact"
               << " the naming service"); 
          throw ServiceUnreachable();
        }
@@ -218,9 +218,9 @@ void SALOME_NamingService::Register(CORBA::Object_ptr ObjRef,
            {
              INFOS("!!!Register() : CosNaming::NamingContext::InvalidName");
            }
-         catch(CORBA::COMM_FAILURE&)
+         catch(CORBA::SystemException&)
            {
-             INFOS("!!!Register() :CORBA::COMM_FAILURE : unable to contact"
+             INFOS("!!!Register() :CORBA::SystemException : unable to contact"
                   << " the naming service"); 
              throw ServiceUnreachable();
            }
@@ -270,9 +270,9 @@ void SALOME_NamingService::Register(CORBA::Object_ptr ObjRef,
       INFOS("!!!Register() : CosNaming::NamingContext::AlreadyBound, object will be rebind"); 
       _current_context->rebind(_context_name, ObjRef);
     }
-  catch(CORBA::COMM_FAILURE&)
+  catch(CORBA::SystemException&)
     {
-      INFOS("!!!Register() :CORBA::COMM_FAILURE : unable to contact"
+      INFOS("!!!Register() :CORBA::SystemException : unable to contact"
            << " the naming service");
       throw ServiceUnreachable();
     }
@@ -352,9 +352,9 @@ CORBA::Object_ptr SALOME_NamingService::Resolve(const char* Path)
     {
       INFOS("!!!Resolve() : CosNaming::NamingContext::InvalidName"); 
     }
-  catch(CORBA::COMM_FAILURE&)
+  catch(CORBA::SystemException&)
     {
-      INFOS("!!!Resolve() :CORBA::COMM_FAILURE : unable to contact"
+      INFOS("!!!Resolve() :CORBA::SystemException : unable to contact"
            << "the naming service");
       throw ServiceUnreachable();
     }
@@ -390,9 +390,9 @@ int SALOME_NamingService::Find(const char* name)
     {
       _Find(name,occurence_number);
     }
-  catch(CORBA::COMM_FAILURE&)
+  catch(CORBA::SystemException&)
     {
-      INFOS("!!!Find() : CORBA::COMM_FAILURE : unable to contact"
+      INFOS("!!!Find() : CORBA::SystemException : unable to contact"
           << " the naming service"); 
       throw ServiceUnreachable();
     }
@@ -495,10 +495,10 @@ bool SALOME_NamingService::Create_Directory(const char* Path)
       _return_code = false;
       INFOS("!!!Create_Directory():CosNaming::NamingContext::InvalidName");
     }
-  catch(CORBA::COMM_FAILURE&)
+  catch(CORBA::SystemException&)
     {
       _return_code = false;
-      INFOS("!!!Register() :CORBA::COMM_FAILURE : unable to contact"
+      INFOS("!!!Register() :CORBA::SystemException : unable to contact"
           << " the naming service"); 
       throw ServiceUnreachable();
     }
@@ -588,10 +588,10 @@ bool SALOME_NamingService::Change_Directory(const char* Path)
          _return_code = false;
          INFOS( "!!!Change_Directory() : CosNaming::NamingContext::InvalidName" )
        }
-      catch(CORBA::COMM_FAILURE&)
+      catch(CORBA::SystemException&)
        {
          _return_code = false;
-         INFOS( "!!!Change_Directory() :CORBA::COMM_FAILURE : unable to contact"
+         INFOS( "!!!Change_Directory() :CORBA::SystemException : unable to contact"
               << "the naming service")
          throw ServiceUnreachable();
        }
@@ -633,9 +633,9 @@ char* SALOME_NamingService::Current_Directory()
     {
       _current_directory(result_path,i,_ref_context,_continue );
     }
-  catch(CORBA::COMM_FAILURE&)
+  catch(CORBA::SystemException&)
     {
-      INFOS("!!!Current_Directory(): CORBA::COMM_FAILURE : unable to contact"
+      INFOS("!!!Current_Directory(): CORBA::SystemException : unable to contact"
           << " the naming service" )
       throw ServiceUnreachable();
     }
@@ -817,9 +817,9 @@ void SALOME_NamingService::Destroy_Name(const char* Path)
        {
          INFOS( "!!!Destroy_Name(): CosNaming::NamingContext::CannotProceed" )
        }
-      catch(CORBA::COMM_FAILURE&)
+      catch(CORBA::SystemException&)
        {
-         INFOS( "!!!Destroy_Name() : CORBA::COMM_FAILURE : unable to contact"
+         INFOS( "!!!Destroy_Name() : CORBA::SystemException : unable to contact"
               << " the naming service")
          throw ServiceUnreachable();
        }
@@ -861,9 +861,9 @@ void SALOME_NamingService::Destroy_Name(const char* Path)
     {
       INFOS( "!!!Destroy_Name() : CosNaming::NamingContext::InvalidName")
     }
-  catch(CORBA::COMM_FAILURE&)
+  catch(CORBA::SystemException&)
     {
-      INFOS( "!!!Destroy_Name() :CORBA::COMM_FAILURE : unable to contact" 
+      INFOS( "!!!Destroy_Name() :CORBA::SystemException : unable to contact" 
           << " the naming service") 
       throw ServiceUnreachable();
     }
@@ -940,9 +940,9 @@ void SALOME_NamingService::Destroy_Directory(const char* Path)
        {
          INFOS("!!!Destroy_Directory(): CosNaming::NamingContext::CannotProceed" )
        }
-      catch(CORBA::COMM_FAILURE&)
+      catch(CORBA::SystemException&)
        {
-         INFOS( "!!!Destroy_Directory() : CORBA::COMM_FAILURE : unable to contact"
+         INFOS( "!!!Destroy_Directory() : CORBA::SystemException : unable to contact"
               << " the naming service" )
          throw ServiceUnreachable();
        }
@@ -984,9 +984,9 @@ void SALOME_NamingService::Destroy_Directory(const char* Path)
     {
       INFOS( "!!!Destroy_Directory(): CosNaming::NamingContext::CannotProceed" )
     }
-  catch(CORBA::COMM_FAILURE&)
+  catch(CORBA::SystemException&)
     {
-      INFOS( "!!!Destroy_Directory() : CORBA::COMM_FAILURE : unable to contact"
+      INFOS( "!!!Destroy_Directory() : CORBA::SystemException : unable to contact"
           << " the naming service" )
       throw ServiceUnreachable();
     }
@@ -1003,9 +1003,9 @@ void SALOME_NamingService::Destroy_Directory(const char* Path)
       INFOS( "!!!Destroy_Directory() : CosNaming::NamingContext::NoEmpty "
           << Path << " is not empty" )
     } 
-  catch(CORBA::COMM_FAILURE&)
+  catch(CORBA::SystemException&)
     {
-      INFOS( "!!!Destroy_Directory() :CORBA::COMM_FAILURE : "
+      INFOS( "!!!Destroy_Directory() :CORBA::SystemException : "
           << "unable to contact the naming service") 
       throw ServiceUnreachable();
     }
@@ -1039,9 +1039,9 @@ void SALOME_NamingService::Destroy_Directory(const char* Path)
     {
       INFOS( "!!!Destroy_Directory() : CosNaming::NamingContext::InvalidName")
     }
-  catch(CORBA::COMM_FAILURE&)
+  catch(CORBA::SystemException&)
     {
-      INFOS( "!!!Destroy_Directory() :CORBA::COMM_FAILURE : unable to contact" 
+      INFOS( "!!!Destroy_Directory() :CORBA::SystemException : unable to contact" 
           << " the naming service") 
       throw ServiceUnreachable();
     }
@@ -1070,9 +1070,9 @@ void SALOME_NamingService::_initialize_root_context()
       ASSERT(!CORBA::is_nil(_root_context)); 
     }
 
-  catch(CORBA::COMM_FAILURE&)
+  catch(CORBA::SystemException&)
     {
-      INFOS("CORBA::COMM_FAILURE: unable to contact the naming service");
+      INFOS("CORBA::SystemException: unable to contact the naming service");
       throw ServiceUnreachable();
     }
   catch(...)

diff --git a/src/NamingService/SALOME_NamingServicePy.py b/src/NamingService/SALOME_NamingServicePy.py
index 2bc3c553ca4cfa4c7969215bbf70fab90c6c338f..ab7f2050d1a6e8ab35a2cf71fba50aca1ceffd84 100644 (file)
--- a/src/NamingService/SALOME_NamingServicePy.py
+++ b/src/NamingService/SALOME_NamingServicePy.py
@@ -64,7 +64,7 @@ class SALOME_NamingServicePy_i:
              MESSAGE(" Name service not found")
            else:
              ok = 1
-         except CORBA.COMM_FAILURE, ex:
+         except (CORBA.TRANSIENT,CORBA.OBJECT_NOT_EXIST,CORBA.COMM_FAILURE):
            MESSAGE(" Name service not found")
          time.sleep(0.25)
          steps = steps - 1
@@ -100,8 +100,8 @@ class SALOME_NamingServicePy_i:
                 MESSAGE ( "Register : CosNaming.NamingContext.InvalidName" )
             except CosNaming.NamingContext.CannotProceed, ex:
                 MESSAGE ( "Register : CosNaming.NamingContext.CannotProceed" )
-            except CORBA.COMM_FAILURE, ex:
-                MESSAGE ( "Register : CORBA.COMM_FAILURE" )
+            except (CORBA.TRANSIENT,CORBA.OBJECT_NOT_EXIST,CORBA.COMM_FAILURE):
+                MESSAGE ( "Register : CORBA.TRANSIENT,CORBA.OBJECT_NOT_EXIST,CORBA.COMM_FAILURE" )
 
             if _not_exist:
                 # at least one context of the complete path is not created, we had
@@ -132,8 +132,8 @@ class SALOME_NamingServicePy_i:
         except CosNaming.NamingContext.AlreadyBound, ex:
             MESSAGE ( "Register : CosNaming.NamingContext.AlreadyBound, object will be rebind" )
             self._current_context.rebind(_context_name,ObjRef)
-        except CORBA.COMM_FAILURE, ex:
-            MESSAGE ( "Register : CORBA.COMM_FAILURE" )
+        except (CORBA.TRANSIENT,CORBA.OBJECT_NOT_EXIST,CORBA.COMM_FAILURE):
+            MESSAGE ( "Register : CORBA.TRANSIENT,CORBA.OBJECT_NOT_EXIST,CORBA.COMM_FAILURE" )
 
             
     #-------------------------------------------------------------------------
@@ -161,8 +161,8 @@ class SALOME_NamingServicePy_i:
         except CosNaming.NamingContext.CannotProceed, ex:
             MESSAGE ( "Resolve : CosNaming.NamingContext.CannotProceed" )
             self._obj = None
-        except CORBA.COMM_FAILURE, ex:
-            MESSAGE ( "Resolve : CORBA.COMM_FAILURE" )
+        except (CORBA.TRANSIENT,CORBA.OBJECT_NOT_EXIST,CORBA.COMM_FAILURE):
+            MESSAGE ( "Resolve : CORBA.TRANSIENT,CORBA.OBJECT_NOT_EXIST,CORBA.COMM_FAILURE" )
             self._obj = None
         return self._obj
 
@@ -191,8 +191,8 @@ class SALOME_NamingServicePy_i:
                 MESSAGE ( "Create_Directory : CosNaming.NamingContext.InvalidName" )
             except CosNaming.NamingContext.CannotProceed, ex:
                 MESSAGE ( "Create_Directory : CosNaming.NamingContext.CannotProceed" )
-            except CORBA.COMM_FAILURE, ex:
-                MESSAGE ( "Create_Directory : CORBA.COMM_FAILURE" )
+            except (CORBA.TRANSIENT,CORBA.OBJECT_NOT_EXIST,CORBA.COMM_FAILURE):
+                MESSAGE ( "Create_Directory : CORBA.TRANSIENT,CORBA.OBJECT_NOT_EXIST,CORBA.COMM_FAILURE" )
 
  
 

diff --git a/src/Notification/NOTIFICATION.cxx b/src/Notification/NOTIFICATION.cxx
index bbbb922948c7a896c31baae5967586d998c3cf56..e55d0abc78a796ba0ada0f60ba349cb5e2a8aaf5 100644 (file)
--- a/src/Notification/NOTIFICATION.cxx
+++ b/src/Notification/NOTIFICATION.cxx
@@ -50,7 +50,7 @@ CosNA_EventChannel_ptr NOTIFICATION_channel() {
     } catch(CORBA::ORB::InvalidName& ex) {
         MESSAGE("NOTIFICATION Error : service required is invalid [does not exist]");
         return(channel);
-    } catch (CORBA::COMM_FAILURE& ex) {
+    } catch (CORBA::SystemException& ex) {
         MESSAGE("NOTIFICATION Error : caught system exception COMM_FAILURE");
         return(channel);
     } catch (...) {
@@ -70,7 +70,7 @@ CosNA_EventChannel_ptr NOTIFICATION_channel() {
         };
     } catch(CORBA::ORB::InvalidName& ex) {
         MESSAGE("NOTIFICATION Error : invalid name");
-    } catch (CORBA::COMM_FAILURE& ex) {
+    } catch (CORBA::SystemException& ex) {
         MESSAGE("NOTIFICATION Error : caught system exception COMM_FAILURE while resolving event channel name");
     } catch (...) {
         MESSAGE("NOTIFICATION Error : caught exception while resolving event channel name");

diff --git a/src/PatchQt/Makefile.in b/src/PatchQt/Makefile.in
index d916a9a7acb7e6ceb608f175f409cf92e761afd8..0923a7efd0f44c2ca45a13d882b2bada8be41c36 100644 (file)
--- a/src/PatchQt/Makefile.in
+++ b/src/PatchQt/Makefile.in
@@ -33,25 +33,28 @@ VPATH=.:@srcdir@:@top_srcdir@/idl
 
 EXPORT_HEADERS = \
        qsplitterP.h \
-       qworkspaceP.h \
-       qactionP.h \
-       qfiledialogP.h
+       qactionP.h 
+
+#      qfiledialogP.h \
+#      qworkspaceP.h \
 
 # Libraries targets
 
 LIB = libqsplitterP.la 
-LIB_SRC = qsplitterP.cxx qsplitterP_moc.cxx qworkspaceP.cxx qworkspaceP_moc.cxx qactionP.cxx qactionP_moc.cxx qfiledialogP.cxx qfiledialogP_moc.cxx
+#LIB_SRC = qsplitterP.cxx qsplitterP_moc.cxx qworkspaceP.cxx qworkspaceP_moc.cxx qactionP.cxx qactionP_moc.cxx qfiledialogP.cxx qfiledialogP_moc.cxx
+LIB_SRC = qsplitterP.cxx qsplitterP_moc.cxx qactionP.cxx qactionP_moc.cxx
+
 qsplitterP_moc.cxx: $(inc_builddir)/qsplitterP.h
        $(MOC) $(inc_builddir)/qsplitterP.h -o qsplitterP_moc.cxx
 
-qworkspaceP_moc.cxx: $(inc_builddir)/qworkspaceP.h
-       $(MOC) $(inc_builddir)/qworkspaceP.h -o qworkspaceP_moc.cxx
+#qworkspaceP_moc.cxx: $(inc_builddir)/qworkspaceP.h
+#      $(MOC) $(inc_builddir)/qworkspaceP.h -o qworkspaceP_moc.cxx
 
 qactionP_moc.cxx: $(inc_builddir)/qactionP.h
        $(MOC) $(inc_builddir)/qactionP.h -o qactionP_moc.cxx
 
-qfiledialogP_moc.cxx: $(inc_builddir)/qfiledialogP.h
-       $(MOC) $(inc_builddir)/qfiledialogP.h -o qfiledialogP_moc.cxx
+#qfiledialogP_moc.cxx: $(inc_builddir)/qfiledialogP.h
+#      $(MOC) $(inc_builddir)/qfiledialogP.h -o qfiledialogP_moc.cxx
 
 CPPFLAGS+=$(QT_INCLUDES) -I${QTDIR}/src/kernel -I$(QTDIR)/mkspecs/linux-g++
 CXXFLAGS+=

diff --git a/src/PatchQt/qsplitterP.cxx b/src/PatchQt/qsplitterP.cxx
index 3983746b2f07ef6eb8593ead7c1ef24d528e296d..15d5ed2aa2b0ef41a846b4e1591419cb34d09417 100644 (file)
--- a/src/PatchQt/qsplitterP.cxx
+++ b/src/PatchQt/qsplitterP.cxx
@@ -48,6 +48,7 @@
 #include <qpainter.h>
 #include <qdrawutil.h>
 #include <qbitmap.h>
+#include <qlayout.h>
 #include <private/qlayoutengine_p.h>
 #if QT_VERSION < 300
   #include <qlist.h>

diff --git a/src/Registry/SALOME_Registry_Server.cxx b/src/Registry/SALOME_Registry_Server.cxx
index d47523a9328a64e2618b2479a02513bf5119e641..0756e2b706109bf11f40a985453ba3b6259a4519 100644 (file)
--- a/src/Registry/SALOME_Registry_Server.cxx
+++ b/src/Registry/SALOME_Registry_Server.cxx
@@ -118,9 +118,9 @@ int main( int argc , char **argv )
          if (!CORBA::is_nil(theObj))
            inc = CosNaming::NamingContext::_narrow(theObj);
        }
-      catch( CORBA::COMM_FAILURE& )
+      catch( CORBA::SystemException& )
        {
-         MESSAGE( "Registry Server: CORBA::COMM_FAILURE: Unable to contact the Naming Service" );
+         MESSAGE( "Registry Server: CORBA::SystemException: Unable to contact the Naming Service" );
        }
       if(!CORBA::is_nil(inc))
        {

diff --git a/src/RessourcesCatalog/SALOME_RessourcesCatalog_Server.cxx b/src/RessourcesCatalog/SALOME_RessourcesCatalog_Server.cxx
index b52c63b672bda7cd8765f13a2afa2de3c40ac288..9625d3a0ad592137721a476d5c2cb9f38353a37d 100644 (file)
--- a/src/RessourcesCatalog/SALOME_RessourcesCatalog_Server.cxx
+++ b/src/RessourcesCatalog/SALOME_RessourcesCatalog_Server.cxx
@@ -85,9 +85,9 @@ int main(int argc,char **argv)
              if (!CORBA::is_nil(theObj))
                inc = CosNaming::NamingContext::_narrow(theObj);
            }
-         catch( CORBA::COMM_FAILURE& )
+         catch( CORBA::SystemException& )
            {
-             INFOS( "Ressources Catalog: CORBA::COMM_FAILURE: Unable to contact the Naming Service" );
+             INFOS( "Ressources Catalog: CORBA::SystemException: Unable to contact the Naming Service" );
            }
          if(!CORBA::is_nil(inc)) 
            {

diff --git a/src/SALOMEDS/SALOMEDS_Server.cxx b/src/SALOMEDS/SALOMEDS_Server.cxx
index 70919bba0ca431d2d28d824fbb3e715d9968f758..ff40576da88a66b796235192c501a8c1bac35063 100644 (file)
--- a/src/SALOMEDS/SALOMEDS_Server.cxx
+++ b/src/SALOMEDS/SALOMEDS_Server.cxx
@@ -53,9 +53,13 @@ int main(int argc, char** argv)
   try 
     {
       // Initialise the ORB.
+#if OMNIORB_VERSION >= 4
+      const char* options[][2] = { { "giopMaxMsgSize", "104857600" }, { 0, 0 } };
+      CORBA::ORB_var orb = CORBA::ORB_init( argc , argv , "omniORB4", options) ;
+#else
       CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, "omniORB3");
       omniORB::MaxMessageSize(100 * 1024 * 1024);
-      // Obtain a reference to the root POA.
+#endif      // Obtain a reference to the root POA.
       //
       long TIMESleep = 500000000;
       int NumberOfTries = 40;

diff --git a/src/SALOMEGUI/PyInterp_base.cxx b/src/SALOMEGUI/PyInterp_base.cxx
index 1538720481366c6ed4fca9881492bcaa5e90ead9..f3996c012c45d725d766a42dc7ce30d09b2d0b52 100644 (file)
--- a/src/SALOMEGUI/PyInterp_base.cxx
+++ b/src/SALOMEGUI/PyInterp_base.cxx
@@ -166,8 +166,8 @@ void PyInterp_base::initialize()
   }   
   
   // Create cStringIO to capture stdout and stderr
-  //PycString_IMPORT;
-  PycStringIO = (PycStringIO_CAPI *)xxxPyCObject_Import("cStringIO", "cStringIO_CAPI");
+  PycString_IMPORT;
+  //PycStringIO = (PycStringIO_CAPI *)xxxPyCObject_Import("cStringIO", "cStringIO_CAPI");
   _vout = PycStringIO->NewOutput(128);
   _verr = PycStringIO->NewOutput(128);
   

diff --git a/src/SALOMEGUI/QAD_Desktop.cxx b/src/SALOMEGUI/QAD_Desktop.cxx
index 5fa319a2803321ef960b8d416aa81a6b1e6d52ab..3a1f2d2c3565fb6a27eb165a5971e32abab7b68d 100644 (file)
--- a/src/SALOMEGUI/QAD_Desktop.cxx
+++ b/src/SALOMEGUI/QAD_Desktop.cxx
@@ -38,12 +38,12 @@
 
 
 #include "QAD.h"
+#include "QAD_PyEditor.h"
 #include "QAD_Help.h"
 #include "QAD_Tools.h"
 #include "QAD_Desktop.h"
 #include "QAD_LeftFrame.h"
 #include "QAD_RightFrame.h"
-#include "QAD_PyEditor.h"
 #include "QAD_Operation.h"
 #include "QAD_XmlHandler.h"
 #include "QAD_MessageBox.h"

diff --git a/src/SALOMEGUI/QAD_Desktop.h b/src/SALOMEGUI/QAD_Desktop.h
index 35c71416e8726c46d93ec3ed892c600cc6bb0473..a14f7d785b3ebba9c431cae0bb9d30fa30f6544c 100644 (file)
--- a/src/SALOMEGUI/QAD_Desktop.h
+++ b/src/SALOMEGUI/QAD_Desktop.h
@@ -55,7 +55,12 @@
 #include <qcombobox.h>
 #include <qstatusbar.h>
 #include <qpopupmenu.h>
+#if QT_VERSION == 0x030005
 #include "qworkspaceP.h"
+#else
+#include <qworkspace.h>
+#define QWorkspaceP QWorkspace
+#endif
 #include <qmainwindow.h>
 #include <qfiledialog.h>
 #include <qtoolbutton.h>

diff --git a/src/SALOMEGUI/QAD_PyEditor.h b/src/SALOMEGUI/QAD_PyEditor.h
index 941a340df0d1028836e8be324358044ac69f7b11..28eb056abe65d8ebcc4ccdf368671eb70ba8ce86 100644 (file)
--- a/src/SALOMEGUI/QAD_PyEditor.h
+++ b/src/SALOMEGUI/QAD_PyEditor.h
@@ -29,6 +29,7 @@
 #ifndef QAD_PyEditor_H
 #define QAD_PyEditor_H
 
+#include "QAD_PyInterp.h"
 #include <qtextedit.h>
 #include <qevent.h>
 

diff --git a/src/SALOMEGUI/QAD_RightFrame.cxx b/src/SALOMEGUI/QAD_RightFrame.cxx
index 8559ce5fb0595badc69534bd0ff6adfad569977c..88e112cc9c2117ec8e6bd893a12b0d8bfa499965 100644 (file)
--- a/src/SALOMEGUI/QAD_RightFrame.cxx
+++ b/src/SALOMEGUI/QAD_RightFrame.cxx
@@ -26,12 +26,12 @@
 //  Module : SALOME
 //  $Header$
 
+#include "QAD_PyEditor.h"
 #include "QAD_RightFrame.h"
 #include "QAD_Application.h"
 #include "QAD_Desktop.h"
 #include "QAD_StudyFrame.h"
 #include "QAD_Tools.h"
-#include "QAD_PyEditor.h"
 #include "QAD_PyInterp.h"
 
 #include <qvaluelist.h>

diff --git a/src/SALOMEGUI/QAD_Study.cxx b/src/SALOMEGUI/QAD_Study.cxx
index b52002cb2125943363a1904c71d376301ab4a899..ebd7c1a2f62e134f80ce57cf4f5bcff8e4105fa3 100644 (file)
--- a/src/SALOMEGUI/QAD_Study.cxx
+++ b/src/SALOMEGUI/QAD_Study.cxx
@@ -31,6 +31,7 @@
   \brief Study for QAD-based application.
 */
 
+#include "QAD_PyInterp.h"
 #include "QAD.h"
 #include "QAD_Tools.h"
 #include "QAD_Desktop.h"
@@ -42,7 +43,6 @@
 #include "QAD_ObjectBrowser.h"
 #include "QAD_PyInterp.h"
 #include "QAD_Config.h"
-#include "QAD_PyInterp.h"
  
 #include "utilities.h"
 

diff --git a/src/SALOMEGUI/QAD_StudyFrame.cxx b/src/SALOMEGUI/QAD_StudyFrame.cxx
index cfba6977e036c9299c380fb63ece7e9ef3146159..4326cce01dab6270bb1ae2b79b8c166f52508957 100644 (file)
--- a/src/SALOMEGUI/QAD_StudyFrame.cxx
+++ b/src/SALOMEGUI/QAD_StudyFrame.cxx
@@ -31,6 +31,7 @@
   \brief Frame window which contains QAD_LeftFrame and QAD_RightFrame.
 */
 
+#include "QAD_PyInterp.h"
 #include "QAD_StudyFrame.h"
 #include "QAD_StudyFrame.h"
 #include "QAD_RightFrame.h"
@@ -40,7 +41,6 @@
 #include "QAD_Desktop.h"
 #include "QAD_Study.h"
 #include "QAD_ObjectBrowser.h"
-#include "QAD_PyInterp.h"
 
 #include <qvaluelist.h>
 

diff --git a/src/SALOMETraceCollector/TraceCollector_WaitForServerReadiness.cxx b/src/SALOMETraceCollector/TraceCollector_WaitForServerReadiness.cxx
index 9e91b71d9db7148a44a10ae60b7ab48574173de5..5512ea9267e2ac59f1705d90aa4a42a830e72238 100644 (file)
--- a/src/SALOMETraceCollector/TraceCollector_WaitForServerReadiness.cxx
+++ b/src/SALOMETraceCollector/TraceCollector_WaitForServerReadiness.cxx
@@ -79,10 +79,10 @@ CORBA::Object_ptr TraceCollector_WaitForServerReadiness(CORBA::ORB_ptr orb,
              if (!CORBA::is_nil(theObj))
                inc = CosNaming::NamingContext::_narrow(theObj);
            }  
-         catch( CORBA::COMM_FAILURE& )
+         catch( CORBA::SystemException& )
            {
              cout << "TraceCollector_WaitForServerReadiness: "
-                  << "CORBA::COMM_FAILURE: "
+                  << "CORBA::SystemException: "
                   << "Unable to contact the Naming Service" << endl;
            }
           catch(...)

diff --git a/src/SALOME_PYQT/Makefile.in b/src/SALOME_PYQT/Makefile.in
index a72114d917e12718b6412d09952bad9ff588f50c..a8e766b14571a9eafa909d95925c28d92bc93dd4 100644 (file)
--- a/src/SALOME_PYQT/Makefile.in
+++ b/src/SALOME_PYQT/Makefile.in
@@ -20,7 +20,8 @@ VPATH=.:@srcdir@:@top_srcdir@/idl
 
 # SIP C++ Python
 # SIP defined in make_commence.in
-SIP_FLAGS    = -t WS_X11 -t Qt_3_0_5 -s ".cc" -c $(CURDIR) -I $(PYQT_SIPS)
+#SIP_FLAGS    = -t WS_X11 -t Qt_3_0_5 -s ".cc" -c $(CURDIR) -I $(PYQT_SIPS)
+SIP_FLAGS    =  -t WS_X11 -t Qt_3_3_0 -s ".cc" -c $(CURDIR) -I $(PYQT_SIPS)
 
 
 # SIP input file(s)
@@ -30,13 +31,13 @@ SIP_FILES = SalomePyQt.sip
 # SIP-generated C++ source files (corresponding line should be added for each wrapped class 
 # contained by SalomePyQt module)
 
-SIP_SRC=$(CURDIR)/SalomePyQtcmodule.cc \
+SIP_SRC=$(CURDIR)/sipSalomePyQtcmodule.cc \
        $(CURDIR)/sipSalomePyQtSalomePyQt.cc \
        $(CURDIR)/sipSalomePyQtSALOME_Selection.cc
 
-ifeq ($(SIP_VERS),new2)
-MOC_SRC = SalomePyQtcmodule_moc.cxx
-MOC_H = SalomePyQtcmodule.h
+ifeq ($(SIP_VERS),new3)
+MOC_SRC = sipSalomePyQtcmodule_moc.cxx
+MOC_H = sipSalomePyQtcmodule.h
 else
 MOC_SRC = sipSalomePyQtProxySalomePyQt_moc.cxx
 MOC_H = sipSalomePyQtProxySalomePyQt.h
@@ -51,13 +52,15 @@ LIB_MOC = SALOME_PYQT_GUI.h
 
 #LIB_MOC += sipSalomePyQtProxySalomePyQt.h
 
-EXPORT_SHAREDPYSCRIPTS = SalomePyQt.py
+#EXPORT_SHAREDPYSCRIPTS = SalomePyQt.py
 
 LIB_CLIENT_IDL = SALOME_Exception.idl SALOME_ContainerManager.idl
 
 CPPFLAGS+=$(QT_INCLUDES) $(PYTHON_INCLUDES) $(SIP_INCLUDES) $(OCC_INCLUDES) $(VTK_INCLUDES) $(OGL_INCLUDES)
-LIBS+= $(PYTHON_LIBS) $(SIP_LIBS) $(PYQT_LIBS) $(VTK_LIBS) $(OGL_LIBS)
-LDFLAGS+= -lSalomeGUI -lqtcmodule
+LIBS+= $(PYTHON_LIBS) $(VTK_LIBS) $(OGL_LIBS)
+# $(SIP_LIBS) $(PYQT_LIBS)
+LDFLAGS+= -lSalomeGUI
+# -lqtcmodule
 
 
 # Custom build step: generate C++ wrapping according to $(SIP_FILES)

diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUI.cxx b/src/SALOME_PYQT/SALOME_PYQT_GUI.cxx
index 1ec297726eb7ffb32c1970d6136e4bd50f4d68ea..54e433f63b495c9d1e0ae0f7a31df8a710106643 100644 (file)
--- a/src/SALOME_PYQT/SALOME_PYQT_GUI.cxx
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUI.cxx
@@ -16,7 +16,8 @@
 #include "SALOMEGUI_QtCatchCorbaException.hxx"
 #include "utilities.h"
 
-#include <sipSalomePyQtDeclSalomePyQt.h>
+//#include <sipSalomePyQtDeclSalomePyQt.h>
+#include <sipAPISalomePyQt.h>
 #include <sipqtQWorkspace.h>
 #include <sipqtQPopupMenu.h>
 

diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUI.h b/src/SALOME_PYQT/SALOME_PYQT_GUI.h
index eb1ca4861285573fbaf1fa973a952cd19b678556..e639a19a3f1d78fe9b3a9a22dbbe75bfee757db4 100644 (file)
--- a/src/SALOME_PYQT/SALOME_PYQT_GUI.h
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUI.h
@@ -10,6 +10,7 @@
 #ifndef _SALOME_PYQT_GUI_HXX_
 #define _SALOME_PYQT_GUI_HXX_
 
+#include "PyInterp_base.h"
 #include "QAD_Desktop.h"
 #include "PyInterp_PyQt.h"
 #include "SALOMEGUI.h"

diff --git a/src/SALOME_PYQT/SalomePyQt.sip b/src/SALOME_PYQT/SalomePyQt.sip
index df84b3fc1b58ace332cfd4f0ae8b633c944082ee..69bbcfd135c8ef8e365cbb1d767152655aea7167 100644 (file)
--- a/src/SALOME_PYQT/SalomePyQt.sip
+++ b/src/SALOME_PYQT/SalomePyQt.sip
@@ -4,7 +4,7 @@
 
 class SALOME_Selection : QObject
 {
-%HeaderCode
+%TypeHeaderCode
 #include <SALOME_Selection.h>
 %End
 
@@ -29,7 +29,7 @@ enum MenuName {
 
 class SalomePyQt
 {
-%HeaderCode
+%TypeHeaderCode
 #include <SalomePyQt.hxx>
 %End
 

diff --git a/src/Session/Session_ServerLauncher.cxx b/src/Session/Session_ServerLauncher.cxx
index 6b9f4b92e456c4fa0d5533524d721f5874e55881..8c0fccbf34f2921083b949afc0a8cd2c4d351aef 100644 (file)
--- a/src/Session/Session_ServerLauncher.cxx
+++ b/src/Session/Session_ServerLauncher.cxx
@@ -82,9 +82,9 @@ Session_ServerLauncher::~Session_ServerLauncher()
 
 void Session_ServerLauncher::run()
 {
-  //MESSAGE("Session_ServerLauncher::run");
+  MESSAGE("Session_ServerLauncher::run");
   _GUIMutex->lock(); // lock released by calling thread when ready: wait(mutex)
-  //MESSAGE("Server Launcher thread free to go...");
+  MESSAGE("Server Launcher thread free to go...");
    _GUIMutex->unlock();
 
   CheckArgs();

diff --git a/src/Session/Session_ServerThread.cxx b/src/Session/Session_ServerThread.cxx
index eef03249457867bbb792435ebb5ce34a080036ba..4908aae5483ff3139f4940385f5cf5785f8491fa 100644 (file)
--- a/src/Session/Session_ServerThread.cxx
+++ b/src/Session/Session_ServerThread.cxx
@@ -82,7 +82,7 @@ Session_ServerThread::Session_ServerThread(int argc,
                                           PortableServer::POA_ptr poa,
                                           QMutex *GUIMutex)
 {
-  //MESSAGE("Session_ServerThread Constructor " << argv[0]);
+  MESSAGE("Session_ServerThread Constructor " << argv[0]);
   _argc = argc;
   _argv = argv;
   _orb = CORBA::ORB::_duplicate(orb);
@@ -101,7 +101,7 @@ Session_ServerThread::Session_ServerThread(int argc,
 
 Session_ServerThread::~Session_ServerThread()
 {
-  //MESSAGE("~Session_ServerThread "<< _argv[0]);
+  MESSAGE("~Session_ServerThread "<< _argv[0]);
 }
 
 //=============================================================================

diff --git a/src/TestContainer/TestContainer.cxx b/src/TestContainer/TestContainer.cxx
index e8492fb6e94c77cfa2f00e17346f97a63bc5dcee..b668b740b8f39dc939a726b279f07de7dfe219ee 100644 (file)
--- a/src/TestContainer/TestContainer.cxx
+++ b/src/TestContainer/TestContainer.cxx
@@ -120,9 +120,9 @@ int main (int argc, char * argv[])
              if (!CORBA::is_nil(theObj))
                inc = CosNaming::NamingContext::_narrow(theObj);
            }
-         catch( CORBA::COMM_FAILURE& )
+         catch( CORBA::SystemException& )
            {
-             INFOS( "Test Container: CORBA::COMM_FAILURE: Unable to contact the Naming Service" )
+             INFOS( "Test Container: CORBA::SystemException: Unable to contact the Naming Service" )
                }
          if(!CORBA::is_nil(inc))
            {