Merge branch 'spns/19079'

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

diff --git a/src/SMESHGUI/SMESHGUI_ConvToQuadOp.cxx b/src/SMESHGUI/SMESHGUI_ConvToQuadOp.cxx
index b2e7c993ec1e8360252b5367fc9782c3ab7561e9..db5fcb66d1e0787e748869da9db00756d4cd1f66 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_ConvToQuadOp.cxx
+++ b/src/SMESHGUI/SMESHGUI_ConvToQuadOp.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2021  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -101,7 +101,7 @@ void SMESHGUI_ConvToQuadOp::startOperation()
   }
   connect( myDlg, SIGNAL( onClicked( int ) ), SLOT( ConnectRadioButtons( int ) ) );
 
-  myHelpFileName = "convert_to_from_quadratic_mesh_page.html";
+  myHelpFileName = "convert_to_from_quadratic_mesh.html";
 
   SMESHGUI_SelectionOp::startOperation();
 
@@ -265,7 +265,7 @@ bool SMESHGUI_ConvToQuadOp::onApply()
           prop->Delete();
 
           SMESH::MeshPreviewStruct_var previewData = aEditor->GetPreviewData();
-          myBadElemsPreview->SetData( & previewData.in() );
+          myBadElemsPreview->SetData( previewData.in() );
           myBadElemsPreview->SetVisibility(true);
 
           SUIT_MessageBox* mb = new SUIT_MessageBox(SUIT_MessageBox::Warning,
@@ -328,7 +328,7 @@ SMESHGUI_ConvToQuadOp::MeshDestinationType
 SMESHGUI_ConvToQuadOp::DestinationMesh( const SMESH::SMESH_IDSource_var& idSource,
                                         bool*                            isMixOrder)
 {
-  SMESH::long_array_var nbElemOfType = idSource->GetMeshInfo();
+  SMESH::smIdType_array_var nbElemOfType = idSource->GetMeshInfo();
 
   bool hasBiQuad     = ( nbElemOfType[SMDSEntity_BiQuad_Triangle   ] ||
                          nbElemOfType[SMDSEntity_BiQuad_Quadrangle ] ||