Restore usage of GenericObject wraper ( _wrap )

diff --git a/src/PluginUtils/GeomSelectionTools.cxx b/src/PluginUtils/GeomSelectionTools.cxx
index ddf87e5ea1ed15b60d650be463e37be81432c87e..936afcb31d97c7463304bbe1860a6c04ec81baa1 100644 (file)
--- a/src/PluginUtils/GeomSelectionTools.cxx
+++ b/src/PluginUtils/GeomSelectionTools.cxx
@@ -213,7 +213,7 @@ TopAbs_ShapeEnum GeomSelectionTools::entryToShapeType(std::string entry){
         // if the Geom Object is a group
         if (aShape->GetType() == GEOM_GROUP){
 //           MESSAGE("It's a group");
-          GEOM::GEOM_IGroupOperations_ptr aGroupOp =
+          GEOM::GEOM_IGroupOperations_wrap aGroupOp =
             _geomEngine->GetIGroupOperations();
           ShapeType= (TopAbs_ShapeEnum)aGroupOp->GetType(aShape);
         }

diff --git a/src/SMESHGUI/SMESHGUI_GroupDlg.cxx b/src/SMESHGUI/SMESHGUI_GroupDlg.cxx
index 0da1190540ba36a5059fb9e5428e85b0373a27d9..dae81ae51869e14980d5210b9efd1913efc42482 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_GroupDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_GroupDlg.cxx
@@ -1063,7 +1063,7 @@ bool SMESHGUI_GroupDlg::onApply()
         if (geomGen->_is_nil())
           return false;
 
-        GEOM::GEOM_IGroupOperations_ptr op = geomGen->GetIGroupOperations();
+        GEOM::GEOM_IGroupOperations_wrap op = geomGen->GetIGroupOperations();
         if (op->_is_nil())
           return false;
 
@@ -1414,7 +1414,7 @@ void SMESHGUI_GroupDlg::onObjectSelectionChanged()
         GEOM::GEOM_Object_var aGroupMainShape;
         if (aGeomGroup->GetType() == 37)
         {
-          GEOM::GEOM_IGroupOperations_ptr anOp =
+          GEOM::GEOM_IGroupOperations_wrap anOp =
             SMESH::GetGEOMGen( aGeomGroup )->GetIGroupOperations();
           aGroupMainShape = anOp->GetMainShape( aGeomGroup );
           // aGroupMainShape is an existing servant => GEOM_Object_var not GEOM_Object_wrap
@@ -2012,7 +2012,7 @@ void SMESHGUI_GroupDlg::onAdd()
   }
   else if ( myCurrentLineEdit == myGeomGroupLine && myGeomObjects->length() == 1 )
   {
-    GEOM::GEOM_IGroupOperations_ptr aGroupOp =
+    GEOM::GEOM_IGroupOperations_wrap aGroupOp =
       SMESH::GetGEOMGen( myGeomObjects[0] )->GetIGroupOperations();
 
     SMESH::ElementType aGroupType = SMESH::ALL;

diff --git a/src/SMESHGUI/SMESHGUI_GroupOnShapeDlg.cxx b/src/SMESHGUI/SMESHGUI_GroupOnShapeDlg.cxx
index 9054ad855a30fb13ff598b7e4ac2b3b34e30630d..3bcc8b402b6b1b43346ae2fe138b9889bd76381b 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_GroupOnShapeDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_GroupOnShapeDlg.cxx
@@ -225,7 +225,7 @@ SMESH::ElementType SMESHGUI_GroupOnShapeOp::ElementType(GEOM::GEOM_Object_var ge
 
     if ( geom->GetType() == 37 ) // geom group
     {
-      GEOM::GEOM_IGroupOperations_ptr aGroupOp = geomGen->GetIGroupOperations();
+      GEOM::GEOM_IGroupOperations_wrap aGroupOp = geomGen->GetIGroupOperations();
       if ( !aGroupOp->_is_nil() ) {
         // mainShape is an existing servant => GEOM_Object_var not GEOM_Object_wrap
         GEOM::GEOM_Object_var mainShape = aGroupOp->GetMainShape( geom );

diff --git a/src/SMESHGUI/SMESHGUI_MeshOp.cxx b/src/SMESHGUI/SMESHGUI_MeshOp.cxx
index ed9e8d63c57f7e81e6ccad65349251c2d78494c5..5004810819566e9e15e477c1a1ac6cd3e526f136 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_MeshOp.cxx
+++ b/src/SMESHGUI/SMESHGUI_MeshOp.cxx
@@ -349,7 +349,7 @@ bool SMESHGUI_MeshOp::isSubshapeOk() const
     GEOM::GEOM_Gen_var geomGen = mainGeom->GetGen();
     if (geomGen->_is_nil()) return false;
 
-    GEOM::GEOM_IGroupOperations_ptr op = geomGen->GetIGroupOperations();
+    GEOM::GEOM_IGroupOperations_wrap op = geomGen->GetIGroupOperations();
     if (op->_is_nil()) return false;
 
     // check all selected shapes
@@ -2140,7 +2140,7 @@ bool SMESHGUI_MeshOp::createSubMesh( QString& theMess, QStringList& theEntryList
     // create a GEOM group
     GEOM::GEOM_Gen_var geomGen = mainGeom->GetGen();
     if ( !geomGen->_is_nil() ) {
-      GEOM::GEOM_IGroupOperations_ptr op = geomGen->GetIGroupOperations();
+      GEOM::GEOM_IGroupOperations_wrap op = geomGen->GetIGroupOperations();
       if ( !op->_is_nil() )
       {
         // check and add all selected GEOM objects: they must be

diff --git a/src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.cxx b/src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.cxx
index 19397b87116d7b7c2c329581793e80b563d23304..b57a24197a94c5596dc2dad7fbd1345f542d455f 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.cxx
@@ -360,7 +360,7 @@ void SMESHGUI_ShapeByMeshOp::commitOperation()
       }
       else if (aNumberOfGO > 1)
       {
-        GEOM::GEOM_IGroupOperations_ptr aGroupOp = geomGen->GetIGroupOperations();
+        GEOM::GEOM_IGroupOperations_wrap aGroupOp = geomGen->GetIGroupOperations();
         if ( aGroupOp->_is_nil() )
           return;
 

diff --git a/src/SMESH_I/SMESH_Gen_i.cxx b/src/SMESH_I/SMESH_Gen_i.cxx
index ac0b696007a2f4329b6ecf2b404d421475d5c3e9..fc87fc517867da8e6ac873d7f605f83045cc226c 100644 (file)
--- a/src/SMESH_I/SMESH_Gen_i.cxx
+++ b/src/SMESH_I/SMESH_Gen_i.cxx
@@ -3296,7 +3296,7 @@ namespace // utils for CopyMeshWithGeom()
               {
                 int groupType = getShapeType( myNewMesh_i, newIndices[0] );
 
-                GEOM::GEOM_IGroupOperations_ptr grOp = geomGen->GetIGroupOperations();
+                GEOM::GEOM_IGroupOperations_wrap grOp = geomGen->GetIGroupOperations();
                 newShape = grOp->CreateGroup( mainShapeNew, groupType );
 
                 GEOM::ListOfLong_var  newIndicesList = new GEOM::ListOfLong();

diff --git a/src/SMESH_I/SMESH_Mesh_i.cxx b/src/SMESH_I/SMESH_Mesh_i.cxx
index d4e396cbdfacd0556715d974ba7d7b1d655a9077..06b0abcde3f9b274af0c90cb69a50371590c4a93 100644 (file)
--- a/src/SMESH_I/SMESH_Mesh_i.cxx
+++ b/src/SMESH_I/SMESH_Mesh_i.cxx
@@ -2028,9 +2028,9 @@ void SMESH_Mesh_i::addGeomGroupData(GEOM::GEOM_Object_ptr theGeomObj,
   if ( groupSO->_is_nil() )
     return;
   // group indices
-  GEOM::GEOM_Gen_var geomGen = _gen_i->GetGeomEngine( theGeomObj );
-  GEOM::GEOM_IGroupOperations_ptr groupOp = geomGen->GetIGroupOperations();
-  GEOM::ListOfLong_var ids = groupOp->GetObjects( theGeomObj );
+  GEOM::GEOM_Gen_var               geomGen = _gen_i->GetGeomEngine( theGeomObj );
+  GEOM::GEOM_IGroupOperations_wrap groupOp = geomGen->GetIGroupOperations();
+  GEOM::ListOfLong_var                 ids = groupOp->GetObjects( theGeomObj );
 
   // store data
   _geomGroupData.push_back( TGeomGroupData() );
@@ -2104,9 +2104,9 @@ TopoDS_Shape SMESH_Mesh_i::newGroupShape( TGeomGroupData & groupData, int how )
 
       // get indices of group items
       set<int> curIndices;
-      GEOM::GEOM_Gen_var              geomGen = _gen_i->GetGeomEngine( geomGroup );
-      GEOM::GEOM_IGroupOperations_ptr groupOp = geomGen->GetIGroupOperations();
-      GEOM::ListOfLong_var                ids = groupOp->GetObjects( geomGroup );
+      GEOM::GEOM_Gen_var               geomGen = _gen_i->GetGeomEngine( geomGroup );
+      GEOM::GEOM_IGroupOperations_wrap groupOp = geomGen->GetIGroupOperations();
+      GEOM::ListOfLong_var                 ids = groupOp->GetObjects( geomGroup );
       for ( CORBA::ULong i = 0; i < ids->length(); ++i )
         curIndices.insert( ids[i] );