From d38122f4a2698038958f3a1c4654d8eba20bff95 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Sun, 2 Jul 2017 00:25:16 -0700
Subject: Rewrite QFileInfo::{created,lastModified,lastRead} using fileTime()

Better code reusal.

Change-Id: I8d96dea9955d4c749b99fffd14cd72a7f4e040c9
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
---
 src/corelib/io/qfileinfo.cpp | 66 ++++++++++++++++++--------------------------
 src/corelib/io/qfileinfo.h   |  1 +
 2 files changed, 28 insertions(+), 39 deletions(-)

(limited to 'src')

diff --git a/src/corelib/io/qfileinfo.cpp b/src/corelib/io/qfileinfo.cpp
index ee232f0f14..f7358d61b3 100644
--- a/src/corelib/io/qfileinfo.cpp
+++ b/src/corelib/io/qfileinfo.cpp
@@ -1310,16 +1310,7 @@ qint64 QFileInfo::size() const
 */
 QDateTime QFileInfo::created() const
 {
-    Q_D(const QFileInfo);
-    if (d->isDefaultConstructed)
-        return QDateTime();
-    if (d->fileEngine == 0) {
-        if (!d->cache_enabled || !d->metaData.hasFlags(QFileSystemMetaData::CreationTime))
-            if (!QFileSystemEngine::fillMetaData(d->fileEntry, d->metaData, QFileSystemMetaData::CreationTime))
-                return QDateTime();
-        return d->metaData.creationTime().toLocalTime();
-    }
-    return d->getFileTime(QAbstractFileEngine::CreationTime).toLocalTime();
+    return fileTime(QFile::FileCreationTime);
 }
 
 /*!
@@ -1329,16 +1320,7 @@ QDateTime QFileInfo::created() const
 */
 QDateTime QFileInfo::lastModified() const
 {
-    Q_D(const QFileInfo);
-    if (d->isDefaultConstructed)
-        return QDateTime();
-    if (d->fileEngine == 0) {
-        if (!d->cache_enabled || !d->metaData.hasFlags(QFileSystemMetaData::ModificationTime))
-            if (!QFileSystemEngine::fillMetaData(d->fileEntry, d->metaData, QFileSystemMetaData::ModificationTime))
-                return QDateTime();
-        return d->metaData.modificationTime().toLocalTime();
-    }
-    return d->getFileTime(QAbstractFileEngine::ModificationTime).toLocalTime();
+    return fileTime(QFile::FileModificationTime);
 }
 
 /*!
@@ -1351,16 +1333,7 @@ QDateTime QFileInfo::lastModified() const
 */
 QDateTime QFileInfo::lastRead() const
 {
-    Q_D(const QFileInfo);
-    if (d->isDefaultConstructed)
-        return QDateTime();
-    if (d->fileEngine == 0) {
-        if (!d->cache_enabled || !d->metaData.hasFlags(QFileSystemMetaData::AccessTime))
-            if (!QFileSystemEngine::fillMetaData(d->fileEntry, d->metaData, QFileSystemMetaData::AccessTime))
-                return QDateTime();
-        return d->metaData.accessTime().toLocalTime();
-    }
-    return d->getFileTime(QAbstractFileEngine::AccessTime).toLocalTime();
+    return fileTime(QFile::FileAccessTime);
 }
 
 /*!
@@ -1373,19 +1346,34 @@ QDateTime QFileInfo::lastRead() const
 */
 QDateTime QFileInfo::fileTime(QFile::FileTime time) const
 {
-    switch (time) {
-    case QFile::FileCreationTime:
-        return created();
+    Q_STATIC_ASSERT(int(QFile::FileAccessTime) == int(QAbstractFileEngine::AccessTime));
+    Q_STATIC_ASSERT(int(QFile::FileCreationTime) == int(QAbstractFileEngine::CreationTime));
+    Q_STATIC_ASSERT(int(QFile::FileModificationTime) == int(QAbstractFileEngine::ModificationTime));
 
-    case QFile::FileModificationTime:
-        return lastModified();
+    Q_D(const QFileInfo);
+    auto fetime = QAbstractFileEngine::FileTime(time);
+    if (d->isDefaultConstructed)
+        return QDateTime();
+    if (d->fileEngine)
+        return d->getFileTime(fetime).toLocalTime();
 
+    QFileSystemMetaData::MetaDataFlags flag;
+    switch (time) {
     case QFile::FileAccessTime:
-        return lastRead();
-
-    default:
-        Q_UNREACHABLE();
+        flag = QFileSystemMetaData::AccessTime;
+        break;
+    case QFile::FileCreationTime:
+        flag = QFileSystemMetaData::CreationTime;
+        break;
+    case QFile::FileModificationTime:
+        flag = QFileSystemMetaData::ModificationTime;
+        break;
     }
+
+    if (!d->cache_enabled || !d->metaData.hasFlags(flag))
+        if (!QFileSystemEngine::fillMetaData(d->fileEntry, d->metaData, flag))
+            return QDateTime();
+    return d->metaData.fileTime(fetime).toLocalTime();
 }
 
 /*!
diff --git a/src/corelib/io/qfileinfo.h b/src/corelib/io/qfileinfo.h
index 514094873a..845fdefac7 100644
--- a/src/corelib/io/qfileinfo.h
+++ b/src/corelib/io/qfileinfo.h
@@ -129,6 +129,7 @@ public:
 
     qint64 size() const;
 
+    // ### Qt6: inline these functions
     QDateTime created() const;
     QDateTime lastModified() const;
     QDateTime lastRead() const;
-- 
cgit v1.2.3