diff options
| author | Thorbjørn Lindeijer <bjorn@lindeijer.nl> | 2019-11-12 10:46:26 +0100 |
|---|---|---|
| committer | Thorbjørn Lindeijer <bjorn@lindeijer.nl> | 2020-10-01 04:56:31 +0200 |
| commit | 77ae1b6b3e9962a0537a427c53b0c4555205c475 (patch) | |
| tree | 5a2edffb83715a373240514fb97813210a1bbdc0 /src/corelib/io | |
| parent | 0f8848b7e25e4d8fb9265ff6e0aa31946addd741 (diff) | |
QFileInfo: Allow constructing from QFileDevice
Also allow QFileDevice argument to QFileInfo::setFile.
This parameter change allows conveniently constructing a QFileInfo from
a QSaveFile, in addition to QFile.
Change-Id: I71244cb79b1cf92425eaff0e6de13524de562e0f
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/io')
| -rw-r--r-- | src/corelib/io/qfileinfo.cpp | 4 | ||||
| -rw-r--r-- | src/corelib/io/qfileinfo.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/io/qfileinfo.cpp b/src/corelib/io/qfileinfo.cpp index 3e6032785f..7e1e62a775 100644 --- a/src/corelib/io/qfileinfo.cpp +++ b/src/corelib/io/qfileinfo.cpp @@ -359,7 +359,7 @@ QFileInfo::QFileInfo(const QString &file) : d_ptr(new QFileInfoPrivate(file)) \sa isRelative() */ -QFileInfo::QFileInfo(const QFile &file) : d_ptr(new QFileInfoPrivate(file.fileName())) +QFileInfo::QFileInfo(const QFileDevice &file) : d_ptr(new QFileInfoPrivate(file.fileName())) { } @@ -502,7 +502,7 @@ void QFileInfo::setFile(const QString &file) \sa isRelative() */ -void QFileInfo::setFile(const QFile &file) +void QFileInfo::setFile(const QFileDevice &file) { setFile(file.fileName()); } diff --git a/src/corelib/io/qfileinfo.h b/src/corelib/io/qfileinfo.h index 73098d2a85..e578848be0 100644 --- a/src/corelib/io/qfileinfo.h +++ b/src/corelib/io/qfileinfo.h @@ -61,7 +61,7 @@ public: QFileInfo(); QFileInfo(const QString &file); - QFileInfo(const QFile &file); + QFileInfo(const QFileDevice &file); QFileInfo(const QDir &dir, const QString &file); QFileInfo(const QFileInfo &fileinfo); #ifdef Q_CLANG_QDOC @@ -88,7 +88,7 @@ public: inline bool operator!=(const QFileInfo &fileinfo) const { return !(operator==(fileinfo)); } void setFile(const QString &file); - void setFile(const QFile &file); + void setFile(const QFileDevice &file); void setFile(const QDir &dir, const QString &file); #ifdef Q_CLANG_QDOC void setFile(const std::filesystem::path &file); |