1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QFileDialog: Improve default implementation of getOpenFileContent()

Browse Source 
Use QFileDialog::ExistingFile and check whether file can be opened,
fixing warnings like:
QIODevice::read (QFile, "/home/.../blub"): device not open

Change-Id: I7ee1d59f01383c581bc09fb44855835aae8c246b
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
This commit is contained in:
Friedemann Kleint 2020-03-09 15:49:03 +01:00
parent 5f940253bf
commit 2c390e85cf
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/widgets/dialogs/qfiledialog.cpp
View File

@ -2438,14 +2438,15 @@ void QFileDialog::getOpenFileContent(const QString &nameFilter, const std::funct
(*openFileImpl)(); (*openFileImpl)();
#else #else
QFileDialog *dialog = new QFileDialog(); QFileDialog *dialog = new QFileDialog();
dialog->setFileMode(QFileDialog::ExistingFile);
dialog->selectNameFilter(nameFilter); dialog->selectNameFilter(nameFilter);
auto fileSelected = [=](const QString &fileName) { auto fileSelected = [=](const QString &fileName) {
QByteArray fileContent; QByteArray fileContent;
if (!fileName.isNull()) { if (!fileName.isNull()) {
QFile selectedFile(fileName); QFile selectedFile(fileName);
selectedFile.open(QIODevice::ReadOnly); if (selectedFile.open(QIODevice::ReadOnly))
fileContent = selectedFile.readAll(); fileContent = selectedFile.readAll();
} }
fileOpenCompleted(fileName, fileContent); fileOpenCompleted(fileName, fileContent);
}; };