Added distribution of a missing file used by tests.

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

diff --git a/src/support/FileName.cpp b/src/support/FileName.cpp
index 6d40687a2584f2bc912c73578b3c22e3957bf6b6..e70279ccbd3eb946680725a17705ebb09f59e3b3 100644 (file)
--- a/src/support/FileName.cpp
+++ b/src/support/FileName.cpp
@@ -31,7 +31,6 @@
 #include <QTime>
 
 #include <boost/crc.hpp>
-#include <boost/scoped_array.hpp>
 
 #include <algorithm>
 #include <iterator>
@@ -90,7 +89,7 @@ struct FileName::Private
 {
        Private() {}
 
-       Private(string const & abs_filename) : fi(toqstr(abs_filename))
+       Private(string const & abs_filename) : fi(toqstr(handleTildeName(abs_filename)))
        {
                name = fromqstr(fi.absoluteFilePath());
                fi.setCaching(fi.exists() ? true : false);
@@ -101,7 +100,6 @@ struct FileName::Private
                fi.refresh();
        }
 
-
        static
        bool isFilesystemEqual(QString const & lhs, QString const & rhs)
        {
@@ -109,6 +107,14 @@ struct FileName::Private
                        Qt::CaseSensitive : Qt::CaseInsensitive) == 0;
        }
 
+       static
+       string const handleTildeName(string const & name)
+       {
+               return name == "~" ? Package::get_home_dir().absFileName() :
+                       prefixIs(name, "~/") ? Package::get_home_dir().absFileName() + name.substr(1) :
+                       name;
+       }
+
        /// The absolute file name in UTF-8 encoding.
        std::string name;
        ///
@@ -172,7 +178,7 @@ bool FileName::empty() const
 
 bool FileName::isAbsolute(string const & name)
 {
-       QFileInfo fi(toqstr(name));
+       QFileInfo fi(toqstr(Private::handleTildeName(name)));
        return fi.isAbsolute();
 }
 
@@ -191,7 +197,7 @@ string FileName::realPath() const
 
 void FileName::set(string const & name)
 {
-       d->fi.setFile(toqstr(name));
+       d->fi.setFile(toqstr(Private::handleTildeName(name)));
        d->name = fromqstr(d->fi.absoluteFilePath());
        //LYXERR(Debug::FILES, "FileName::set(" << name << ')');
        LATTEST(empty() || isAbsolute(d->name));