Nerge with PAL/SALOME 2.1.0d

[modules/smesh.git] / src / SMESHGUI / SMESHGUI_GroupOpDlg.cxx

diff --git a/src/SMESHGUI/SMESHGUI_GroupOpDlg.cxx b/src/SMESHGUI/SMESHGUI_GroupOpDlg.cxx
index 3bbaf3b75ce1cd174c55bcd7cdb92728e1e6fc14..c5b07386e3c3d06d885ed1ecbfe35e91355c6dfe 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_GroupOpDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_GroupOpDlg.cxx
@@ -163,8 +163,8 @@ void SMESHGUI_GroupOpDlg::Init( SALOME_Selection* theSelection )
   aSMESHGUI->SetActiveDialogBox( ( QDialog* )this ) ;
   myFocusWg = myEdit1;
   
   aSMESHGUI->SetActiveDialogBox( ( QDialog* )this ) ;
   myFocusWg = myEdit1;
   

-  myGroup1 = SMESH::SMESH_Group::_nil();
-  myGroup2 = SMESH::SMESH_Group::_nil();
+  myGroup1 = SMESH::SMESH_GroupBase::_nil();
+  myGroup2 = SMESH::SMESH_GroupBase::_nil();

   
   // selection and SMESHGUI
   connect( mySelection, SIGNAL( currentSelectionChanged() ), SLOT( onSelectionDone() ) );
   
   // selection and SMESHGUI
   connect( mySelection, SIGNAL( currentSelectionChanged() ), SLOT( onSelectionDone() ) );


@@ -296,16 +296,16 @@ void SMESHGUI_GroupOpDlg::onClose()
 void SMESHGUI_GroupOpDlg::onSelectionDone()
 {
   if ( myFocusWg == myEdit1 )
 void SMESHGUI_GroupOpDlg::onSelectionDone()
 {
   if ( myFocusWg == myEdit1 )

-    myGroup1 = SMESH::SMESH_Group::_nil();
+    myGroup1 = SMESH::SMESH_GroupBase::_nil();

   else
   else

-    myGroup2 = SMESH::SMESH_Group::_nil();
+    myGroup2 = SMESH::SMESH_GroupBase::_nil();

   
   myFocusWg->setText( "" );
   
   if ( mySelection->IObjectCount() == 1 )
   {
   
   myFocusWg->setText( "" );
   
   if ( mySelection->IObjectCount() == 1 )
   {

-    SMESH::SMESH_Group_var aGroup = 
-      SMESH::IObjectToInterface<SMESH::SMESH_Group>( mySelection->firstIObject() );
+    SMESH::SMESH_GroupBase_var aGroup = 
+      SMESH::IObjectToInterface<SMESH::SMESH_GroupBase>( mySelection->firstIObject() );

     
     if ( !aGroup->_is_nil() )
     {
     
     if ( !aGroup->_is_nil() )
     {