Mercurial > hg > svgui
diff widgets/InteractiveFileFinder.cpp @ 663:1a0fdad4af4d tonioni
Merge from the default branch
author | Chris Cannam |
---|---|
date | Fri, 12 Jul 2013 13:25:22 +0100 |
parents | d632a1e87018 |
children | ee99f5c0050c |
line wrap: on
line diff
--- a/widgets/InteractiveFileFinder.cpp Thu Jun 20 13:47:36 2013 +0100 +++ b/widgets/InteractiveFileFinder.cpp Fri Jul 12 13:25:22 2013 +0100 @@ -130,7 +130,7 @@ // Use our own QFileDialog just for symmetry with getSaveFileName below QFileDialog dialog; - dialog.setFilters(filter.split('\n')); + dialog.setNameFilters(filter.split('\n')); dialog.setWindowTitle(title); dialog.setDirectory(lastPath); @@ -254,7 +254,7 @@ // need to adjust the file extension based on the selected filter QFileDialog dialog; - dialog.setFilters(filter.split('\n')); + dialog.setNameFilters(filter.split('\n')); dialog.setWindowTitle(title); dialog.setDirectory(lastPath); @@ -289,7 +289,7 @@ if ((type == LayerFile || type == LayerFileNoMidi) && fi.suffix() == "") { QString expectedExtension; - QString selectedFilter = dialog.selectedFilter(); + QString selectedFilter = dialog.selectedNameFilter(); if (selectedFilter.contains(".svl")) { expectedExtension = "svl"; } else if (selectedFilter.contains(".txt")) {