summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/corelib/io/qfile.cpp12
-rw-r--r--src/corelib/io/qfile_p.h4
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<QFSFileEngine>();
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<QFSFileEngine>();
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;