suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QFileDialg::selectedFilter() is obsolete in Qt4. Replace it with selectedNameFilter().

Browse Source 
This change is Qt4/Qt5 neutral.
This commit is contained in:
Mateusz Skowroński 2015-12-20 20:12:26 +01:00 committed by wmayer
parent d3d01db9e2
commit e6379ea636
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Gui/CommandView.cpp
View File

@ -1494,7 +1494,7 @@ void StdViewScreenShot::activated(int iMsg)
fd.setOptionsWidget(FileOptionsDialog::ExtensionRight, opt);
fd.setConfirmOverwrite(true);
opt->onSelectedFilter(fd.selectedFilter());
opt->onSelectedFilter(fd.selectedNameFilter());
QObject::connect(&fd, SIGNAL(filterSelected(const QString&)),
opt, SLOT(onSelectedFilter(const QString&)));

12
src/Gui/FileDialog.cpp
View File

@ -64,7 +64,7 @@ FileDialog::~FileDialog()
void FileDialog::onSelectedFilter(const QString& filter)
{
QRegExp rx(QLatin1String("\\(\\*.(\\w+)"));
QString suf = selectedFilter();
QString suf = selectedNameFilter();
if (rx.indexIn(suf) >= 0) {
suf = rx.cap(1);
setDefaultSuffix(suf.toLower());
@ -169,12 +169,12 @@ QString FileDialog::getSaveFileName (QWidget * parent, const QString & caption,
dlg.setDirectory(dirName);
dlg.setOptions(options);
dlg.setNameFilters(filter.split(QLatin1String(";;")));
dlg.onSelectedFilter(dlg.selectedFilter());
dlg.onSelectedFilter(dlg.selectedNameFilter());
dlg.setNameFilterDetailsVisible(true);
dlg.setConfirmOverwrite(true);
if (dlg.exec() == QDialog::Accepted) {
if (selectedFilter)
*selectedFilter = dlg.selectedFilter();
*selectedFilter = dlg.selectedNameFilter();
file = dlg.selectedFiles().front();
}
#else
@ -251,7 +251,7 @@ QString FileDialog::getOpenFileName(QWidget * parent, const QString & caption, c
dlg.setNameFilterDetailsVisible(true);
if (dlg.exec() == QDialog::Accepted) {
if (selectedFilter)
*selectedFilter = dlg.selectedFilter();
*selectedFilter = dlg.selectedNameFilter();
file = dlg.selectedFiles().front();
}
#else
@ -309,7 +309,7 @@ QStringList FileDialog::getOpenFileNames (QWidget * parent, const QString & capt
dlg.setNameFilterDetailsVisible(true);
if (dlg.exec() == QDialog::Accepted) {
if (selectedFilter)
*selectedFilter = dlg.selectedFilter();
*selectedFilter = dlg.selectedNameFilter();
files = dlg.selectedFiles();
}
#else
@ -427,7 +427,7 @@ void FileOptionsDialog::accept()
QFileInfo fi(fn);
QString ext = fi.completeSuffix();
QRegExp rx(QLatin1String("\\(\\*.(\\w+)"));
QString suf = selectedFilter();
QString suf = selectedNameFilter();
if (rx.indexIn(suf) >= 0)
suf = rx.cap(1);
if (ext.isEmpty())