Don't use a global variable for avoiding removal of the system temp dir

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

diff --git a/src/support/filename.C b/src/support/filename.C
index 63c15df3fec9f87b9a2a04174bb877a42fa8a59a..8b8a4aee57b8b5d0a0185a8c22f3cf56f338f596 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>
 
@@ -34,10 +37,36 @@ FileName::FileName()
 {}
 
 
+FileName::~FileName()
+{}
+
+
 FileName::FileName(string const & abs_filename)
        : name_(abs_filename)
 {
+       BOOST_ASSERT(empty() || absolutePath(name_));
+       BOOST_ASSERT(!contains(name_, '\\'));
+}
+
+
+void FileName::set(string const & name)
+{
+       name_ = name;
        BOOST_ASSERT(absolutePath(name_));
+       BOOST_ASSERT(!contains(name_, '\\'));
+}
+
+
+void FileName::erase()
+{
+       name_.erase();
+}
+
+
+string const FileName::toFilesystemEncoding() const
+{
+       QByteArray const encoded = QFile::encodeName(toqstr(name_));
+       return string(encoded.begin(), encoded.end());
 }
 
 
@@ -53,6 +82,24 @@ bool operator!=(FileName const & lhs, FileName const & rhs)
 }
 
 
+bool operator<(FileName const & lhs, FileName const & rhs)
+{
+       return lhs.absFilename() < rhs.absFilename();
+}
+
+
+bool operator>(FileName const & lhs, FileName const & rhs)
+{
+       return lhs.absFilename() > rhs.absFilename();
+}
+
+
+std::ostream & operator<<(std::ostream & os, FileName const & filename)
+{
+       return os << filename.absFilename();
+}
+
+
 DocFileName::DocFileName()
        : save_abs_path_(true)
 {}
@@ -149,7 +196,7 @@ string const DocFileName::mangledFilename(std::string const & dir) const
 bool DocFileName::isZipped() const
 {
        if (!zipped_valid_) {
-               zipped_ = zippedFile(name_);
+               zipped_ = zippedFile(*this);
                zipped_valid_ = true;
        }
        return zipped_;