Let paragraph::requestSpellcheck() consider contained insets

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

diff --git a/src/support/FileName.cpp b/src/support/FileName.cpp
index 1c8cc2c92a220621ef7fc38d3736c22903245535..8ad7e00fa0f3cbc196b53b6c983c17e739d8b7d6 100644 (file)
--- a/src/support/FileName.cpp
+++ b/src/support/FileName.cpp
@@ -28,13 +28,13 @@
 #include <QFileInfo>
 #include <QList>
 #include <QTemporaryFile>
-#include <QTime>
+#include <QElapsedTimer>
 
 #ifdef _WIN32
 #include <QThread>
 #endif
 
-#include <boost/crc.hpp>
+#include "support/checksum.h"
 
 #include <algorithm>
 #include <iterator>
@@ -88,7 +88,7 @@ struct FileName::Private
                : fi(toqstr(handleTildeName(abs_filename)))
        {
                name = fromqstr(fi.absoluteFilePath());
-               fi.setCaching(fi.exists() ? true : false);
+               fi.setCaching(fi.exists());
        }
        ///
        inline void refresh()
@@ -259,6 +259,7 @@ bool FileName::renameTo(FileName const & name) const
 {
        LYXERR(Debug::FILES, "Renaming " << name << " as " << *this);
        bool success = QFile::rename(d->fi.absoluteFilePath(), name.d->fi.absoluteFilePath());
+       d->refresh();
        if (!success)
                LYXERR0("Could not rename file " << *this << " to " << name);
        return success;
@@ -272,19 +273,21 @@ bool FileName::moveTo(FileName const & name) const
        // there's a locking problem on Windows sometimes, so
        // we will keep trying for five seconds, in the hope
        // that clears.
-       bool removed = QFile::remove(name.d->fi.absoluteFilePath());
-       int tries = 1;
-       while (!removed && tries < 6)   {
-               QThread::sleep(1);
-               removed = QFile::remove(name.d->fi.absoluteFilePath());
-               tries++;
+       name.refresh();
+       if (name.exists()) {
+               bool removed = name.removeFile();
+               int tries = 1;
+               while (!removed && tries < 6)   {
+                       QThread::sleep(1);
+                       removed = name.removeFile();
+                       tries++;
+               }
        }
 #else
        QFile::remove(name.d->fi.absoluteFilePath());
 #endif
 
-       bool const success = QFile::rename(d->fi.absoluteFilePath(),
-               name.d->fi.absoluteFilePath());
+       bool const success = renameTo(name);
        if (!success)
                LYXERR0("Could not move file " << *this << " to " << name);
        return success;
@@ -515,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
+       
 }
 
 
@@ -533,20 +541,14 @@ bool FileName::link(FileName const & name) const
 
 unsigned long checksum_ifstream_fallback(char const * file)
 {
-       unsigned long result = 0;
        //LYXERR(Debug::FILES, "lyx::sum() using istreambuf_iterator (fast)");
        ifstream ifs(file, ios_base::in | ios_base::binary);
        if (!ifs)
-               return result;
-
-       istreambuf_iterator<char> beg(ifs);
-       istreambuf_iterator<char> end;
-       boost::crc_32_type crc;
-       crc = for_each(beg, end, crc);
-       result = crc.checksum();
-       return result;
+               return 0;
+       return support::checksum(ifs);
 }
 
+
 unsigned long FileName::checksum() const
 {
        if (!exists()) {
@@ -560,7 +562,7 @@ unsigned long FileName::checksum() const
        }
 
        // This is used in the debug output at the end of the method.
-       static QTime t;
+       static QElapsedTimer t;
        if (lyxerr.debugging(Debug::FILES))
                t.restart();
 
@@ -579,11 +581,9 @@ unsigned long FileName::checksum() const
        qint64 size = fi.size();
        uchar * ubeg = qf.map(0, size);
        uchar * uend = ubeg + size;
-       boost::crc_32_type ucrc;
-       ucrc.process_block(ubeg, uend);
+       result = support::checksum(ubeg, uend);
        qf.unmap(ubeg);
        qf.close();
-       result = ucrc.checksum();
 
 #else // QT_VERSION
 
@@ -612,12 +612,10 @@ unsigned long FileName::checksum() const
                return 0;
        }
 
-       char * beg = static_cast<char*>(mm);
-       char * end = beg + info.st_size;
+       unsigned char * beg = static_cast<unsigned char*>(mm);
+       unsigned char * end = beg + info.st_size;
 
-       boost::crc_32_type crc;
-       crc.process_block(beg, end);
-       result = crc.checksum();
+       result = support::checksum(beg, end);
 
        munmap(mm, info.st_size);
        close(fd);
@@ -952,6 +950,11 @@ string DocFileName::outputFileName(string const & path) const
 
 
 string DocFileName::mangledFileName(string const & dir) const
+{
+       return mangledFileName(dir, true, false);
+}
+
+string DocFileName::mangledFileName(string const & dir, bool use_counter, bool encrypt_path) const
 {
        // Concurrent access to these variables is possible.
 
@@ -969,28 +972,24 @@ string DocFileName::mangledFileName(string const & dir) const
        string const name = absFileName();
        // Now the real work. Remove the extension.
        string mname = support::changeExtension(name, string());
+
+       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,
-       // but it is not really a problem.
-       // Apart from non-ASCII characters, at least the following characters
-       // are forbidden: '/', '.', ' ', and ':'.
-       // On windows it is not possible to create files with '<', '>' or '?'
-       // in the name.
-       static string const keep = "abcdefghijklmnopqrstuvwxyz"
-                                  "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-                                  "+-0123456789;=";
-       string::size_type pos = 0;
-       while ((pos = mname.find_first_not_of(keep, pos)) != string::npos)
-               mname[pos++] = '_';
+       mname = sanitizeFileName(mname);
        // Add the extension back on
        mname = support::changeExtension(mname, getExtension(name));
 
        // Prepend a counter to the filename. This is necessary to make
        // the mangled name unique.
        static int counter = 0;
-       ostringstream s;
-       s << counter++ << mname;
-       mname = s.str();
+
+       if (use_counter) {
+               ostringstream s;
+               s << counter++ << mname;
+               mname = s.str();
+       }
 
        // MiKTeX's YAP (version 2.4.1803) crashes if the file name
        // is longer than about 160 characters. MiKTeX's pdflatex