[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdiff3] src: make FileAccess::lastModified truely const
From:       Michael Reeves <null () kde ! org>
Date:       2018-09-03 15:05:00
Message-ID: E1fwqPU-0004Nv-AM () code ! kde ! org
[Download RAW message or body]

Git commit 9d8fc328d2b73dafb85cf60718c7ec81028c9d7c by Michael Reeves.
Committed on 02/09/2018 at 17:46.
Pushed by mreeves into branch 'master'.

make FileAccess::lastModified truely const

M  +5    -3    src/fileaccess.cpp
M  +1    -3    src/fileaccess.h

https://commits.kde.org/kdiff3/9d8fc328d2b73dafb85cf60718c7ec81028c9d7c

diff --git a/src/fileaccess.cpp b/src/fileaccess.cpp
index a19ee8b..5eb6aee 100644
--- a/src/fileaccess.cpp
+++ b/src/fileaccess.cpp
@@ -373,7 +373,10 @@ void FileAccess::setUdsEntry(const KIO::UDSEntry& e)
     }
 
     m_bExists = acc != 0 || fileType != 0;
-    
+    //insure modifcation time is initialized if it wasn't already.
+    if(m_modificationTime.isNull())
+        m_modificationTime = m_fileInfo.lastModified();
+
     d()->m_bValidData = true;
     m_bSymLink = !d()->m_linkTarget.isEmpty();
     if(d()->m_name.isEmpty())
@@ -569,8 +572,7 @@ QDateTime FileAccess::created() const
 
 QDateTime FileAccess::lastModified() const
 {
-    if(isLocal() && m_modificationTime.isNull())
-        const_cast<FileAccess*>(this)->m_modificationTime = \
QFileInfo(absoluteFilePath()).lastModified(); +    \
Q_ASSERT(!m_modificationTime.isNull());  return m_modificationTime;
 }
 
diff --git a/src/fileaccess.h b/src/fileaccess.h
index 9d94e98..49d42ab 100644
--- a/src/fileaccess.h
+++ b/src/fileaccess.h
@@ -59,9 +59,7 @@ public:
    bool isHidden() const;
    QString readLink() const;
 
-   //QDateTime   created()       const;
-   QDateTime   lastModified()  const;
-   //QDateTime   lastRead()      const;
+   QDateTime lastModified() const;
 
    QString fileName() const; // Just the name-part of the path, without parent \
directories  QString filePath() const; // The path-string that was used during \
construction


[prev in list] [next in list] [prev in thread] [next in thread]