Fixes for SMESH working with SHAPERSTUDY

diff --git a/src/SMESH_I/SMESH_Gen_i.cxx b/src/SMESH_I/SMESH_Gen_i.cxx
index e87641eedf2ca4bb91eb0c470e0e7a5615654306..3003a0a5259d5120a52ecb8db178bc02a39d3a0e 100644 (file)
--- a/src/SMESH_I/SMESH_Gen_i.cxx
+++ b/src/SMESH_I/SMESH_Gen_i.cxx
@@ -278,7 +278,7 @@ SALOME_LifeCycleCORBA*  SMESH_Gen_i::GetLCC()
 GEOM::GEOM_Gen_var SMESH_Gen_i::GetGeomEngine( bool isShaper )
 {
   Engines::EngineComponent_ptr temp =
-    GetLCC()->FindOrLoad_Component( isShaper ? "FactoryServerPy" : "FactoryServer",
+    GetLCC()->FindOrLoad_Component( isShaper ? "FactoryServer" : "FactoryServer",
                                     isShaper ? "SHAPERSTUDY" : "GEOM" );
   myGeomGen = GEOM::GEOM_Gen::_narrow( temp );
 
@@ -295,7 +295,7 @@ GEOM::GEOM_Gen_var SMESH_Gen_i::GetGeomEngine( bool isShaper )
 
 GEOM::GEOM_Gen_var SMESH_Gen_i::GetGeomEngine( GEOM::GEOM_Object_ptr go )
 {
-  GEOM::GEOM_Gen_var gen;
+  GEOM::GEOM_Gen_ptr gen;
   if ( !CORBA::is_nil( go ))
     gen = go->GetGen();
   return gen;

diff --git a/src/SMESH_I/SMESH_Gen_i_1.cxx b/src/SMESH_I/SMESH_Gen_i_1.cxx
index 1e0d6187b6c3be422df9dc2b74fda89ef6b8a784..0b258bf08fa08308ff106b98f40d3980a4fe6f83 100644 (file)
--- a/src/SMESH_I/SMESH_Gen_i_1.cxx
+++ b/src/SMESH_I/SMESH_Gen_i_1.cxx
@@ -255,7 +255,7 @@ TopoDS_Shape SMESH_Gen_i::GeomObjectToShape(GEOM::GEOM_Object_ptr theGeomObject)
   if ( !theGeomObject->_is_nil() && !theGeomObject->_non_existent() )
   {
     GEOM_Client*           aClient = GetShapeReader();
-    GEOM::GEOM_Gen_ptr aGeomEngine = GetGeomEngine( theGeomObject );
+    GEOM::GEOM_Gen_var aGeomEngine = GetGeomEngine( theGeomObject );
     if ( aClient && !aGeomEngine->_is_nil () )
       S = aClient->GetShape( aGeomEngine, theGeomObject );
   }