* 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 330df317a1dd70904da45f327ab0121742b3ad9b..280525be7a6a0049386e8a00b149a53a3b0f99f9 100644 (file)
--- a/src/support/filename.C
+++ b/src/support/filename.C
@@ -14,6 +14,9 @@
 #include "support/filetools.h"
 #include "support/lstrings.h"
 #include "support/os.h"
+#include "support/qstring_helpers.h"
+
+#include <QFile>
 
 #include <boost/assert.hpp>
 
@@ -41,7 +44,7 @@ FileName::~FileName()
 FileName::FileName(string const & abs_filename)
        : name_(abs_filename)
 {
-       BOOST_ASSERT(absolutePath(name_));
+       BOOST_ASSERT(empty() || absolutePath(name_));
        BOOST_ASSERT(!contains(name_, '\\'));
 }
 
@@ -62,8 +65,15 @@ void FileName::erase()
 
 string const FileName::toFilesystemEncoding() const
 {
-       // FIXME UNICODE: correct encoding not implemented yet
-       return name_;
+       QByteArray const encoded = QFile::encodeName(toqstr(name_));
+       return string(encoded.begin(), encoded.end());
+}
+
+
+FileName const FileName::fromFilesystemEncoding(string const & name)
+{
+       QByteArray const encoded(name.c_str(), name.length());
+       return FileName(fromqstr(QFile::decodeName(encoded)));
 }
 
 
@@ -107,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;
 }