Fix layout bug. Pasting text into a cell tried to set Standard layout, because

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

diff --git a/src/support/FileName.cpp b/src/support/FileName.cpp
index ac1e376d928024e3f05518626ce33d46813d7bc6..5e1ae84b90b56b573637d6eaa6478b19a8a9e392 100644 (file)
--- a/src/support/FileName.cpp
+++ b/src/support/FileName.cpp
@@ -393,10 +393,7 @@ FileName FileName::tempName(FileName const & temp_dir, string const & mask)
 
 FileName FileName::tempName(string const & mask)
 {
-       QFileInfo tmp_fi(toqstr(mask));
-       if (!tmp_fi.isAbsolute())
-               tmp_fi.setFile(package().temp_dir().d->fi.absoluteDir(), toqstr(mask));
-       return FileName(createTempFile(tmp_fi.absoluteFilePath()));
+       return tempName(package().temp_dir(), mask);
 }
 
 
@@ -817,10 +814,11 @@ bool operator==(FileName const & lhs, FileName const & rhs)
        // This is supposed to be fixed for Qt5.
 
        if (lhs.empty())
+               // QFileInfo::operator==() returns false if the two QFileInfo are empty.
                return rhs.empty();
 
        if (rhs.empty())
-               // Avoid unnecessary checks.
+               // Avoid unnecessary checks below.
                return false;
 
        lhs.d->refresh();
@@ -829,6 +827,7 @@ bool operator==(FileName const & lhs, FileName const & rhs)
        if (!lhs.d->fi.isSymLink() && !rhs.d->fi.isSymLink())
                return lhs.d->fi == rhs.d->fi;
 
+       // FIXME: When/if QFileInfo support symlink comparison, remove this code.
        QFileInfo fi1(lhs.d->fi);
        if (fi1.isSymLink())
                fi1 = QFileInfo(fi1.symLinkTarget());