* src/text2.C: deleteEmptyParagraphMechanism(): fix a crash in

[lyx.git] / src / support / filename.C

diff --git a/src/support/filename.C b/src/support/filename.C
index 3d88f0bc77ec8871fca8f1d53567570c1fae4206..280525be7a6a0049386e8a00b149a53a3b0f99f9 100644 (file)
--- a/src/support/filename.C
+++ b/src/support/filename.C
@@ -16,7 +16,7 @@
 #include "support/os.h"
 #include "support/qstring_helpers.h"
 
-#include <QtCore/QFile>
+#include <QFile>
 
 #include <boost/assert.hpp>
 
@@ -70,6 +70,13 @@ string const FileName::toFilesystemEncoding() const
 }
 
 
+FileName const FileName::fromFilesystemEncoding(string const & name)
+{
+       QByteArray const encoded(name.c_str(), name.length());
+       return FileName(fromqstr(QFile::decodeName(encoded)));
+}
+
+
 bool operator==(FileName const & lhs, FileName const & rhs)
 {
        return lhs.absFilename() == rhs.absFilename();
@@ -110,10 +117,15 @@ DocFileName::DocFileName(string const & abs_filename, bool save_abs)
 {}
 
 
+DocFileName::DocFileName(FileName const & abs_filename, bool save_abs)
+       : FileName(abs_filename), save_abs_path_(save_abs), zipped_valid_(false)
+{}
+
+
 void DocFileName::set(string const & name, string const & buffer_path)
 {
        save_abs_path_ = absolutePath(name);
-       name_ = save_abs_path_ ? name : makeAbsPath(name, buffer_path);
+       name_ = save_abs_path_ ? name : makeAbsPath(name, buffer_path).absFilename();
        zipped_valid_ = false;
 }