Merge branch 'hydro/imps_2015' into V7_dev

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

diff --git a/src/SMESHGUI/SMESHGUI_CreatePatternDlg.cxx b/src/SMESHGUI/SMESHGUI_CreatePatternDlg.cxx
index 34771755d5ca05bc1724e060442c09f4ea933f83..da805271a1f7992131c8cdef5908baf98f245ae4 100755 (executable)
--- a/src/SMESHGUI/SMESHGUI_CreatePatternDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_CreatePatternDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2014  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2015  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
@@ -105,9 +105,6 @@ SMESHGUI_CreatePatternDlg::SMESHGUI_CreatePatternDlg( SMESHGUI*   theModule,
 
   aDlgLay->setStretchFactor( aMainFrame, 1 );
 
-  if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ) )
-    mySelector = aViewWindow->GetSelector();
-
   myHelpFileName = "pattern_mapping_page.html";
 
   Init( theType );
@@ -381,7 +378,7 @@ void SMESHGUI_CreatePatternDlg::onSave()
     SUIT_FileDlg* aDlg = new SUIT_FileDlg( this, false );
     aDlg->setWindowTitle( tr( "SAVE_PATTERN" ) );
     aDlg->setFileMode( QFileDialog::AnyFile );
-    aDlg->setFilter( tr( "PATTERN_FILT" ) );
+    aDlg->setNameFilter( tr( "PATTERN_FILT" ) );
     if ( myName->text() != "" )
       aDlg->selectFile( myName->text() );
 
@@ -395,7 +392,7 @@ void SMESHGUI_CreatePatternDlg::onSave()
     if ( QFileInfo( fName ).suffix().isEmpty() )
       fName = autoExtension( fName );
 
-    fName = QDir::convertSeparators( fName );
+    fName = QDir::toNativeSeparators( fName );
 
     QString aData( myPattern->GetString() );
     long aLen = aData.length();
@@ -572,7 +569,7 @@ void SMESHGUI_CreatePatternDlg::onSelectionDone()
 {
   try {
     SALOME_ListIO aList;
-    mySelectionMgr->selectedObjects( aList, SVTK_Viewer::Type() );
+    mySelectionMgr->selectedObjects( aList );
     if ( aList.Extent() != 1 )
       return;