Skip to content

Commit

Permalink
QFileDialg::setFilters() is obsolete in Qt4. Replace it with setNameF…
Browse files Browse the repository at this point in the history
…ilters().

This change is Qt4/Qt5 neutral.
  • Loading branch information
f3nix authored and wwmayer committed Dec 22, 2015
1 parent 4d85f0e commit d3d01db
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion src/Gui/CommandView.cpp
Expand Up @@ -1483,7 +1483,7 @@ void StdViewScreenShot::activated(int iMsg)
fd.setFileMode(QFileDialog::AnyFile);
fd.setAcceptMode(QFileDialog::AcceptSave);
fd.setWindowTitle(QObject::tr("Save picture"));
fd.setFilters(filter);
fd.setNameFilters(filter);
if (!selFilter.isEmpty())
fd.selectNameFilter(selFilter);

Expand Down
8 changes: 4 additions & 4 deletions src/Gui/FileDialog.cpp
Expand Up @@ -168,7 +168,7 @@ QString FileDialog::getSaveFileName (QWidget * parent, const QString & caption,
dlg.setAcceptMode(QFileDialog::AcceptSave);
dlg.setDirectory(dirName);
dlg.setOptions(options);
dlg.setFilters(filter.split(QLatin1String(";;")));
dlg.setNameFilters(filter.split(QLatin1String(";;")));
dlg.onSelectedFilter(dlg.selectedFilter());
dlg.setNameFilterDetailsVisible(true);
dlg.setConfirmOverwrite(true);
Expand Down Expand Up @@ -247,7 +247,7 @@ QString FileDialog::getOpenFileName(QWidget * parent, const QString & caption, c
dlg.setAcceptMode(QFileDialog::AcceptOpen);
dlg.setDirectory(dirName);
dlg.setOptions(options);
dlg.setFilters(filter.split(QLatin1String(";;")));
dlg.setNameFilters(filter.split(QLatin1String(";;")));
dlg.setNameFilterDetailsVisible(true);
if (dlg.exec() == QDialog::Accepted) {
if (selectedFilter)
Expand Down Expand Up @@ -305,7 +305,7 @@ QStringList FileDialog::getOpenFileNames (QWidget * parent, const QString & capt
dlg.setAcceptMode(QFileDialog::AcceptOpen);
dlg.setDirectory(dirName);
dlg.setOptions(options);
dlg.setFilters(filter.split(QLatin1String(";;")));
dlg.setNameFilters(filter.split(QLatin1String(";;")));
dlg.setNameFilterDetailsVisible(true);
if (dlg.exec() == QDialog::Accepted) {
if (selectedFilter)
Expand Down Expand Up @@ -412,7 +412,7 @@ void FileOptionsDialog::accept()
if (!ok) {
filter = tr("All files (*.*)");
filters << filter;
setFilters(filters);
setNameFilters(filters);
}

// empty the line edit
Expand Down
2 changes: 1 addition & 1 deletion src/Mod/Drawing/Gui/DrawingView.cpp
Expand Up @@ -459,7 +459,7 @@ void DrawingView::printPdf()
dlg.setFileMode(QFileDialog::AnyFile);
dlg.setAcceptMode(QFileDialog::AcceptSave);
dlg.setWindowTitle(tr("Export PDF"));
dlg.setFilters(QStringList() << QString::fromLatin1("%1 (*.pdf)").arg(tr("PDF file")));
dlg.setNameFilters(QStringList() << QString::fromLatin1("%1 (*.pdf)").arg(tr("PDF file")));

QGridLayout *gridLayout;
QGridLayout *formLayout;
Expand Down

0 comments on commit d3d01db

Please sign in to comment.