Merge remote-tracking branch 'origin/BR_1321_ECW' into BR_DEMO

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

diff --git a/src/HYDROGUI/HYDROGUI_GeomObjectDlg.cxx b/src/HYDROGUI/HYDROGUI_GeomObjectDlg.cxx
index e69a21b73b900a3fdc580ba2abc1681c54a39dc9..1179745d227bc5a64faf0745a680b021673e7916 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_GeomObjectDlg.cxx
+++ b/src/HYDROGUI/HYDROGUI_GeomObjectDlg.cxx
@@ -1,12 +1,8 @@
-// Copyright (C) 2007-2013  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
-//
+// Copyright (C) 2014-2015  EDF-R&D
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -22,7 +18,7 @@
 
 #include "HYDROGUI_GeomObjectDlg.h"
 
-#include "HYDROGUI_Tool.h"
+#include "HYDROGUI_Tool2.h"
 
 #include <SUIT_FileDlg.h>
 #include <SUIT_ResourceMgr.h>
@@ -183,14 +179,14 @@ void HYDROGUI_GeomObjectDlg::onBrowse()
 {
   SUIT_FileDlg* aFileDlg = new SUIT_FileDlg( this, true );
   aFileDlg->setWindowTitle( tr("IMPORT_OBSTACLE_FROM_FILE") );
-  aFileDlg->setFilter( tr("OBSTACLE_FILTER") );
+  aFileDlg->setNameFilter( tr("OBSTACLE_FILTER") );
   if ( !lastUsedFilter.isEmpty() ) {
-    aFileDlg->selectFilter( lastUsedFilter );
+    aFileDlg->selectNameFilter( lastUsedFilter );
   }
 
   if ( aFileDlg->exec() == QDialog::Accepted ) {
     QString aFileName = aFileDlg->selectedFile();
-    lastUsedFilter = aFileDlg->selectedFilter();
+    lastUsedFilter = aFileDlg->selectedNameFilter();
 
     if ( !aFileName.isEmpty() ) {
       myFileName->setText( aFileName );
@@ -265,4 +261,4 @@ void HYDROGUI_GeomObjectDlg::setDefaultName( const QString& theName )
 QString HYDROGUI_GeomObjectDlg::getDefaultName()
 {
   return myDefaultName;
-}
\ No newline at end of file
+}