From 536a4ab07988ccf52e071c5ab831069084b0cb71 Mon Sep 17 00:00:00 2001 From: Giuseppe D'Angelo Date: Sun, 2 May 2021 02:55:55 +0200 Subject: [PATCH] QFile: code tidies There's no need of converting a QFlags to int in openExternalFile's signature; just use the flag. Also, avoid an implicit QFlags->bool conversion by using testAnyFlag. Change-Id: Ia2d560bce235c842745d8a6a5fb5d8ac0851fc47 Reviewed-by: Thiago Macieira --- src/corelib/io/qfile.cpp | 12 ++++++------ src/corelib/io/qfile_p.h | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/corelib/io/qfile.cpp b/src/corelib/io/qfile.cpp index 223745b73c..07b40527cb 100644 --- a/src/corelib/io/qfile.cpp +++ b/src/corelib/io/qfile.cpp @@ -78,7 +78,7 @@ QFilePrivate::~QFilePrivate() } bool -QFilePrivate::openExternalFile(int flags, int fd, QFile::FileHandleFlags handleFlags) +QFilePrivate::openExternalFile(QIODevice::OpenMode flags, int fd, QFile::FileHandleFlags handleFlags) { #ifdef QT_NO_FSFILEENGINE Q_UNUSED(flags); @@ -88,12 +88,12 @@ QFilePrivate::openExternalFile(int flags, int fd, QFile::FileHandleFlags handleF auto fs = std::make_unique(); auto fe = fs.get(); fileEngine = std::move(fs); - return fe->open(QIODevice::OpenMode(flags), fd, handleFlags); + return fe->open(flags, fd, handleFlags); #endif } bool -QFilePrivate::openExternalFile(int flags, FILE *fh, QFile::FileHandleFlags handleFlags) +QFilePrivate::openExternalFile(QIODevice::OpenMode flags, FILE *fh, QFile::FileHandleFlags handleFlags) { #ifdef QT_NO_FSFILEENGINE Q_UNUSED(flags); @@ -103,7 +103,7 @@ QFilePrivate::openExternalFile(int flags, FILE *fh, QFile::FileHandleFlags handl auto fs = std::make_unique(); auto fe = fs.get(); fileEngine = std::move(fs); - return fe->open(QIODevice::OpenMode(flags), fh, handleFlags); + return fe->open(flags, fh, handleFlags); #endif } @@ -377,8 +377,8 @@ QFile::exists() const { Q_D(const QFile); // 0x1000000 = QAbstractFileEngine::Refresh, forcing an update - return (d->engine()->fileFlags(QAbstractFileEngine::FlagsMask - | QAbstractFileEngine::Refresh) & QAbstractFileEngine::ExistsFlag); + return d->engine()->fileFlags(QAbstractFileEngine::FlagsMask + | QAbstractFileEngine::Refresh).testAnyFlag(QAbstractFileEngine::ExistsFlag); } /*! diff --git a/src/corelib/io/qfile_p.h b/src/corelib/io/qfile_p.h index 545890c6b3..d866b8e8a2 100644 --- a/src/corelib/io/qfile_p.h +++ b/src/corelib/io/qfile_p.h @@ -67,8 +67,8 @@ protected: QFilePrivate(); ~QFilePrivate(); - bool openExternalFile(int flags, int fd, QFile::FileHandleFlags handleFlags); - bool openExternalFile(int flags, FILE *fh, QFile::FileHandleFlags handleFlags); + bool openExternalFile(QIODevice::OpenMode flags, int fd, QFile::FileHandleFlags handleFlags); + bool openExternalFile(QIODevice::OpenMode flags, FILE *fh, QFile::FileHandleFlags handleFlags); QAbstractFileEngine *engine() const override;