diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-03-09 15:49:03 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-03-12 08:23:45 +0100 |
commit | 2c390e85cffbfa1eaeabaadfa823abcb61c1156a (patch) | |
tree | 526d6e361723924d832ed1bca6c57246284e256c /src/widgets | |
parent | 5f940253bfde4b5336ff13be063f64bd1c1dbe49 (diff) |
QFileDialog: Improve default implementation of getOpenFileContent()
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>
Diffstat (limited to 'src/widgets')
-rw-r--r-- | src/widgets/dialogs/qfiledialog.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/widgets/dialogs/qfiledialog.cpp b/src/widgets/dialogs/qfiledialog.cpp index add8e6db91..34c2c4ecb5 100644 --- a/src/widgets/dialogs/qfiledialog.cpp +++ b/src/widgets/dialogs/qfiledialog.cpp @@ -2438,14 +2438,15 @@ void QFileDialog::getOpenFileContent(const QString &nameFilter, const std::funct (*openFileImpl)(); #else QFileDialog *dialog = new QFileDialog(); + dialog->setFileMode(QFileDialog::ExistingFile); dialog->selectNameFilter(nameFilter); auto fileSelected = [=](const QString &fileName) { QByteArray fileContent; if (!fileName.isNull()) { QFile selectedFile(fileName); - selectedFile.open(QIODevice::ReadOnly); - fileContent = selectedFile.readAll(); + if (selectedFile.open(QIODevice::ReadOnly)) + fileContent = selectedFile.readAll(); } fileOpenCompleted(fileName, fileContent); }; |