diff options
author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2024-04-14 17:08:05 +0200 |
---|---|---|
committer | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2024-04-16 21:57:06 +0200 |
commit | e52883d77d48d9499eb6ebdec4ca869f19c5d0da (patch) | |
tree | 143a31025382ee7bb91b055cc1a08a8cff5f2964 /src/gui/image/qimagereader.cpp | |
parent | e55f6f0e01d1374d6f0c721da4ec80a673ea4402 (diff) |
QImageReader: use QFile::open return value
The code was already OK because it used QFile::isOpen to check
if open() succeeded or not. In preparation for making open()
[[nodiscard]], refactor the code to just use its return value.
Change-Id: Ibab86ca894103f01ff3b6084caedb3117ffb6c7e
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/gui/image/qimagereader.cpp')
-rw-r--r-- | src/gui/image/qimagereader.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/gui/image/qimagereader.cpp b/src/gui/image/qimagereader.cpp index 4a5bd6136b..9366e9cbb1 100644 --- a/src/gui/image/qimagereader.cpp +++ b/src/gui/image/qimagereader.cpp @@ -529,14 +529,15 @@ bool QImageReaderPrivate::initHandler() int currentExtension = 0; QString fileName = file->fileName(); + bool fileIsOpen; do { file->setFileName(fileName + u'.' + QLatin1StringView(extensions.at(currentExtension++).constData())); - file->open(QIODevice::ReadOnly); - } while (!file->isOpen() && currentExtension < extensions.size()); + fileIsOpen = file->open(QIODevice::ReadOnly); + } while (!fileIsOpen && currentExtension < extensions.size()); - if (!device->isOpen()) { + if (!fileIsOpen) { imageReaderError = QImageReader::FileNotFoundError; errorString = QImageReader::tr("File not found"); file->setFileName(fileName); // restore the old file name |