Refactor computing hashes.

[lyx.git] / src / support / FileName.cpp

diff --git a/src/support/FileName.cpp b/src/support/FileName.cpp
index 5295741e1abc9faafc404695d73356edcc6583ff..5d70dd2b6c73798fc4e3b26f7f28acc00301359e 100644 (file)
--- a/src/support/FileName.cpp
+++ b/src/support/FileName.cpp
@@ -22,7 +22,6 @@
 #include "support/Package.h"
 #include "support/qstring_helpers.h"
 
-#include <QCryptographicHash>
 #include <QDateTime>
 #include <QDir>
 #include <QFile>
@@ -519,7 +518,12 @@ time_t FileName::lastModified() const
        // been touched between the object creation and now, we refresh the file
        // information.
        d->refresh();
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0))
+       return d->fi.lastModified().toSecsSinceEpoch();
+#else
        return d->fi.lastModified().toTime_t();
+#endif
+       
 }
 
 
@@ -969,17 +973,8 @@ string DocFileName::mangledFileName(string const & dir, bool use_counter, bool e
        // Now the real work. Remove the extension.
        string mname = support::changeExtension(name, string());
 
-       if (encrypt_path) {
-               QString qname = toqstr(mname);
-#if QT_VERSION >= 0x050000
-               QByteArray hash  = QCryptographicHash::hash(qname.toLocal8Bit(),QCryptographicHash::Sha256);
-#else
-               QByteArray hash  = QCryptographicHash::hash(qname.toLocal8Bit(),QCryptographicHash::Sha1);
-#endif
-               hash = hash.toHex();
-               mname = fromqstr(QString(hash));
-               mname = mname + "_" + onlyFileName();
-               }
+       if (encrypt_path)
+               mname = "export_" + onlyFileName() + "_" + toHexHash(mname);
 
        // The mangled name must be a valid LaTeX name.
        // The list of characters to keep is probably over-restrictive,