Restore the version number position on the splash screen

[lyx.git] / src / bufferlist.C

diff --git a/src/bufferlist.C b/src/bufferlist.C
index ed824f93c4cacfd173e2f5d75cc533e39b40281a..11213b72542644847dfa50789ee74d823e8ebf52 100644 (file)
--- a/src/bufferlist.C
+++ b/src/bufferlist.C
@@ -39,7 +39,7 @@ namespace lyx {
 
 using support::addName;
 using support::bformat;
-using support::makeAbsPath;
+using support::FileName;
 using support::makeDisplayPath;
 using support::onlyFilename;
 using support::removeAutosaveFile;
@@ -159,7 +159,7 @@ bool BufferList::quitWriteAll()
                // if master/slave are both open, do not save slave since it
                // will be automatically loaded when the master is loaded
                if ((*it)->getMasterBuffer() == (*it))
-                       LyX::ref().session().lastOpened().add((*it)->fileName());
+                       LyX::ref().session().lastOpened().add(FileName((*it)->fileName()));
        }
 
        return true;
@@ -184,7 +184,7 @@ Buffer * BufferList::newBuffer(string const & s, bool const ronly)
 {
        auto_ptr<Buffer> tmpbuf(new Buffer(s, ronly));
        tmpbuf->params().useClassDefaults();
-       lyxerr[Debug::INFO] << "Assigning to buffer "
+       LYXERR(Debug::INFO) << "Assigning to buffer "
                            << bstore.size() << endl;
        bstore.push_back(tmpbuf.get());
        return tmpbuf.release();
@@ -315,10 +315,8 @@ void BufferList::updateIncludedTeXfiles(string const & mastertmpdir,
        BufferStorage::iterator end = bstore.end();
        for (; it != end; ++it) {
                if (!(*it)->isDepClean(mastertmpdir)) {
-                       string writefile = mastertmpdir;
-                       writefile += '/';
-                       writefile += (*it)->getLatexName();
-                       (*it)->makeLaTeXFile(writefile, mastertmpdir,
+                       string writefile = addName(mastertmpdir, (*it)->getLatexName());
+                       (*it)->makeLaTeXFile(FileName(writefile), mastertmpdir,
                                             runparams, false);
                        (*it)->markDepClean(mastertmpdir);
                }
@@ -356,7 +354,7 @@ void BufferList::emergencyWrite(Buffer * buf)
                string s = buf->fileName();
                s += ".emergency";
                lyxerr << "  " << s << endl;
-               if (buf->writeFile(s)) {
+               if (buf->writeFile(FileName(s))) {
                        buf->markClean();
                        lyxerr << to_utf8(_("  Save seems successful. Phew.")) << endl;
                        return;
@@ -366,10 +364,10 @@ void BufferList::emergencyWrite(Buffer * buf)
        }
 
        // 2) In HOME directory.
-       string s = addName(package().home_dir(), buf->fileName());
+       string s = addName(package().home_dir().absFilename(), buf->fileName());
        s += ".emergency";
        lyxerr << ' ' << s << endl;
-       if (buf->writeFile(s)) {
+       if (buf->writeFile(FileName(s))) {
                buf->markClean();
                lyxerr << to_utf8(_("  Save seems successful. Phew.")) << endl;
                return;
@@ -380,10 +378,10 @@ void BufferList::emergencyWrite(Buffer * buf)
        // 3) In "/tmp" directory.
        // MakeAbsPath to prepend the current
        // drive letter on OS/2
-       s = addName(package().temp_dir(), buf->fileName());
+       s = addName(package().temp_dir().absFilename(), buf->fileName());
        s += ".emergency";
        lyxerr << ' ' << s << endl;
-       if (buf->writeFile(s)) {
+       if (buf->writeFile(FileName(s))) {
                buf->markClean();
                lyxerr << to_utf8(_("  Save seems successful. Phew.")) << endl;
                return;
@@ -434,7 +432,7 @@ Buffer * BufferList::getBufferFromTmp(string const & s)
 }
 
 
-void BufferList::setCurrentAuthor(string const & name, string const & email)
+void BufferList::setCurrentAuthor(docstring const & name, docstring const & email)
 {
        BufferStorage::iterator it = bstore.begin();
        BufferStorage::iterator end = bstore.end();