Merge branch 'BR_1328' into BR_DEMO

[modules/hydro.git] / src / HYDROGUI / HYDROGUI_ImportPolylineOp.cxx

diff --git a/src/HYDROGUI/HYDROGUI_ImportPolylineOp.cxx b/src/HYDROGUI/HYDROGUI_ImportPolylineOp.cxx
index 238acf07171cad4f11bbff689be2e91b03f077d9..e7faee118be82bfaa64f382d43cdcefd0092be0a 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_ImportPolylineOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_ImportPolylineOp.cxx
@@ -58,7 +58,7 @@ void HYDROGUI_ImportPolylineOp::startOperation()
   myFileDlg = new SUIT_FileDlg( module()->getApp()->desktop(), true );
   myFileDlg->setWindowTitle( getName() );
   myFileDlg->setFileMode( SUIT_FileDlg::ExistingFiles );
-  myFileDlg->setFilter( tr("POLYLINE_FILTER") );
+  myFileDlg->setNameFilter( tr("POLYLINE_FILTER") );
 
   connect( myFileDlg, SIGNAL( accepted() ), this, SLOT( onApply() ) );
   connect( myFileDlg, SIGNAL( rejected() ), this, SLOT( onCancel() ) );
@@ -89,7 +89,7 @@ void HYDROGUI_ImportPolylineOp::onApply()
     if (anExt == "shp")
     {
       HYDROData_ShapeFile anImporter;
-      NCollection_Sequence<Handle_HYDROData_Entity> theEntities;
+      NCollection_Sequence<Handle(HYDROData_Entity)> theEntities;
       int aShapeTypeOfFile = -1;
       int aStat = anImporter.ImportPolylines(doc(), aFileName, theEntities, aShapeTypeOfFile ); 
       if (aStat == 1)
@@ -125,7 +125,7 @@ void HYDROGUI_ImportPolylineOp::onApply()
   QApplication::restoreOverrideCursor();
 }
 
-void HYDROGUI_ImportPolylineOp::UpdateView( NCollection_Sequence<Handle_HYDROData_Entity>& anEntities)
+void HYDROGUI_ImportPolylineOp::UpdateView( NCollection_Sequence<Handle(HYDROData_Entity)>& anEntities)
 {
   size_t anActiveViewId = HYDROGUI_Tool::GetActiveGraphicsViewId( module() );
   if ( anActiveViewId == 0 )