summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAhmad Samir <a.samirh78@gmail.com>2023-07-07 19:00:40 +0300
committerMarc Mutz <marc.mutz@qt.io>2023-07-07 16:15:54 +0000
commit71d9ebfb1f9924b81b431150c9722b683150769b (patch)
tree7404e7488c9375e4c28e5ee0e72079dfac48ccaf
parent508629522d8c6580161a2fd9bfd2fe26f6c4c034 (diff)
QFileInfo: keep member function overloads in Qt7 too
The goal is to use overloading instead of default args that are non-trivial. Task-number: QTBUG-98117 Pick-to: 6.6 Change-Id: I120befcbab2afbfe5894bfffe6a2d882d8efd250 Reviewed-by: Marc Mutz <marc.mutz@qt.io>
-rw-r--r--src/corelib/io/qfileinfo.h20
1 files changed, 0 insertions, 20 deletions
diff --git a/src/corelib/io/qfileinfo.h b/src/corelib/io/qfileinfo.h
index 435fba5497..15a119cb14 100644
--- a/src/corelib/io/qfileinfo.h
+++ b/src/corelib/io/qfileinfo.h
@@ -151,7 +151,6 @@ public:
qint64 size() const;
-#if QT_VERSION < QT_VERSION_CHECK(7, 0, 0) && !defined(QT_BOOTSTRAPPED)
QDateTime birthTime() const { return fileTime(QFile::FileBirthTime); }
QDateTime metadataChangeTime() const { return fileTime(QFile::FileMetadataChangeTime); }
QDateTime lastModified() const { return fileTime(QFile::FileModificationTime); }
@@ -163,25 +162,6 @@ public:
QDateTime lastModified(const QTimeZone &tz) const { return fileTime(QFile::FileModificationTime, tz); }
QDateTime lastRead(const QTimeZone &tz) const { return fileTime(QFile::FileAccessTime, tz); }
QDateTime fileTime(QFile::FileTime time, const QTimeZone &tz) const;
-#else
- QDateTime birthTime(const QTimeZone &tz = QTimeZone::LocalTime) const
- {
- return fileTime(QFile::FileBirthTime, tz);
- }
- QDateTime metadataChangeTime(const QTimeZone &tz = QTimeZone::LocalTime) const
- {
- return fileTime(QFile::FileMetadataChangeTime, tz);
- }
- QDateTime lastModified(const QTimeZone &tz = QTimeZone::LocalTime) const
- {
- return fileTime(QFile::FileModificationTime, tz);
- }
- QDateTime lastRead(const QTimeZone &tz = QTimeZone::LocalTime) const
- {
- return fileTime(QFile::FileAccessTime, tz);
- }
- QDateTime fileTime(QFile::FileTime time, const QTimeZone &tz = QTimeZone::LocalTime) const;
-#endif
bool caching() const;
void setCaching(bool on);