diff options
author | Ahmad Samir <a.samirh78@gmail.com> | 2024-04-17 02:08:48 +0200 |
---|---|---|
committer | Ahmad Samir <a.samirh78@gmail.com> | 2024-04-20 04:29:31 +0200 |
commit | df6b74f4617bf0ba14420ed15fcc5866cccfb7d0 (patch) | |
tree | 42eb97c82d52e266888fcb7b5e2dba623215c662 /src/corelib/io/qfsfileengine_p.h | |
parent | d691872b865c735f9d35886388c89f7ace7df5c8 (diff) |
QFSFileEngine: update d->fileEntry after a successful rename
Otherwise member methods such as size() could return incorrect info.
Add setFileEntry(QFileSystemEntry &&); to reuse a QFileSystemEntry if we
have already constructed one.
As a result of this, a QTemporaryFileEngine::setFileName() call has
become redundant and can be removed; the code it executed is already
taken care of:
- QFSFileEngine::close(): already called by QTFEngine::rename() a couple
of lines above
- QFSFileEngine::setFileName(): QTFEngine::rename() calls
QFSFileEngine::rename() which in turn updates the `fileEntry`
This commit is covered by tst_QTemporaryFile::rename(), i.e. if
QFSFileEngine::rename() didn't update the fileEntry, that test would
fail.
Change-Id: I312f35cf7fdf9b1a8cd0bce5e98ba7a48cf9426e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/io/qfsfileengine_p.h')
-rw-r--r-- | src/corelib/io/qfsfileengine_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/io/qfsfileengine_p.h b/src/corelib/io/qfsfileengine_p.h index 231ad9020a..dfc40e20b6 100644 --- a/src/corelib/io/qfsfileengine_p.h +++ b/src/corelib/io/qfsfileengine_p.h @@ -83,6 +83,7 @@ public: bool setFileTime(const QDateTime &newDate, QFile::FileTime time) override; QDateTime fileTime(QFile::FileTime time) const override; void setFileName(const QString &file) override; + void setFileEntry(QFileSystemEntry &&entry); int handle() const override; #ifndef QT_NO_FILESYSTEMITERATOR @@ -160,7 +161,7 @@ public: bool isSequentialFdFh() const; #endif #ifdef Q_OS_WIN - bool nativeRenameOverwrite(const QString &newName); + bool nativeRenameOverwrite(const QFileSystemEntry &newEntry); #endif uchar *map(qint64 offset, qint64 size, QFile::MemoryMapFlags flags); |