1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QFileInfo: use QFile::FileTime instead of our own enum

Browse Source 
No need to duplicate the enum in two places.

Change-Id: I8d96dea9955d4c749b99fffd14cd6f887dd48a71
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
This commit is contained in:
Thiago Macieira 2017-07-01 23:28:02 -07:00
parent 48e35e06ca
commit 11975fc9ec
2 changed files with 5 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/corelib/io/qfileinfo.cpp
View File

@ -1363,20 +1363,6 @@ QDateTime QFileInfo::lastRead() const
return d->getFileTime(QAbstractFileEngine::AccessTime).toLocalTime(); return d->getFileTime(QAbstractFileEngine::AccessTime).toLocalTime();
} }
/*!
\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 \since 5.10
Returns the file time specified by \a time. Returns the file time specified by \a time.
@ -1385,16 +1371,16 @@ QDateTime QFileInfo::lastRead() const
\sa FileTime, QDateTime::isValid() \sa FileTime, QDateTime::isValid()
*/ */
QDateTime QFileInfo::fileTime(QFileInfo::FileTime time) const QDateTime QFileInfo::fileTime(QFile::FileTime time) const
{ {
switch (time) { switch (time) {
case QFileInfo::FileCreationTime: case QFile::FileCreationTime:
return created(); return created();
case QFileInfo::FileModificationTime: case QFile::FileModificationTime:
return lastModified(); return lastModified();
case QFileInfo::FileAccessTime: case QFile::FileAccessTime:
return lastRead(); return lastRead();
default: default:

8
src/corelib/io/qfileinfo.h
View File

@ -57,12 +57,6 @@ class Q_CORE_EXPORT QFileInfo
{ {
friend class QDirIteratorPrivate; friend class QDirIteratorPrivate;
public: public:
enum FileTime {
FileCreationTime,
FileModificationTime,
FileAccessTime
};
explicit QFileInfo(QFileInfoPrivate *d); explicit QFileInfo(QFileInfoPrivate *d);
QFileInfo(); QFileInfo();
@ -138,7 +132,7 @@ public:
QDateTime created() const; QDateTime created() const;
QDateTime lastModified() const; QDateTime lastModified() const;
QDateTime lastRead() const; QDateTime lastRead() const;
QDateTime fileTime(QFileInfo::FileTime time) const; QDateTime fileTime(QFile::FileTime time) const;
bool caching() const; bool caching() const;
void setCaching(bool on); void setCaching(bool on);