From dacc75de299ee3d1a85daed0f6b9f46109f89e81 Mon Sep 17 00:00:00 2001 From: Ahmad Samir Date: Fri, 7 Jul 2023 19:00:40 +0300 Subject: [PATCH] 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 Change-Id: I120befcbab2afbfe5894bfffe6a2d882d8efd250 Reviewed-by: Marc Mutz (cherry picked from commit 71d9ebfb1f9924b81b431150c9722b683150769b) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/io/qfileinfo.h | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/src/corelib/io/qfileinfo.h b/src/corelib/io/qfileinfo.h index 435fba5497e..15a119cb142 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);