fix compiler warnings about unused parameter

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

diff --git a/src/support/filename.C b/src/support/filename.C
index 609c93b258691b0d89fecdf56519f4aa428e4ec8..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>
 
@@ -31,47 +34,124 @@ namespace support {
 
 
 FileName::FileName()
-       : save_abs_path_(true)
 {}
 
 
-FileName::FileName(string const & abs_filename, bool save_abs)
-       : name_(abs_filename), save_abs_path_(save_abs), zipped_valid_(false)
+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());
+}
+
+
+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();
+}
+
+
+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();
 }
 
 
-void FileName::set(string const & name, string const & buffer_path)
+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)
+{}
+
+
+DocFileName::DocFileName(string const & abs_filename, bool save_abs)
+       : FileName(abs_filename), save_abs_path_(save_abs), zipped_valid_(false)
+{}
+
+
+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;
 }
 
 
-void FileName::erase()
+void DocFileName::erase()
 {
        name_.erase();
        zipped_valid_ = false;
 }
 
 
-string const FileName::relFilename(string const & path) const
+string const DocFileName::relFilename(string const & path) const
 {
        return makeRelPath(name_, path);
 }
 
 
-string const FileName::outputFilename(string const & path) const
+string const DocFileName::outputFilename(string const & path) const
 {
        return save_abs_path_ ? name_ : makeRelPath(name_, path);
 }
 
 
-string const FileName::mangledFilename(std::string const & dir) const
+string const DocFileName::mangledFilename(std::string const & dir) const
 {
-       // We need to make sure that every FileName instance for a given
+       // We need to make sure that every DocFileName instance for a given
        // filename returns the same mangled name.
        typedef map<string, string> MangledMap;
        static MangledMap mangledNames;
@@ -125,30 +205,30 @@ string const FileName::mangledFilename(std::string const & dir) const
 }
 
 
-bool FileName::isZipped() const
+bool DocFileName::isZipped() const
 {
        if (!zipped_valid_) {
-               zipped_ = zippedFile(name_);
+               zipped_ = zippedFile(*this);
                zipped_valid_ = true;
        }
        return zipped_;
 }
 
 
-string const FileName::unzippedFilename() const
+string const DocFileName::unzippedFilename() const
 {
        return unzippedFileName(name_);
 }
 
 
-bool operator==(FileName const & lhs, FileName const & rhs)
+bool operator==(DocFileName const & lhs, DocFileName const & rhs)
 {
        return lhs.absFilename() == rhs.absFilename() &&
                lhs.saveAbsPath() == rhs.saveAbsPath();
 }
 
 
-bool operator!=(FileName const & lhs, FileName const & rhs)
+bool operator!=(DocFileName const & lhs, DocFileName const & rhs)
 {
        return !(lhs == rhs);
 }