diff options
| -rw-r--r-- | src/corelib/io/qfileinfo.cpp | 22 | ||||
| -rw-r--r-- | src/corelib/io/qfileinfo.h | 8 |
2 files changed, 5 insertions, 25 deletions
diff --git a/src/corelib/io/qfileinfo.cpp b/src/corelib/io/qfileinfo.cpp index baac3117ea..ee232f0f14 100644 --- a/src/corelib/io/qfileinfo.cpp +++ b/src/corelib/io/qfileinfo.cpp @@ -1364,20 +1364,6 @@ QDateTime QFileInfo::lastRead() const } /*! - \enum QFileInfo::FileTime - \since 5.10 - - This enum is used by the fileTime() function. - - \value FileCreationTime When the file was created (not supported on UNIX). - \value FileModificationTime When the file was most recently modified. - \value FileAccessTime When the file was most recently accessed (e.g. - read or written to). - - \sa fileTime() -*/ - -/*! \since 5.10 Returns the file time specified by \a time. If the time cannot be determined return QDateTime() (an invalid @@ -1385,16 +1371,16 @@ QDateTime QFileInfo::lastRead() const \sa FileTime, QDateTime::isValid() */ -QDateTime QFileInfo::fileTime(QFileInfo::FileTime time) const +QDateTime QFileInfo::fileTime(QFile::FileTime time) const { switch (time) { - case QFileInfo::FileCreationTime: + case QFile::FileCreationTime: return created(); - case QFileInfo::FileModificationTime: + case QFile::FileModificationTime: return lastModified(); - case QFileInfo::FileAccessTime: + case QFile::FileAccessTime: return lastRead(); default: diff --git a/src/corelib/io/qfileinfo.h b/src/corelib/io/qfileinfo.h index d212b6dac2..514094873a 100644 --- a/src/corelib/io/qfileinfo.h +++ b/src/corelib/io/qfileinfo.h @@ -57,12 +57,6 @@ class Q_CORE_EXPORT QFileInfo { friend class QDirIteratorPrivate; public: - enum FileTime { - FileCreationTime, - FileModificationTime, - FileAccessTime - }; - explicit QFileInfo(QFileInfoPrivate *d); QFileInfo(); @@ -138,7 +132,7 @@ public: QDateTime created() const; QDateTime lastModified() const; QDateTime lastRead() const; - QDateTime fileTime(QFileInfo::FileTime time) const; + QDateTime fileTime(QFile::FileTime time) const; bool caching() const; void setCaching(bool on); |