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

QFile: code tidies

Browse Source 
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 <thiago.macieira@intel.com>
This commit is contained in:
Giuseppe D'Angelo 2021-05-02 02:55:55 +02:00
parent af38f72e13
commit 536a4ab079
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/corelib/io/qfile.cpp
View File

@ -78,7 +78,7 @@ QFilePrivate::~QFilePrivate()
} }
bool bool
QFilePrivate::openExternalFile(int flags, int fd, QFile::FileHandleFlags handleFlags) QFilePrivate::openExternalFile(QIODevice::OpenMode flags, int fd, QFile::FileHandleFlags handleFlags)
{ {
#ifdef QT_NO_FSFILEENGINE #ifdef QT_NO_FSFILEENGINE
Q_UNUSED(flags); Q_UNUSED(flags);
@ -88,12 +88,12 @@ QFilePrivate::openExternalFile(int flags, int fd, QFile::FileHandleFlags handleF
auto fs = std::make_unique<QFSFileEngine>(); auto fs = std::make_unique<QFSFileEngine>();
auto fe = fs.get(); auto fe = fs.get();
fileEngine = std::move(fs); fileEngine = std::move(fs);
return fe->open(QIODevice::OpenMode(flags), fd, handleFlags); return fe->open(flags, fd, handleFlags);
#endif #endif
} }
bool bool
QFilePrivate::openExternalFile(int flags, FILE *fh, QFile::FileHandleFlags handleFlags) QFilePrivate::openExternalFile(QIODevice::OpenMode flags, FILE *fh, QFile::FileHandleFlags handleFlags)
{ {
#ifdef QT_NO_FSFILEENGINE #ifdef QT_NO_FSFILEENGINE
Q_UNUSED(flags); Q_UNUSED(flags);
@ -103,7 +103,7 @@ QFilePrivate::openExternalFile(int flags, FILE *fh, QFile::FileHandleFlags handl
auto fs = std::make_unique<QFSFileEngine>(); auto fs = std::make_unique<QFSFileEngine>();
auto fe = fs.get(); auto fe = fs.get();
fileEngine = std::move(fs); fileEngine = std::move(fs);
return fe->open(QIODevice::OpenMode(flags), fh, handleFlags); return fe->open(flags, fh, handleFlags);
#endif #endif
} }
@ -377,8 +377,8 @@ QFile::exists() const
{ {
Q_D(const QFile); Q_D(const QFile);
// 0x1000000 = QAbstractFileEngine::Refresh, forcing an update // 0x1000000 = QAbstractFileEngine::Refresh, forcing an update
return (d->engine()->fileFlags(QAbstractFileEngine::FlagsMask return d->engine()->fileFlags(QAbstractFileEngine::FlagsMask
| QAbstractFileEngine::Refresh) & QAbstractFileEngine::ExistsFlag); | QAbstractFileEngine::Refresh).testAnyFlag(QAbstractFileEngine::ExistsFlag);
} }
/*! /*!

4
src/corelib/io/qfile_p.h
View File

@ -67,8 +67,8 @@ protected:
QFilePrivate(); QFilePrivate();
~QFilePrivate(); ~QFilePrivate();
bool openExternalFile(int flags, int fd, QFile::FileHandleFlags handleFlags); bool openExternalFile(QIODevice::OpenMode flags, int fd, QFile::FileHandleFlags handleFlags);
bool openExternalFile(int flags, FILE *fh, QFile::FileHandleFlags handleFlags); bool openExternalFile(QIODevice::OpenMode flags, FILE *fh, QFile::FileHandleFlags handleFlags);
QAbstractFileEngine *engine() const override; QAbstractFileEngine *engine() const override;